Show More
@@ -1740,7 +1740,7 b' class workingctx(committablectx):' | |||||
1740 |
|
1740 | |||
1741 | return modified, deleted, fixup |
|
1741 | return modified, deleted, fixup | |
1742 |
|
1742 | |||
1743 | def _poststatusfixup(self, fixup): |
|
1743 | def _poststatusfixup(self, status, fixup): | |
1744 | """update dirstate for files that are actually clean""" |
|
1744 | """update dirstate for files that are actually clean""" | |
1745 | if fixup: |
|
1745 | if fixup: | |
1746 | try: |
|
1746 | try: | |
@@ -1792,7 +1792,7 b' class workingctx(committablectx):' | |||||
1792 | if fixup and listclean: |
|
1792 | if fixup and listclean: | |
1793 | s.clean.extend(fixup) |
|
1793 | s.clean.extend(fixup) | |
1794 |
|
1794 | |||
1795 | self._poststatusfixup(fixup) |
|
1795 | self._poststatusfixup(s, fixup) | |
1796 |
|
1796 | |||
1797 | if match.always(): |
|
1797 | if match.always(): | |
1798 | # cache for performance |
|
1798 | # cache for performance |
@@ -55,9 +55,9 b' def fakewrite(ui, func):' | |||||
55 | parsers.pack_dirstate = orig_pack_dirstate |
|
55 | parsers.pack_dirstate = orig_pack_dirstate | |
56 | dirstate._getfsnow = orig_dirstate_getfsnow |
|
56 | dirstate._getfsnow = orig_dirstate_getfsnow | |
57 |
|
57 | |||
58 | def _poststatusfixup(orig, workingctx, fixup): |
|
58 | def _poststatusfixup(orig, workingctx, status, fixup): | |
59 | ui = workingctx.repo().ui |
|
59 | ui = workingctx.repo().ui | |
60 | return fakewrite(ui, lambda : orig(workingctx, fixup)) |
|
60 | return fakewrite(ui, lambda : orig(workingctx, status, fixup)) | |
61 |
|
61 | |||
62 | def markcommitted(orig, committablectx, node): |
|
62 | def markcommitted(orig, committablectx, node): | |
63 | ui = committablectx.repo().ui |
|
63 | ui = committablectx.repo().ui |
General Comments 0
You need to be logged in to leave comments.
Login now