Mercurial > public > mercurial-scm > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 45489:a108f7ff7778 | 45490:0ce6af73f481 |
|---|---|
| 2514 ) | 2514 ) |
| 2515 else: | 2515 else: |
| 2516 ui.status( | 2516 ui.status( |
| 2517 _(b'working directory now based on revision %d\n') % parents | 2517 _(b'working directory now based on revision %d\n') % parents |
| 2518 ) | 2518 ) |
| 2519 mergestatemod.mergestate.clean(self, self[b'.'].node()) | 2519 mergestatemod.mergestate.clean(self) |
| 2520 | 2520 |
| 2521 # TODO: if we know which new heads may result from this rollback, pass | 2521 # TODO: if we know which new heads may result from this rollback, pass |
| 2522 # them to destroy(), which will prevent the branchhead cache from being | 2522 # them to destroy(), which will prevent the branchhead cache from being |
| 2523 # invalidated. | 2523 # invalidated. |
| 2524 self.destroyed() | 2524 self.destroyed() |