Mercurial > hg
changeset 32813:6d73b7ff8f92
workingctx: also pass status tuple into poststatusfixup
fsmonitor is going to need this to compute its set of notable files to persist.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 12 Jun 2017 13:56:43 -0700 |
| parents | add613cddcb6 |
| children | 2083d1643d69 |
| files | mercurial/context.py tests/fakedirstatewritetime.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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