Mercurial > hg
diff mercurial/localrepo.py @ 45490:0ce6af73f481
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 | b71858b42963 |
children | a8843eda9a35 |
line wrap: on
line diff
--- 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