Show More
@@ -426,9 +426,11 class workingctx(changectx): | |||
|
426 | 426 | """generate a manifest corresponding to the working directory""" |
|
427 | 427 | |
|
428 | 428 | man = self._parents[0].manifest().copy() |
|
429 | is_exec = util.execfunc(self._repo.root, man.execf) | |
|
430 | is_link = util.linkfunc(self._repo.root, man.linkf) | |
|
431 | 429 | copied = self._repo.dirstate.copies() |
|
430 | is_exec = util.execfunc(self._repo.root, | |
|
431 | lambda p: man.execf(copied.get(p,p))) | |
|
432 | is_link = util.linkfunc(self._repo.root, | |
|
433 | lambda p: man.linkf(copied.get(p,p))) | |
|
432 | 434 | modified, added, removed, deleted, unknown = self._status[:5] |
|
433 | 435 | for i, l in (("a", added), ("m", modified), ("u", unknown)): |
|
434 | 436 | for f in l: |
@@ -482,7 +484,8 class workingctx(changectx): | |||
|
482 | 484 | return '' |
|
483 | 485 | |
|
484 | 486 | pnode = self._parents[0].changeset()[0] |
|
485 |
|
|
|
487 | orig = self._repo.dirstate.copies().get(path, path) | |
|
488 | node, flag = self._repo.manifest.find(pnode, orig) | |
|
486 | 489 | is_link = util.linkfunc(self._repo.root, lambda p: 'l' in flag) |
|
487 | 490 | is_exec = util.execfunc(self._repo.root, lambda p: 'x' in flag) |
|
488 | 491 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now