Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
authorPatrick Mezard <pmezard@gmail.com>
Sat, 12 Apr 2008 21:34:01 +0200
changeset 6529 0c611355481b
parent 6528 bd6bf5798f39 (current diff)
parent 6519 a7582980d654 (diff)
child 6530 4b92591c69a7
Merge with crew-stable
mercurial/context.py file | annotate | diff | comparison | revisions 
--- a/mercurial/context.py	Sat Apr 12 20:03:54 2008 +0200
+++ b/mercurial/context.py	Sat Apr 12 21:34:01 2008 +0200
@@ -533,8 +533,10 @@
         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:
mercurial