This is an archive of the discontinued Mercurial Phabricator instance.

Differential D861

commands: tidy up merge state decoding in resolve
ClosedPublic

Authored by mbthomas on Oct 1 2017, 5:33 AM.

Details

Reviewers
dlax
ryanmce
Group Reviewers
hg-reviewers
Commits
rHGeddeedbde866: commands: tidy up merge state decoding in resolve
rHGb6fa2e0d50d1: commands: tidy up merge state decoding in resolve
Summary

Make the mapping from merge state to label and display key explicit, and move
construction of the dict out of the loop.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mbthomas created this revision.Oct 1 2017, 5:33 AM
mbthomas updated this revision to Diff 2365.Oct 2 2017, 5:16 PM
dlax accepted this revision.Oct 5 2017, 4:21 AM
ryanmce accepted this revision.Oct 5 2017, 12:56 PM
ryanmce added a subscriber: ryanmce.

nice!

Closed by commit rHGb6fa2e0d50d1: commands: tidy up merge state decoding in resolve (authored by mbthomas). · Explain WhyOct 9 2017, 9:36 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (27 lines)

Diff 2223

mercurial/commands.py

raise error.Abort(_('no files or directories specified'), raise error.Abort(_('no files or directories specified'),
hint=('use --all to re-merge all unresolved files')) hint=('use --all to re-merge all unresolved files'))
if show: if show:
ui.pager('resolve') ui.pager('resolve')
fm = ui.formatter('resolve', opts) fm = ui.formatter('resolve', opts)
ms = mergemod.mergestate.read(repo) ms = mergemod.mergestate.read(repo)
m = scmutil.match(repo[None], pats, opts) m = scmutil.match(repo[None], pats, opts)
for f in ms:
if not m(f):
continue
# Set label based on merge state. # Labels and keys based on merge state. Unresolved path conflicts show
l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
'pu': 'unresolved', 'pr': 'resolved',
'd': 'driverresolved'}[ms[f]]
# Set key 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.
key = {'pu': 'P', 'pr': 'R'}.get(ms[f], ms[f].upper()) mergestateinfo = {
'u': ('resolve.unresolved', 'U'),
'r': ('resolve.resolved', 'R'),
'pu': ('resolve.unresolved', 'P'),
'pr': ('resolve.resolved', 'R'),
'd': ('resolve.driverresolved', 'D'),
}
for f in ms:
if not m(f):
continue
label, key = mergestateinfo[ms[f]]
fm.startitem() fm.startitem()
fm.condwrite(not nostatus, 'status', '%s ', key, label=l) fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
fm.write('path', '%s\n', f, label=l) fm.write('path', '%s\n', f, label=label)
fm.end() fm.end()
return 0 return 0
with repo.wlock(): with repo.wlock():
ms = mergemod.mergestate.read(repo) ms = mergemod.mergestate.read(repo)
if not (ms.active() or repo.dirstate.p2() != nullid): if not (ms.active() or repo.dirstate.p2() != nullid):
raise error.Abort( raise error.Abort(