Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 50022:c166b212bdee
dirstate: pass the repo to the `changeparent` method
If we want the context to be responsible for writing (and we want it), we need
to have access to a localrepository object.
So we now requires a localrepository object as an argument to this context
manager.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 25 Jan 2023 18:46:20 +0100 |
| parents | e0c0545e2e55 |
| children | 7a8bfc05b691 |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Dec 13 10:00:04 2022 +0100 +++ b/mercurial/commands.py Wed Jan 25 18:46:20 2023 +0100 @@ -6264,7 +6264,7 @@ # # All this should eventually happens, but in the mean time, we use this # context manager slightly out of the context it should be. - with repo.dirstate.parentchange(): + with repo.dirstate.parentchange(repo): mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None) if not didwork and pats: