This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5218

resolve: when resolve.mark-check=abort, downgrade to warning if pats specified
ClosedPublic

Authored by spectral on Nov 2 2018, 3:02 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGda2e874fe582: resolve: when resolve.mark-check=abort, downgrade to warning if pats specified
Summary

Previously, with --config resolve.mark-check=abort, running hg resolve -m foo
would abort and emit a message saying to use --all. This command does not work,
though: hg resolve -m foo --all, and it's really weird for --all to be the
"--force" flag.

My original goal with the option was to make it so that hg resolve -m (no
filename arguments) was safer, which is why --all is used; in my mind, `hg
resolve -m foo` should always mark it as resolved, and --all is how you
specify "all the files", so that's why I chose hg resolve -m --all as the way
out of hg resolve -m aborting. This commit makes all of this work the way it
was meant to in my head :)

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

spectral created this revision.Nov 2 2018, 3:02 PM
spectral added a comment.Nov 2 2018, 3:04 PM

Note: This is meant for 'stable'

yuja added a subscriber: yuja.Nov 3 2018, 10:10 PM

Queued for stable, thanks.

Previously, with --config resolve.mark-check=abort, running `hg resolve -m foo`
would abort and emit a message saying to use --all.  This command does not work,
though: `hg resolve -m foo --all`, and it's really weird for --all to be the
"--force" flag.
My original goal with the option was to make it so that `hg resolve -m` (no
filename arguments) was safer, which is why --all is used; in my mind, `hg
resolve -m foo` should always mark it as resolved, and `--all` is how you
specify "all the files", so that's why I chose `hg resolve -m --all` as the way
out of `hg resolve -m` aborting. This commit makes all of this work the way it
was meant to in my head :)

I thought it should abort if pats matched bad files, but realized it wouldn't
make sense since there's no "force" flag other than --all.

Can you update the config help to reflect this change?

Closed by commit rHGda2e874fe582: resolve: when resolve.mark-check=abort, downgrade to warning if pats specified (authored by spectral). · Explain WhyNov 3 2018, 10:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)
Mtests/test-resolve.t (13 lines)

Diff 12391

mercurial/commands.py

scmutil.origpath(ui, repo, a)) scmutil.origpath(ui, repo, a))
except OSError as inst: except OSError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
if hasconflictmarkers: if hasconflictmarkers:
ui.warn(_('warning: the following files still have conflict ' ui.warn(_('warning: the following files still have conflict '
'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n') 'markers:\n ') + '\n '.join(hasconflictmarkers) + '\n')
if markcheck == 'abort' and not all: if markcheck == 'abort' and not all and not pats:
raise error.Abort(_('conflict markers detected'), raise error.Abort(_('conflict markers detected'),
hint=_('use --all to mark anyway')) hint=_('use --all to mark anyway'))
for f in tocomplete: for f in tocomplete:
try: try:
# resolve file # resolve file
overrides = {('ui', 'forcemerge'): opts.get('tool', '')} overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
with ui.configoverride(overrides, 'resolve'): with ui.configoverride(overrides, 'resolve'):

tests/test-resolve.t

$ hg resolve -l $ hg resolve -l
U file1 U file1
U file2 U file2
$ hg --config commands.resolve.mark-check=none resolve -m $ hg --config commands.resolve.mark-check=none resolve -m
(no more unresolved files) (no more unresolved files)
$ hg resolve -l $ hg resolve -l
R file1 R file1
R file2 R file2
Test with marking an explicit file as resolved, this should not abort (since
there's no --force flag, we have no way of combining --all with a filename)
$ hg resolve --unmark
$ hg resolve -l
U file1
U file2
(This downgrades to a warning since an explicit file was specified).
$ hg --config commands.resolve.mark-check=abort resolve -m file2
warning: the following files still have conflict markers:
file2
$ hg resolve -l
U file1
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 actions specified abort: too many actions specified
[255] [255]