Mercurial > hg
changeset 6519:a7582980d654
context: handle untracked files in filectx.fileflags()
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sat, 12 Apr 2008 21:08:03 +0200 |
| parents | c30849d4c8ba |
| children | ba0b2dacc623 0c611355481b |
| files | mercurial/context.py |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/context.py Thu Apr 10 14:24:27 2008 +0200 +++ b/mercurial/context.py Sat Apr 12 21:08:03 2008 +0200 @@ -521,8 +521,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: