##// END OF EJS Templates
context: handle untracked files in filectx.fileflags()
Patrick Mezard -
r6519:a7582980 default
parent child Browse files
Show More
@@ -521,8 +521,10 b' class workingctx(changectx):'
521 pnode = self._parents[0].changeset()[0]
521 pnode = self._parents[0].changeset()[0]
522 orig = self._repo.dirstate.copies().get(path, path)
522 orig = self._repo.dirstate.copies().get(path, path)
523 node, flag = self._repo.manifest.find(pnode, orig)
523 node, flag = self._repo.manifest.find(pnode, orig)
524 is_link = util.linkfunc(self._repo.root, lambda p: 'l' in flag)
524 is_link = util.linkfunc(self._repo.root,
525 is_exec = util.execfunc(self._repo.root, lambda p: 'x' in flag)
525 lambda p: flag and 'l' in flag)
526 is_exec = util.execfunc(self._repo.root,
527 lambda p: flag and 'x' in flag)
526 try:
528 try:
527 return (is_link(path) and 'l' or '') + (is_exec(path) and 'e' or '')
529 return (is_link(path) and 'l' or '') + (is_exec(path) and 'e' or '')
528 except OSError:
530 except OSError:
General Comments 0
You need to be logged in to leave comments. Login now