diff mercurial/merge.py @ 49961:7a8bfc05b691

dirstate: rename parentchange to changing_parents

Since the new argument breaks the API anyway, we can rename it to a better name.

The previous name `parentchange` might be seen as something active, a function
that would directly change the parents, however this is just a context manager
to frame the operation that will change the parents and adjust the
dirstate content accordingly.

In addition, the future sister method that will be about changes to tracking and
files would have a hard time fitting in the same naming scheme in a clear way.

The new naming uses a clear prefix will make it more distinct from other
dirstate methods and easier to extend with other similar contexts.

--- a/mercurial/merge.py	Wed Jan 25 18:46:20 2023 +0100
+++ b/mercurial/merge.py	Wed Jan 25 19:12:31 2023 +0100
@@ -2155,7 +2155,7 @@
             assert len(getfiledata) == (
                 mresult.len((mergestatemod.ACTION_GET,)) if wantfiledata else 0
             )
-            with repo.dirstate.parentchange(repo):
+            with repo.dirstate.changing_parents(repo):
                 ### Filter Filedata
                 #
                 # We gathered "cache" information for the clean file while
@@ -2377,7 +2377,7 @@
         # fix up dirstate for copies and renames
         copies.graftcopies(wctx, ctx, base)
     else:
-        with repo.dirstate.parentchange(repo):
+        with repo.dirstate.changing_parents(repo):
             repo.setparents(pctx.node(), pother)
             repo.dirstate.write(repo.currenttransaction())
             # fix up dirstate for copies and renames