This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7640

rebase: use cmdutil.check_at_most_one_arg() for action
ClosedPublic

Authored by martinvonz on Dec 13 2019, 2:53 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfff21278554b: rebase: use cmdutil.check_at_most_one_arg() for action
Summary

Here we also needed to know what the action was (if any), so I've
updated the helper to return any specified option.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Dec 13 2019, 2:53 AM
martinvonz updated this revision to Diff 18709.Dec 13 2019, 5:56 PM
martinvonz retitled this revision from rebase: use cmdutil.check_unique_argument() for action to rebase: use cmdutil.check_at_most_one_arg() for action.Dec 16 2019, 6:18 PM
martinvonz updated this revision to Diff 18766.
pulkit accepted this revision.Dec 17 2019, 2:14 AM
This revision is now accepted and ready to land.Dec 17 2019, 2:14 AM

Revision Contents
Changeset List

Diff 18675

hgext/rebase.py

Returns 0 on success, 1 if nothing to rebase or there are Returns 0 on success, 1 if nothing to rebase or there are
unresolved conflicts. unresolved conflicts.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
inmemory = ui.configbool(b'rebase', b'experimental.inmemory') inmemory = ui.configbool(b'rebase', b'experimental.inmemory')
dryrun = opts.get(b'dry_run') dryrun = opts.get(b'dry_run')
confirm = opts.get(b'confirm') confirm = opts.get(b'confirm')
selactions = [k for k in [b'abort', b'stop', b'continue'] if opts.get(k)] action = cmdutil.check_unique_argument(opts, b'abort', b'stop', b'continue')
if len(selactions) > 1:
raise error.Abort(
_(b'cannot use --%s with --%s') % tuple(selactions[:2])
)
action = selactions[0] if selactions else None
if dryrun and action: if dryrun and action:
raise error.Abort(_(b'cannot specify both --dry-run and --%s') % action) raise error.Abort(_(b'cannot specify both --dry-run and --%s') % action)
if confirm and action: if confirm and action:
raise error.Abort(_(b'cannot specify both --confirm and --%s') % action) raise error.Abort(_(b'cannot specify both --confirm and --%s') % action)
if dryrun and confirm: if dryrun and confirm:
raise error.Abort(_(b'cannot specify both --confirm and --dry-run')) raise error.Abort(_(b'cannot specify both --confirm and --dry-run'))
if action or repo.currenttransaction() is not None: if action or repo.currenttransaction() is not None:

mercurial/cmdutil.py

] ]
# special string such that everything below this line will be ingored in the # special string such that everything below this line will be ingored in the
# editor text # editor text
_linebelow = b"^HG: ------------------------ >8 ------------------------$" _linebelow = b"^HG: ------------------------ >8 ------------------------$"
def check_unique_argument(opts, *args): def check_unique_argument(opts, *args):
"""abort if more than one of the arguments are in opts""" """abort if more than one of the arguments are in opts
Returns the unique argument or None if none of them were specified.
"""
previous = None previous = None
for x in args: for x in args:
if opts.get(x): if opts.get(x):
if previous: if previous:
raise error.Abort( raise error.Abort(
_(b'cannot specify both --%s and --%s') % (previous, x) _(b'cannot specify both --%s and --%s') % (previous, x)
) )
previous = x previous = x
return previous
def resolvecommitoptions(ui, opts): def resolvecommitoptions(ui, opts):
"""modify commit options dict to handle related options """modify commit options dict to handle related options
The return value indicates that ``rewrite.update-timestamp`` is the reason The return value indicates that ``rewrite.update-timestamp`` is the reason
the ``date`` option is set. the ``date`` option is set.
""" """

tests/test-rebase-obsolete.t

abort: cannot specify both --dry-run and --stop abort: cannot specify both --dry-run and --stop
[255] [255]
$ hg rebase -s 3 -d 5 $ hg rebase -s 3 -d 5
abort: rebase in progress abort: rebase in progress
(use 'hg rebase --continue' or 'hg rebase --abort') (use 'hg rebase --continue' or 'hg rebase --abort')
[255] [255]
$ hg rebase --stop --continue $ hg rebase --stop --continue
abort: cannot use --stop with --continue abort: cannot specify both --stop and --continue
[255] [255]
Test --stop moves bookmarks of original revisions to new rebased nodes: Test --stop moves bookmarks of original revisions to new rebased nodes:
====================================================================== ======================================================================
$ cd .. $ cd ..
$ hg init repo $ hg init repo
$ cd repo $ cd repo

tests/test-rebase-parameters.t

$ hg clone -q -u . a a0 $ hg clone -q -u . a a0
$ cd a0 $ cd a0
$ hg rebase -s 8 -d 7 $ hg rebase -s 8 -d 7
nothing to rebase nothing to rebase
[1] [1]
$ hg rebase --continue --abort $ hg rebase --continue --abort
abort: cannot use --abort with --continue abort: cannot specify both --abort and --continue
[255] [255]
$ hg rebase --continue --collapse $ hg rebase --continue --collapse
abort: cannot use collapse with continue or abort abort: cannot use collapse with continue or abort
[255] [255]
$ hg rebase --continue --dest 4 $ hg rebase --continue --dest 4
abort: abort and continue do not allow specifying revisions abort: abort and continue do not allow specifying revisions