# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2008-04-12 19:08:03
# Node ID a7582980d65484557673077290dccb174ddc7588
# Parent  c30849d4c8baa4acbadaf2af8c7a5713723ffc83

context: handle untracked files in filectx.fileflags()

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -521,8 +521,10 @@ class workingctx(changectx):
         pnode = self._parents[0].changeset()[0]
         orig = self._repo.dirstate.copies().get(path, path)
         node, flag = self._repo.manifest.find(pnode, orig)
-        is_link = util.linkfunc(self._repo.root, lambda p: 'l' in flag)
-        is_exec = util.execfunc(self._repo.root, lambda p: 'x' in flag)
+        is_link = util.linkfunc(self._repo.root,
+                                lambda p: flag and 'l' in flag)
+        is_exec = util.execfunc(self._repo.root,
+                                lambda p: flag and 'x' in flag)
         try:
             return (is_link(path) and 'l' or '') + (is_exec(path) and 'e' or '')
         except OSError: