Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: use new API instead of `normal` during fixup post status
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 19 Jul 2021 01:44:24 +0200
changeset 47705 6975cef3add1
parent 47704 8a50fb0784a9
child 47706 5bbf304271a0
context: use new API instead of `normal` during fixup post status We use `set_clean` or `update_file` depending of if we are in the middle of an update or not. Differential Revision: https://phab.mercurial-scm.org/D11147
mercurial/context.py file | annotate | diff | comparison | revisions 
--- a/mercurial/context.py	Mon Jul 19 00:47:59 2021 +0200
+++ b/mercurial/context.py	Mon Jul 19 01:44:24 2021 +0200
@@ -1838,9 +1838,15 @@
                 # wlock can invalidate the dirstate, so cache normal _after_
                 # taking the lock
                 with self._repo.wlock(False):
-                    if self._repo.dirstate.identity() == oldid:
+                    dirstate = self._repo.dirstate
+                    if dirstate.identity() == oldid:
                         if fixup:
-                            normal = self._repo.dirstate.normal
+                            if dirstate.pendingparentchange():
+                                normal = lambda f: dirstate.update_file(
+                                    f, p1_tracked=True, wc_tracked=True
+                                )
+                            else:
+                                normal = dirstate.set_clean
                             for f in fixup:
                                 normal(f)
                             # write changes out explicitly, because nesting
mercurial