# HG changeset patch # User Siddharth Agarwal # Date 2017-06-12 20:56:43 # Node ID 6d73b7ff8f920699d7ed944ae3905ebaf6f75698 # Parent add613cddcb61e70695b40637bd22a0ea037aa0b workingctx: also pass status tuple into poststatusfixup fsmonitor is going to need this to compute its set of notable files to persist. diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -1740,7 +1740,7 @@ class workingctx(committablectx): return modified, deleted, fixup - def _poststatusfixup(self, fixup): + def _poststatusfixup(self, status, fixup): """update dirstate for files that are actually clean""" if fixup: try: @@ -1792,7 +1792,7 @@ class workingctx(committablectx): if fixup and listclean: s.clean.extend(fixup) - self._poststatusfixup(fixup) + self._poststatusfixup(s, fixup) if match.always(): # cache for performance diff --git a/tests/fakedirstatewritetime.py b/tests/fakedirstatewritetime.py --- a/tests/fakedirstatewritetime.py +++ b/tests/fakedirstatewritetime.py @@ -55,9 +55,9 @@ def fakewrite(ui, func): parsers.pack_dirstate = orig_pack_dirstate dirstate._getfsnow = orig_dirstate_getfsnow -def _poststatusfixup(orig, workingctx, fixup): +def _poststatusfixup(orig, workingctx, status, fixup): ui = workingctx.repo().ui - return fakewrite(ui, lambda : orig(workingctx, fixup)) + return fakewrite(ui, lambda : orig(workingctx, status, fixup)) def markcommitted(orig, committablectx, node): ui = committablectx.repo().ui