mergestate: make some callers not pass pointless node argument
The node argument is set on the created `mergestate` instance, but
these callers don't even look at that instance.
Differential Revision: https://phab.mercurial-scm.org/D9031
--- a/hgext/strip.py Thu Sep 17 09:56:05 2020 -0700
+++ b/hgext/strip.py Tue Sep 15 22:40:26 2020 -0700
@@ -269,7 +269,7 @@
repo.dirstate.write(repo.currenttransaction())
# clear resolve state
- mergestatemod.mergestate.clean(repo, repo[b'.'].node())
+ mergestatemod.mergestate.clean(repo)
update = False
--- a/mercurial/localrepo.py Thu Sep 17 09:56:05 2020 -0700
+++ b/mercurial/localrepo.py Tue Sep 15 22:40:26 2020 -0700
@@ -2516,7 +2516,7 @@
ui.status(
_(b'working directory now based on revision %d\n') % parents
)
- mergestatemod.mergestate.clean(self, self[b'.'].node())
+ mergestatemod.mergestate.clean(self)
# TODO: if we know which new heads may result from this rollback, pass
# them to destroy(), which will prevent the branchhead cache from being