Mercurial > hg
comparison hgext/histedit.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 | e147748f750b |
| children | d2227d4c9e6b |
comparison
equal
deleted
inserted
replaced
| 44855:1d2d353e5c4a | 44856:b7808443ed6a |
|---|---|
| 222 exchange, | 222 exchange, |
| 223 extensions, | 223 extensions, |
| 224 hg, | 224 hg, |
| 225 logcmdutil, | 225 logcmdutil, |
| 226 merge as mergemod, | 226 merge as mergemod, |
| 227 mergestate as mergestatemod, | |
| 227 mergeutil, | 228 mergeutil, |
| 228 node, | 229 node, |
| 229 obsolete, | 230 obsolete, |
| 230 pycompat, | 231 pycompat, |
| 231 registrar, | 232 registrar, |
| 2287 | 2288 |
| 2288 | 2289 |
| 2289 def bootstrapcontinue(ui, state, opts): | 2290 def bootstrapcontinue(ui, state, opts): |
| 2290 repo = state.repo | 2291 repo = state.repo |
| 2291 | 2292 |
| 2292 ms = mergemod.mergestate.read(repo) | 2293 ms = mergestatemod.mergestate.read(repo) |
| 2293 mergeutil.checkunresolved(ms) | 2294 mergeutil.checkunresolved(ms) |
| 2294 | 2295 |
| 2295 if state.actions: | 2296 if state.actions: |
| 2296 actobj = state.actions.pop(0) | 2297 actobj = state.actions.pop(0) |
| 2297 | 2298 |