Mercurial > hg

diff mercurial/context.py @ 50022:e333cc169c45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: rename `pendingparentchange` to `is_changing_parents` This is clearer and more inline witht he other change we did.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 30 Jan 2023 19:21:34 +0100
parents 7a8bfc05b691
children c5ef535e274e
line wrap: on
line diff
--- a/mercurial/context.py	Thu Jan 26 15:50:36 2023 +0100
+++ b/mercurial/context.py	Mon Jan 30 19:21:34 2023 +0100
@@ -1867,7 +1867,7 @@
                     dirstate = self._repo.dirstate
                     if dirstate.identity() == oldid:
                         if fixup:
-                            if dirstate.pendingparentchange():
+                            if dirstate.is_changing_parents:
                                 normal = lambda f, pfd: dirstate.update_file(
                                     f, p1_tracked=True, wc_tracked=True
                                 )