Mercurial > hg
comparison hgext/strip.py @ 44856:b7808443ed6a
mergestate: split out merge state handling code from main merge module
There's already some pretty reasonable encapsulation here, but I want
to make the mergestate storage a property of the context so memctx
instances can do a reasonable thing. This is the first step in a
reshuffle to make that easier.
Differential Revision: https://phab.mercurial-scm.org/D8550
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 18 May 2020 14:59:59 -0400 |
parents | 9d2b2df2c2ba |
children | 0ce6af73f481 2bc978921e8a |
comparison
equal
deleted
inserted
replaced
44855:1d2d353e5c4a | 44856:b7808443ed6a |
---|---|
11 bookmarks as bookmarksmod, | 11 bookmarks as bookmarksmod, |
12 cmdutil, | 12 cmdutil, |
13 error, | 13 error, |
14 hg, | 14 hg, |
15 lock as lockmod, | 15 lock as lockmod, |
16 merge, | 16 mergestate as mergestatemod, |
17 node as nodemod, | 17 node as nodemod, |
18 pycompat, | 18 pycompat, |
19 registrar, | 19 registrar, |
20 repair, | 20 repair, |
21 scmutil, | 21 scmutil, |
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 merge.mergestate.clean(repo, repo[b'.'].node()) | 272 mergestatemod.mergestate.clean(repo, repo[b'.'].node()) |
273 | 273 |
274 update = False | 274 update = False |
275 | 275 |
276 strip( | 276 strip( |
277 ui, | 277 ui, |