comparison hgext/strip.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 b7808443ed6a
children 93a0f3ba36bb
comparison
equal deleted inserted replaced
45489:a108f7ff7778 45490:0ce6af73f481
267 267
268 repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles) 268 repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)
269 repo.dirstate.write(repo.currenttransaction()) 269 repo.dirstate.write(repo.currenttransaction())
270 270
271 # clear resolve state 271 # clear resolve state
272 mergestatemod.mergestate.clean(repo, repo[b'.'].node()) 272 mergestatemod.mergestate.clean(repo)
273 273
274 update = False 274 update = False
275 275
276 strip( 276 strip(
277 ui, 277 ui,