This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4102

resolve: support confirm config option with --unmark flag
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf35f6791595f: resolve: support confirm config option with --unmark flag
Summary

Now, commands.resolve.confirm also respect --unmark option; and
confirm to unresolve all resolved files.
It will confirm only when no files pats are passed (same as --mark),
because when no pats are passed the default is to mark resolved files
as unresolved.
And if user has passed file pats then I think there is no need to confirm
for that.

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 added a subscriber: pulkit.Aug 4 2018, 1:11 PM
pulkit added inline comments.
mercurial/commands.py
4555

This should be 'mark all resolved files as unresolved'.

khanchi97 added inline comments.Aug 4 2018, 2:18 PM
mercurial/commands.py
4555

Oops, sorry.

khanchi97 updated this revision to Diff 9905.Aug 4 2018, 2:19 PM
pulkit accepted this revision.Aug 5 2018, 10:20 PM
pulkit added inline comments.
mercurial/commands.py
4555

You should not be sorry!

pulkit added a comment.Aug 5 2018, 10:28 PM

Please add about this config option in the releasenotes page for 4.8 at https://www.mercurial-scm.org/wiki/Release4.8.

mercurial/commands.py
4537

This one should be moved after conditional in line 4544. Also we can now better organize the three if 'confirm' conditionals now. Can you please follow-up?

Closed by commit rHGf35f6791595f: resolve: support confirm config option with --unmark flag (authored by khanchi97). · Explain WhyAug 5 2018, 10:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (5 lines)
Mtests/test-resolve.t (29 lines)

Diff 9938

mercurial/commands.py

""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
confirm = ui.configbool('commands', 'resolve.confirm') confirm = ui.configbool('commands', 'resolve.confirm')
flaglist = 'all mark unmark list no_status'.split() flaglist = 'all mark unmark list no_status'.split()
all, mark, unmark, show, nostatus = \ all, mark, unmark, show, nostatus = \
[opts.get(o) for o in flaglist] [opts.get(o) for o in flaglist]
if all and confirm: if all and confirm:
pulkitUnsubmitted
Not Done

This one should be moved after conditional in line 4544. Also we can now better organize the three if 'confirm' conditionals now. Can you please follow-up?

pulkit: This one should be moved after conditional in line 4544. Also we can now better organize the…
if ui.promptchoice(_(b're-merge all unresolved files (yn)?' if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
b'$$ &Yes $$ &No')): b'$$ &Yes $$ &No')):
raise error.Abort(_('user quit')) raise error.Abort(_('user quit'))
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 mark and confirm and not pats:
if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?' if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
b'$$ &Yes $$ &No')): b'$$ &Yes $$ &No')):
raise error.Abort(_('user quit')) raise error.Abort(_('user quit'))
if unmark and confirm and not pats:
if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
pulkitUnsubmitted
Not Done

This should be 'mark all resolved files as unresolved'.

pulkit: This should be 'mark all resolved files as unresolved'.
khanchi97AuthorUnsubmitted
Not Done

Oops, sorry.

khanchi97: Oops, sorry.
pulkitUnsubmitted
Not Done

You should not be sorry!

pulkit: You should not be sorry!
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

mark all unresolved files as resolved (yn)? y mark all unresolved files as resolved (yn)? y
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg resolve -l $ hg resolve -l
R emp1 R emp1
R emp2 R emp2
R emp3 R emp3
Test that commands.resolve.confirm respect --unmark option (only when no patterns args are given):
===============================================================================================
$ hg resolve -u emp1
$ hg resolve -l
U emp1
R emp2
R emp3
$ hg resolve -u << EOF
> n
> EOF
mark all resolved files as unresolved (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 ..