# HG changeset patch # User Benoit Boissinot # Date 1164657350 -3600 # Node ID 1bd70d40ec574f054443b12d762edc6877a5a635 # Parent 9ccc6be9ae4d7c35987c5f7a3705ed5cdfa37a60 context: None is not a valid filenode (revert from 23ede9e7ad4d) diff -r 9ccc6be9ae4d -r 1bd70d40ec57 mercurial/context.py --- a/mercurial/context.py Sun Nov 26 13:28:30 2006 +0100 +++ b/mercurial/context.py Mon Nov 27 20:55:50 2006 +0100 @@ -151,10 +151,7 @@ if '_fileid' in self.__dict__: self._filenode = self._filelog.lookup(self._fileid) else: - try: - self._filenode = self._changectx.filenode(self._path) - except: - self._filenode = self._filerev = None + self._filenode = self._changectx.filenode(self._path) except revlog.RevlogError, inst: raise repo.LookupError(str(inst)) return self._filenode @@ -165,7 +162,12 @@ raise AttributeError, name def __nonzero__(self): - return self._filenode != None + try: + n = self._filenode + return True + except repo.LookupError: + # file is missing + return False def __str__(self): return "%s@%s" % (self.path(), short(self.node()))