This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4101

resolve: support commands.resolve.confirm option with --mark flag
ClosedPublic

Authored by khanchi97 on Aug 4 2018, 3:31 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdb03e5cefc82: resolve: support commands.resolve.confirm option with --mark flag
Summary

Now, commands.resolve.confirm config option also respect --mark; and
confirm to mark all 'unresolved' files as 'resolved'.

It will confirm only when you don't pass any pats i.e 'hg resolve -m',
because when no file pats are passed then --mark's default functionality
is to mark all unresolved files.
And if user has given file pats then I think there is no need to confirm.

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

khanchi97 created this revision.Aug 4 2018, 3:31 AM
pulkit accepted this revision.Aug 4 2018, 1:09 PM
Closed by commit rHGdb03e5cefc82: resolve: support commands.resolve.confirm option with --mark flag (authored by khanchi97). · Explain WhyAug 4 2018, 1:38 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (4 lines)
Mtests/test-resolve.t (27 lines)

Diff 9903

mercurial/commands.py

if (show and (mark or unmark)) or (mark and unmark): if (show and (mark or unmark)) or (mark and unmark):
raise error.Abort(_("too many options specified")) raise error.Abort(_("too many options specified"))
if pats and all: if pats and all:
raise error.Abort(_("can't specify --all and patterns")) raise error.Abort(_("can't specify --all and patterns"))
if not (all or pats or show or mark or unmark): if not (all or pats or show or mark or unmark):
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 mark and confirm and not pats:
if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
b'$$ &Yes $$ &No')):
raise error.Abort(_('user quit'))
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)
wctx = repo[None] wctx = repo[None]
m = scmutil.match(wctx, pats, opts) m = scmutil.match(wctx, pats, opts)

tests/test-resolve.t

merging emp1 merging emp1
merging emp2 merging emp2
merging emp3 merging emp3
warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark') warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark') warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark') warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
[1] [1]
Test that commands.resolve.confirm respect --mark option (only when no patterns args are given):
===============================================================================================
$ hg resolve -m emp1
$ hg resolve -l
R emp1
U emp2
U emp3
$ hg resolve -m << EOF
> n
> EOF
mark all unresolved files as resolved (yn)? n
abort: user quit
[255]
$ hg resolve -m << EOF
> y
> EOF
mark all unresolved files as resolved (yn)? y
(no more unresolved files)
continue: hg rebase --continue
$ hg resolve -l
R emp1
R emp2
R emp3
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ cd .. $ cd ..