# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1161198408 18000
# Node ID 23ede9e7ad4ddba4941a2655d6eeaa397eed8a03
# Parent  dba3cadef789687b7dce2bf2c44d915d7b631d2a
filecontext: report False for missing files

diff --git a/mercurial/context.py b/mercurial/context.py
--- 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()))