This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4379

resolve: add config to make hg resolve not re-merge by default
ClosedPublic

Authored by valentin.gatienbaron on Aug 26 2018, 7:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG56469d475341: resolve: add config to make hg resolve not re-merge by default
Summary

Before this, calling 'hg resolve' with neither -m, -u or -l will
re-merge. This is highly error prone (it's easy to forget to forget a
-m), and pretty bad when it happens (many people have no idea 'hg
resolve' can re-merge, and end up redoing the work of resolving all
the conflicts, because they have no idea there was a backup of their
work).

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

pulkit added subscribers: durin42, pulkit.Sep 1 2018, 4:28 PM

I like the feature it introduces. Thanks for coding this up. This looks like a good candidate for ui.tweakdefaults, @durin42 what do you think?

mercurial/commands.py
4566

ui.configbool() is better. Can you followup?

Closed by commit rHG56469d475341: resolve: add config to make hg resolve not re-merge by default (authored by valentin.gatienbaron). · Explain WhySep 1 2018, 4:59 PM
This revision was automatically updated to reflect the committed changes.
durin42 added a comment.Sep 2 2018, 9:04 PM

I like the feature it introduces. Thanks for coding this up. This looks like a good candidate for ui.tweakdefaults, @durin42 what do you think?

I think I’m generally fine with that.

Revision Contents
Changeset List

Diff 10706

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 re_merge'.split() flaglist = 'all mark unmark list no_status re_merge'.split()
all, mark, unmark, show, nostatus, remerge = \ all, mark, unmark, show, nostatus, remerge = \
[opts.get(o) for o in flaglist] [opts.get(o) for o in flaglist]
if len(list(filter(None, [show, mark, unmark, remerge]))) > 1: actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
raise error.Abort(_("too many options specified")) if actioncount > 1:
raise error.Abort(_("too many actions specified"))
elif (actioncount == 0
and ui.config('commands', 'resolve.explicit-re-merge')):
pulkitUnsubmitted
Not Done

ui.configbool() is better. Can you followup?

pulkit: ui.configbool() is better. Can you followup?
hint = _('use --mark, --unmark, --list or --re-merge')
raise error.Abort(_('no action specified'), hint=hint)
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 confirm: if confirm:
if all: if all:

mercurial/configitems.py

default=dynamicdefault, default=dynamicdefault,
) )
coreconfigitem('commands', 'grep.all-files', coreconfigitem('commands', 'grep.all-files',
default=False, default=False,
) )
coreconfigitem('commands', 'resolve.confirm', coreconfigitem('commands', 'resolve.confirm',
default=False, default=False,
) )
coreconfigitem('commands', 'resolve.explicit-re-merge',
default=False,
)
coreconfigitem('commands', 'resolve.mark-check', coreconfigitem('commands', 'resolve.mark-check',
default='none', default='none',
) )
coreconfigitem('commands', 'show.aliasprefix', coreconfigitem('commands', 'show.aliasprefix',
default=list, default=list,
) )
coreconfigitem('commands', 'status.relative', coreconfigitem('commands', 'status.relative',
default=False, default=False,

mercurial/help/config.txt

``commands`` ``commands``
------------ ------------
``resolve.confirm`` ``resolve.confirm``
Confirm before performing action if no filename is passed. Confirm before performing action if no filename is passed.
(default: False) (default: False)
``resolve.explicit-re-merge``
Require uses of ``hg resolve`` to specify which action it should perform,
instead of re-merging files by default.
(default: False)
``resolve.mark-check`` ``resolve.mark-check``
Determines what level of checking :hg:`resolve --mark` will perform before Determines what level of checking :hg:`resolve --mark` will perform before
marking files as resolved. Valid values are ``none`, ``warn``, and marking files as resolved. Valid values are ``none`, ``warn``, and
``abort``. ``warn`` will output a warning listing the file(s) that still ``abort``. ``warn`` will output a warning listing the file(s) that still
have conflict markers in them, but will still mark everything resolved. have conflict markers in them, but will still mark everything resolved.
``abort`` will output the same warning but will not mark things as resolved. ``abort`` will output the same warning but will not mark things as resolved.
If --all is passed and this is set to ``abort``, only a warning will be If --all is passed and this is set to ``abort``, only a warning will be
shown (an error will not be raised). shown (an error will not be raised).

tests/test-resolve.t

R file1 R file1
R file2 R file2
Testing the --re-merge flag Testing the --re-merge flag
$ hg resolve --unmark file1 $ hg resolve --unmark file1
$ hg resolve -l $ hg resolve -l
U file1 U file1
R file2 R file2
$ hg resolve --mark --re-merge $ hg resolve --mark --re-merge
abort: too many options specified abort: too many actions specified
[255] [255]
$ hg resolve --re-merge --all $ hg resolve --re-merge --all
merging file1 merging file1
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
[1] [1]
Explicit re-merge
$ hg resolve --unmark file1
$ hg resolve --config commands.resolve.explicit-re-merge=1 --all
abort: no action specified
(use --mark, --unmark, --list or --re-merge)
[255]
$ hg resolve --config commands.resolve.explicit-re-merge=1 --re-merge --all
merging file1
warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
[1]
$ cd .. $ cd ..
====================================================== ======================================================
Test 'hg resolve' confirm config option functionality | Test 'hg resolve' confirm config option functionality |
====================================================== ======================================================
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]