This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7993

merge: use check_incompatible_arguments() for --abort
ClosedPublic

Authored by martinvonz on Jan 24 2020, 7:16 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG75c2ca094d3a: merge: use check_incompatible_arguments() for --abort

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

martinvonz created this revision.Jan 24 2020, 7:16 PM
pulkit accepted this revision.Jan 24 2020, 8:24 PM
This revision is now accepted and ready to land.Jan 24 2020, 8:24 PM
martinvonz added a commit: rHG75c2ca094d3a: merge: use check_incompatible_arguments() for --abort.Jan 25 2020, 7:24 PM
Closed by commit rHG75c2ca094d3a: merge: use check_incompatible_arguments() for --abort (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jan 27 2020, 5:32 AM

+ cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview')

It's a bit late, but I feel the arguments of check_incompatible_arguments()
is confusing since b'abort' isn't the same kind of arguments as the others.
I think (opts, b'abort', [b'rev', b'preview']) is more explicit.

martinvonz added a comment.Jan 27 2020, 12:42 PM
In D7993#118162, @yuja wrote:

+ cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview')

It's a bit late, but I feel the arguments of check_incompatible_arguments()
is confusing since b'abort' isn't the same kind of arguments as the others.
I think (opts, b'abort', [b'rev', b'preview']) is more explicit.

Good point. I've sent D8018.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (5 lines)
Mtests/test-commit-unresolved.t (4 lines)

Diff 19612

mercurial/commands.py

Returns 0 on success, 1 if there are unresolved files. Returns 0 on success, 1 if there are unresolved files.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
abort = opts.get(b'abort') abort = opts.get(b'abort')
if abort and repo.dirstate.p2() == nullid: if abort and repo.dirstate.p2() == nullid:
cmdutil.wrongtooltocontinue(repo, _(b'merge')) cmdutil.wrongtooltocontinue(repo, _(b'merge'))
cmdutil.check_incompatible_arguments(opts, b'abort', b'rev', b'preview')
if abort: if abort:
state = cmdutil.getunfinishedstate(repo) state = cmdutil.getunfinishedstate(repo)
if state and state._opname != b'merge': if state and state._opname != b'merge':
raise error.Abort( raise error.Abort(
_(b'cannot abort merge with %s in progress') % (state._opname), _(b'cannot abort merge with %s in progress') % (state._opname),
hint=state.hint(), hint=state.hint(),
) )
if node: if node:
raise error.Abort(_(b"cannot specify a node with --abort")) raise error.Abort(_(b"cannot specify a node with --abort"))
if opts.get(b'rev'):
raise error.Abort(_(b"cannot specify both --rev and --abort"))
if opts.get(b'preview'):
raise error.Abort(_(b"cannot specify --preview with --abort"))
if opts.get(b'rev') and node: if opts.get(b'rev') and node:
raise error.Abort(_(b"please specify just one revision")) raise error.Abort(_(b"please specify just one revision"))
if not node: if not node:
node = opts.get(b'rev') node = opts.get(b'rev')
if node: if node:
node = scmutil.revsingle(repo, node).node() node = scmutil.revsingle(repo, node).node()

tests/test-commit-unresolved.t

1 files updated, 0 files merged, 0 files removed, 1 files unresolved 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg merge --abort e4501 $ hg merge --abort e4501
abort: cannot specify a node with --abort abort: cannot specify a node with --abort
[255] [255]
$ hg merge --abort --rev e4501 $ hg merge --abort --rev e4501
abort: cannot specify both --rev and --abort abort: cannot specify both --abort and --rev
[255] [255]
#if abortcommand #if abortcommand
when in dry-run mode when in dry-run mode
$ hg abort --dry-run $ hg abort --dry-run
merge in progress, will be aborted merge in progress, will be aborted
#endif #endif
$ hg id $ hg id
68352a18a7c4 tip 68352a18a7c4 tip
$ hg merge -r 4 $ hg merge -r 4
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg merge --preview --abort $ hg merge --preview --abort
abort: cannot specify --preview with --abort abort: cannot specify both --abort and --preview
[255] [255]
$ hg abort $ hg abort
aborting the merge, updating back to 68352a18a7c4 aborting the merge, updating back to 68352a18a7c4
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg id $ hg id
68352a18a7c4 tip 68352a18a7c4 tip
$ cd .. $ cd ..