Details
Details
- Reviewers
marmoute indygreg - Group Reviewers
hg-reviewers
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Branch
- default
- Lint
No Linters Available - Unit
No Unit Test Coverage
This is an archive of the discontinued Mercurial Phabricator instance.
Differential D8553
histedit: use context to load mergestate instead of loading it directlyAbandonedPublic
histedit: use context to load mergestate instead of loading it directly
AbandonedPublic
Authored by durin42 on May 18 2020, 6:07 PM.
Revision Contents
Revision Contents
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/histedit.py (3 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| b0da5443ce74 | 6a13044d167b | Augie Fackler | May 18 2020, 4:02 PM |
Diff 23018
Diff 23018
hgext/histedit.py
| discovery, | discovery, | ||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| exchange, | exchange, | ||||
| extensions, | extensions, | ||||
| hg, | hg, | ||||
| logcmdutil, | logcmdutil, | ||||
| merge as mergemod, | merge as mergemod, | ||||
| mergestate as mergestatemod, | |||||
| mergeutil, | mergeutil, | ||||
| node, | node, | ||||
| obsolete, | obsolete, | ||||
| pycompat, | pycompat, | ||||
| registrar, | registrar, | ||||
| repair, | repair, | ||||
| rewriteutil, | rewriteutil, | ||||
| scmutil, | scmutil, | ||||
| if summary: | if summary: | ||||
| summary = summary.splitlines()[0] | summary = summary.splitlines()[0] | ||||
| return summary | return summary | ||||
| def bootstrapcontinue(ui, state, opts): | def bootstrapcontinue(ui, state, opts): | ||||
| repo = state.repo | repo = state.repo | ||||
| ms = mergestatemod.mergestate.read(repo) | ms = repo[None].mergestate() | ||||
| mergeutil.checkunresolved(ms) | mergeutil.checkunresolved(ms) | ||||
| if state.actions: | if state.actions: | ||||
| actobj = state.actions.pop(0) | actobj = state.actions.pop(0) | ||||
| if _isdirtywc(repo): | if _isdirtywc(repo): | ||||
| actobj.continuedirty() | actobj.continuedirty() | ||||
| if _isdirtywc(repo): | if _isdirtywc(repo): | ||||