--- a/mercurial/cmdutil.py Wed Jan 25 18:46:20 2023 +0100
+++ b/mercurial/cmdutil.py Wed Jan 25 19:12:31 2023 +0100
@@ -638,7 +638,7 @@
# already called within a `pendingchange`, However we
# are taking a shortcut here in order to be able to
# quickly deprecated the older API.
- with dirstate.parentchange(repo):
+ with dirstate.changing_parents(repo):
dirstate.update_file(
realname,
p1_tracked=True,
@@ -1532,7 +1532,7 @@
new_node = mem_ctx.commit()
if repo.dirstate.p1() == ctx.node():
- with repo.dirstate.parentchange(repo):
+ with repo.dirstate.changing_parents(repo):
scmutil.movedirstate(repo, repo[new_node])
replacements = {ctx.node(): [new_node]}
scmutil.cleanupnodes(
@@ -1625,7 +1625,7 @@
new_node = mem_ctx.commit()
if repo.dirstate.p1() == ctx.node():
- with repo.dirstate.parentchange(repo):
+ with repo.dirstate.changing_parents(repo):
scmutil.movedirstate(repo, repo[new_node])
replacements = {ctx.node(): [new_node]}
scmutil.cleanupnodes(repo, replacements, b'copy', fixphase=True)
@@ -3024,7 +3024,7 @@
newid = repo.commitctx(new)
ms.reset()
- with repo.dirstate.parentchange(repo):
+ with repo.dirstate.changing_parents(repo):
# Reroute the working copy parent to the new changeset
repo.setparents(newid, repo.nullid)