Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/context.py @ 3495:23ede9e7ad4d
filecontext: report False for missing files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 18 Oct 2006 14:06:48 -0500 |
parents | 357b5589dc62 |
children | 3b4e00cba57a |
line wrap: on
line diff
--- a/mercurial/context.py +++ b/mercurial/context.py @@ -151,7 +151,10 @@ class filectx(object): if '_fileid' in self.__dict__: self._filenode = self._filelog.lookup(self._fileid) else: - self._filenode = self._changectx.filenode(self._path) + try: + self._filenode = self._changectx.filenode(self._path) + except: + self._filenode = self._filerev = None except revlog.RevlogError, inst: raise repo.LookupError(str(inst)) return self._filenode @@ -162,7 +165,7 @@ class filectx(object): raise AttributeError, name def __nonzero__(self): - return self._filerev != nullid + return self._filenode != None def __str__(self): return "%s@%s" % (self.path(), short(self.node()))