Show More
@@ -533,8 +533,10 b' class workingctx(changectx):' | |||||
533 | pnode = self._parents[0].changeset()[0] |
|
533 | pnode = self._parents[0].changeset()[0] | |
534 | orig = self._repo.dirstate.copies().get(path, path) |
|
534 | orig = self._repo.dirstate.copies().get(path, path) | |
535 | node, flag = self._repo.manifest.find(pnode, orig) |
|
535 | node, flag = self._repo.manifest.find(pnode, orig) | |
536 |
is_link = util.linkfunc(self._repo.root, |
|
536 | is_link = util.linkfunc(self._repo.root, | |
537 | is_exec = util.execfunc(self._repo.root, lambda p: 'x' in flag) |
|
537 | lambda p: flag and 'l' in flag) | |
|
538 | is_exec = util.execfunc(self._repo.root, | |||
|
539 | lambda p: flag and 'x' in flag) | |||
538 | try: |
|
540 | try: | |
539 | return (is_link(path) and 'l' or '') + (is_exec(path) and 'e' or '') |
|
541 | return (is_link(path) and 'l' or '') + (is_exec(path) and 'e' or '') | |
540 | except OSError: |
|
542 | except OSError: |
General Comments 0
You need to be logged in to leave comments.
Login now