Mercurial > hg

changeset 45490:0ce6af73f481

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 15 Sep 2020 22:40:26 -0700
parents a108f7ff7778
children aad11a26a054
files hgext/strip.py mercurial/localrepo.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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