This is an archive of the discontinued Mercurial Phabricator instance.

Differential D775

commands: update the resolve command to handle path conflicts
ClosedPublic

Authored by mbthomas on Sep 22 2017, 5:27 AM.

Details

Reviewers
ryanmce
Group Reviewers
hg-reviewers
Commits
rHGe4cf957bf7ce: commands: update the resolve command to handle path conflicts
rHGffe96bac3237: commands: update the resolve command to handle path conflicts
Summary

The resolve command must support displaying path conflicts and marking
them as resolved or unresolved.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mbthomas created this revision.Sep 22 2017, 5:27 AM
ryanmce accepted this revision.Sep 25 2017, 3:29 PM
ryanmce added a subscriber: ryanmce.

This looks fine to me. Some future cleanup opportunities but this fits the current style just fine.

mercurial/commands.py
4280–4288

In a future patch, we may want to refactor this so we're not instantiating the dict over and over (I don't know if python is optimizing this, but it seems "bad" to have it in a loop).

4284–4287

In another future refactor, consider making the key and label into a tuple in the dict:

{
   'u': ('unresolved', 'U'),
   ...
   'pr': ('resolved', 'R'),
   ...
}
mbthomas updated this revision to Diff 2211.Oct 1 2017, 5:32 AM
mbthomas marked 2 inline comments as done.Oct 1 2017, 6:36 AM
mbthomas updated this revision to Diff 2352.Oct 2 2017, 5:15 PM
ryanmce accepted this revision.Oct 5 2017, 10:49 AM
Closed by commit rHGffe96bac3237: commands: update the resolve command to handle path conflicts (authored by mbthomas). · Explain WhyOct 9 2017, 9:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (22 lines)

Diff 2546

mercurial/commands.py

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: for f in ms:
if not m(f): if not m(f):
continue continue
# Set label based on merge state.
l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved', l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
'pu': 'unresolved', 'pr': 'resolved',
'd': 'driverresolved'}[ms[f]] '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
# resolved conflicts.
key = {'pu': 'P', 'pr': 'R'}.get(ms[f], ms[f].upper())
ryanmceUnsubmitted
Done

In another future refactor, consider making the key and label into a tuple in the dict:

{
   'u': ('unresolved', 'U'),
   ...
   'pr': ('resolved', 'R'),
   ...
}
ryanmce: In another future refactor, consider making the key and label into a tuple in the dict: ``` {…
ryanmceUnsubmitted
Done

In a future patch, we may want to refactor this so we're not instantiating the dict over and over (I don't know if python is optimizing this, but it seems "bad" to have it in a loop).

ryanmce: In a future patch, we may want to refactor this so we're not instantiating the dict over and…
fm.startitem() fm.startitem()
fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l) fm.condwrite(not nostatus, 'status', '%s ', key, label=l)
fm.write('path', '%s\n', f, label=l) fm.write('path', '%s\n', f, label=l)
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):
elif unmark: elif unmark:
if exact: if exact:
ui.warn(_('not unmarking %s as it is driver-resolved\n') ui.warn(_('not unmarking %s as it is driver-resolved\n')
% f) % f)
else: else:
runconclude = True runconclude = True
continue continue
# path conflicts must be resolved manually
if ms[f] in ("pu", "pr"):
if mark:
ms.mark(f, "pr")
elif unmark:
ms.mark(f, "pu")
elif ms[f] == "pu":
ui.warn(_('%s: path conflict must be resolved manually\n')
% f)
continue
if mark: if mark:
ms.mark(f, "r") ms.mark(f, "r")
elif unmark: elif unmark:
ms.mark(f, "u") ms.mark(f, "u")
else: else:
# backup pre-resolve (merge uses .orig for its own purposes) # backup pre-resolve (merge uses .orig for its own purposes)
a = repo.wjoin(f) a = repo.wjoin(f)
try: try: