This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8556

commands: get mergestate via context
AbandonedPublic

Authored by durin42 on May 18 2020, 6:07 PM.

Details

Reviewers
marmoute
indygreg
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

durin42 created this revision.May 18 2020, 6:07 PM
durin42 updated this revision to Diff 21508.May 28 2020, 4:26 PM
marmoute accepted this revision.Jun 8 2020, 1:53 PM
durin42 updated this revision to Diff 21593.Jun 9 2020, 4:51 PM
indygreg requested changes to this revision.Aug 8 2020, 4:04 PM
This revision now requires changes to proceed.Aug 8 2020, 4:04 PM
durin42 updated this revision to Diff 23020.Oct 2 2020, 2:44 PM
durin42 planned changes to this revision.Oct 2 2020, 2:47 PM
durin42 abandoned this revision.Jan 19 2021, 1:50 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (6 lines)

Diff 21508

mercurial/commands.py

): ):
raise error.Abort(_(b'user quit')) raise error.Abort(_(b'user quit'))
uipathfn = scmutil.getuipathfn(repo) uipathfn = scmutil.getuipathfn(repo)
if show: if show:
ui.pager(b'resolve') ui.pager(b'resolve')
fm = ui.formatter(b'resolve', opts) fm = ui.formatter(b'resolve', opts)
ms = mergestatemod.mergestate.read(repo) ms = repo[None].mergestate()
wctx = repo[None] wctx = repo[None]
m = scmutil.match(wctx, pats, opts) m = scmutil.match(wctx, pats, opts)
# Labels and keys based on merge state. Unresolved path conflicts show # Labels and keys based on merge state. Unresolved path conflicts show
# as 'P'. Resolved path conflicts show as 'R', the same as normal # as 'P'. Resolved path conflicts show as 'R', the same as normal
# resolved conflicts. # resolved conflicts.
mergestateinfo = { mergestateinfo = {
mergestatemod.MERGE_RECORD_UNRESOLVED: ( mergestatemod.MERGE_RECORD_UNRESOLVED: (
fm.context(ctx=wctx) fm.context(ctx=wctx)
fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label) fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
fm.data(path=f) fm.data(path=f)
fm.plain(b'%s\n' % uipathfn(f), label=label) fm.plain(b'%s\n' % uipathfn(f), label=label)
fm.end() fm.end()
return 0 return 0
with repo.wlock(): with repo.wlock():
ms = mergestatemod.mergestate.read(repo) ms = repo[None].mergestate()
if not (ms.active() or repo.dirstate.p2() != nullid): if not (ms.active() or repo.dirstate.p2() != nullid):
raise error.Abort( raise error.Abort(
_(b'resolve command not applicable when not merging') _(b'resolve command not applicable when not merging')
) )
wctx = repo[None] wctx = repo[None]
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
ui.pager(b'summary') ui.pager(b'summary')
ctx = repo[None] ctx = repo[None]
parents = ctx.parents() parents = ctx.parents()
pnode = parents[0].node() pnode = parents[0].node()
marks = [] marks = []
try: try:
ms = mergestatemod.mergestate.read(repo) ms = repo[None].mergestate()
except error.UnsupportedMergeRecords as e: except error.UnsupportedMergeRecords as e:
s = b' '.join(e.recordtypes) s = b' '.join(e.recordtypes)
ui.warn( ui.warn(
_(b'warning: merge state has unsupported record types: %s\n') % s _(b'warning: merge state has unsupported record types: %s\n') % s
) )
unresolved = [] unresolved = []
else: else:
unresolved = list(ms.unresolved()) unresolved = list(ms.unresolved())