workingctx: also pass status tuple into poststatusfixup
authorSiddharth Agarwal <sid0@fb.com>
Mon, 12 Jun 2017 13:56:43 -0700
changeset 32813 6d73b7ff8f92
parent 32812 add613cddcb6
child 32814 2083d1643d69
workingctx: also pass status tuple into poststatusfixup fsmonitor is going to need this to compute its set of notable files to persist.
mercurial/context.py
tests/fakedirstatewritetime.py
--- a/mercurial/context.py	Mon Jun 12 13:54:59 2017 -0700
+++ b/mercurial/context.py	Mon Jun 12 13:56:43 2017 -0700
@@ -1740,7 +1740,7 @@
 
         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 @@
             if fixup and listclean:
                 s.clean.extend(fixup)
 
-        self._poststatusfixup(fixup)
+        self._poststatusfixup(s, fixup)
 
         if match.always():
             # cache for performance
--- a/tests/fakedirstatewritetime.py	Mon Jun 12 13:54:59 2017 -0700
+++ b/tests/fakedirstatewritetime.py	Mon Jun 12 13:56:43 2017 -0700
@@ -55,9 +55,9 @@
         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