--- a/mercurial/sparse.py Tue Dec 13 10:00:04 2022 +0100
+++ b/mercurial/sparse.py Wed Jan 25 18:46:20 2023 +0100
@@ -451,7 +451,7 @@
message,
)
- with repo.dirstate.parentchange():
+ with repo.dirstate.parentchange(repo):
mergemod.applyupdates(
repo,
tmresult,
@@ -655,7 +655,7 @@
The remaining sparse config only has profiles, if defined. The working
directory is refreshed, as needed.
"""
- with repo.wlock(), repo.dirstate.parentchange():
+ with repo.wlock(), repo.dirstate.parentchange(repo):
raw = repo.vfs.tryread(b'sparse')
includes, excludes, profiles = parseconfig(repo.ui, raw, b'sparse')
@@ -671,7 +671,7 @@
The updated sparse config is written out and the working directory
is refreshed, as needed.
"""
- with repo.wlock(), repo.dirstate.parentchange():
+ with repo.wlock(), repo.dirstate.parentchange(repo):
# read current configuration
raw = repo.vfs.tryread(b'sparse')
includes, excludes, profiles = parseconfig(repo.ui, raw, b'sparse')
@@ -730,7 +730,7 @@
The new config is written out and a working directory refresh is performed.
"""
- with repo.wlock(), repo.lock(), repo.dirstate.parentchange():
+ with repo.wlock(), repo.lock(), repo.dirstate.parentchange(repo):
raw = repo.vfs.tryread(b'sparse')
oldinclude, oldexclude, oldprofiles = parseconfig(
repo.ui, raw, b'sparse'