This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3988

resolve: add confirm config option
ClosedPublic

Authored by khanchi97 on Jul 31 2018, 9:50 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf8732e33bcbc: resolve: add confirm config option
Summary

This config setting gives a functionality to confirm before
it re-merge all unresolved files. If this config is enabled,
when you run 'hg resolve --all' it will prompt with a msg
"re-merge all unresolved files (yn)?"

To enable this functionality:
[commands]
resolve.confirm = True

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

khanchi97 created this revision.Jul 31 2018, 9:50 AM
pulkit added a subscriber: pulkit.Aug 1 2018, 9:06 AM
pulkit added inline comments.
mercurial/commands.py
4536

I missed that we need --all, so make this prompt only when --all is passed.

mercurial/configitems.py
1162

commands.resolve.confirm sounds a better place.

khanchi97 edited the summary of this revision. (Show Details)Aug 1 2018, 10:25 AM
khanchi97 updated this revision to Diff 9678.
pulkit requested changes to this revision.Aug 1 2018, 4:40 PM
pulkit added inline comments.
mercurial/commands.py
4536

please break this down into two if's. First one if all and confirm and the promptchoice in another one.

mercurial/configitems.py
193

You need to document this config option. You can have a look at where other options are documented and do something similar.

tests/test-resolve.t
449

this should be user quit rather than this abort.

This revision now requires changes to proceed.Aug 1 2018, 4:40 PM
khanchi97 updated this revision to Diff 9785.Aug 2 2018, 4:25 AM
pulkit added inline comments.Aug 2 2018, 6:12 PM
mercurial/commands.py
4539

This should be an abort with message 'user quit' instead of just a return.

khanchi97 updated this revision to Diff 9816.Aug 3 2018, 3:39 AM
pulkit accepted this revision.Aug 3 2018, 10:00 AM
Closed by commit rHGf8732e33bcbc: resolve: add confirm config option (authored by khanchi97). · Explain WhyAug 3 2018, 10:27 AM
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Aug 3 2018, 1:26 PM
martinvonz added inline comments.
mercurial/configitems.py
193

Is this name too generic? It's specifically for confirming re-resolve with --all. I can imagine having confirmation for marking files as resolved and I'm not sure we'd want to share the config option if we ever added such a feature. It might also make the name clearer if it was something like resolve.confirmreresolve or resolve.confirmredo or resolve.confirmoverwrite.

pulkit added inline comments.Aug 3 2018, 1:32 PM
mercurial/configitems.py
193

For now, yes the name is generic. My plan with @khanchi97 on this is to respect this option with other flags too. Like hg resolve -m will ask before marking as resolve if this config option is set.

Once we are done with other flags too, this won't sound generic.

Revision Contents
Changeset List

Diff 9816

mercurial/commands.py

Mercurial will not let you commit files with unresolved merge Mercurial will not let you commit files with unresolved merge
conflicts. You must use :hg:`resolve -m ...` before you can conflicts. You must use :hg:`resolve -m ...` before you can
commit after a conflicting merge. commit after a conflicting merge.
Returns 0 on success, 1 if any files fail a resolve attempt. Returns 0 on success, 1 if any files fail a resolve attempt.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
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:
pulkitUnsubmitted
Not Done

I missed that we need --all, so make this prompt only when --all is passed.

pulkit: I missed that we need --all, so make this prompt only when `--all` is passed.
pulkitUnsubmitted
Not Done

please break this down into two if's. First one if all and confirm and the promptchoice in another one.

pulkit: please break this down into two if's. First one `if all and confirm` and the promptchoice in…
if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
b'$$ &Yes $$ &No')):
raise error.Abort(_('user quit'))
pulkitUnsubmitted
Not Done

This should be an abort with message 'user quit' instead of just a return.

pulkit: This should be an abort with message 'user quit' instead of just a return.
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'))

mercurial/configitems.py

default='auto', default='auto',
) )
coreconfigitem('color', 'pagermode', coreconfigitem('color', 'pagermode',
default=dynamicdefault, default=dynamicdefault,
) )
coreconfigitem('commands', 'grep.all-files', coreconfigitem('commands', 'grep.all-files',
default=False, default=False,
) )
coreconfigitem('commands', 'resolve.confirm',
pulkitUnsubmitted
Not Done

You need to document this config option. You can have a look at where other options are documented and do something similar.

pulkit: You need to document this config option. You can have a look at where other options are…
martinvonzUnsubmitted
Not Done

Is this name too generic? It's specifically for confirming re-resolve with --all. I can imagine having confirmation for marking files as resolved and I'm not sure we'd want to share the config option if we ever added such a feature. It might also make the name clearer if it was something like resolve.confirmreresolve or resolve.confirmredo or resolve.confirmoverwrite.

martinvonz: Is this name too generic? It's specifically for confirming re-resolve with `--all`. I can…
pulkitUnsubmitted
Not Done

For now, yes the name is generic. My plan with @khanchi97 on this is to respect this option with other flags too. Like hg resolve -m will ask before marking as resolve if this config option is set.

Once we are done with other flags too, this won't sound generic.

pulkit: For now, yes the name is generic. My plan with @khanchi97 on this is to respect this option…
default=False,
)
coreconfigitem('commands', 'show.aliasprefix', coreconfigitem('commands', 'show.aliasprefix',
default=list, default=list,
) )
coreconfigitem('commands', 'status.relative', coreconfigitem('commands', 'status.relative',
default=False, default=False,
) )
coreconfigitem('commands', 'status.skipstates', coreconfigitem('commands', 'status.skipstates',
default=[], default=[],
default=False, default=False,
) )
coreconfigitem('ui', 'quietbookmarkmove', coreconfigitem('ui', 'quietbookmarkmove',
default=False, default=False,
) )
coreconfigitem('ui', 'remotecmd', coreconfigitem('ui', 'remotecmd',
default='hg', default='hg',
) )
coreconfigitem('ui', 'report_untrusted', coreconfigitem('ui', 'report_untrusted',
pulkitUnsubmitted
Not Done

commands.resolve.confirm sounds a better place.

pulkit: commands.resolve.confirm sounds a better place.
default=True, default=True,
) )
coreconfigitem('ui', 'rollback', coreconfigitem('ui', 'rollback',
default=True, default=True,
) )
coreconfigitem('ui', 'signal-safe-lock', coreconfigitem('ui', 'signal-safe-lock',
default=True, default=True,
) )

mercurial/help/config.txt

codes). codes).
On some systems (such as MSYS in Windows), the terminal may support On some systems (such as MSYS in Windows), the terminal may support
a different color mode than the pager program. a different color mode than the pager program.
``commands`` ``commands``
------------ ------------
``resolve.confirm``
Confirm before re-merging all unresolved files when running
:hg:`resolve --all`.
(default: False)
``status.relative`` ``status.relative``
Make paths in :hg:`status` output relative to the current directory. Make paths in :hg:`status` output relative to the current directory.
(default: False) (default: False)
``status.terse`` ``status.terse``
Default value for the --terse flag, which condenes status output. Default value for the --terse flag, which condenes status output.
(default: empty) (default: empty)

tests/test-resolve.t

$ mkdir .hg/merge $ mkdir .hg/merge
$ touch .hg/merge/state $ touch .hg/merge/state
resolve -l should be empty resolve -l should be empty
$ hg resolve -l $ hg resolve -l
$ cd .. $ cd ..
======================================================
Test 'hg resolve' confirm config option functionality |
======================================================
$ cat >> $HGRCPATH << EOF
> [extensions]
> rebase=
> EOF
$ hg init repo2
$ cd repo2
$ echo boss > boss
$ hg ci -Am "add boss"
adding boss
$ for emp in emp1 emp2 emp3; do echo work > $emp; done;
$ hg ci -Aqm "added emp1 emp2 emp3"
$ hg up 0
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ for emp in emp1 emp2 emp3; do echo nowork > $emp; done;
$ hg ci -Aqm "added lazy emp1 emp2 emp3"
$ hg log -GT "{rev} {node|short} {firstline(desc)}\n"
@ 2 0acfd4a49af0 added lazy emp1 emp2 emp3
|
| o 1 f30f98a8181f added emp1 emp2 emp3
|/
o 0 88660038d466 add boss
$ hg rebase -s 1 -d 2
rebasing 1:f30f98a8181f "added emp1 emp2 emp3"
merging emp1
merging emp2
merging emp3
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 emp3! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
[1]
Test when commands.resolve.confirm config option is not set:
===========================================================
$ hg resolve --all
merging emp1
merging emp2
merging emp3
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 emp3! (edit, then use 'hg resolve --mark')
[1]
Test when config option is set:
==============================
$ cat >> $HGRCPATH << EOF
> [ui]
> interactive = True
> [commands]
> resolve.confirm = True
> EOF
$ hg resolve
abort: no files or directories specified
(use --all to re-merge all unresolved files)
[255]
$ hg resolve --all << EOF
> n
> EOF
re-merge all unresolved files (yn)? n
abort: user quit
[255]
pulkitUnsubmitted
Not Done

this should be user quit rather than this abort.

pulkit: this should be user quit rather than this abort.
$ hg resolve --all << EOF
> y
> EOF
re-merge all unresolved files (yn)? y
merging emp1
merging emp2
merging emp3
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 emp3! (edit, then use 'hg resolve --mark')
[1]
$ hg rebase --abort
rebase aborted
$ cd ..