This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7643

rebase: use cmdutil.check_at_most_one_arg() for -b/-s/-r
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG08b8bf4a8516: rebase: use cmdutil.check_at_most_one_arg() for -b/-s/-r

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.Dec 13 2019, 2:54 AM
martinvonz updated this revision to Diff 18713.Dec 13 2019, 5:59 PM
martinvonz retitled this revision from rebase: use cmdutil.check_unique_argument() for -b/-s/-r to rebase: use cmdutil.check_at_most_one_arg() for -b/-s/-r.Dec 16 2019, 6:18 PM
martinvonz updated this revision to Diff 18770.
pulkit accepted this revision.Dec 17 2019, 2:17 AM
This revision is now accepted and ready to land.Dec 17 2019, 2:17 AM
martinvonz updated this revision to Diff 18822.Dec 17 2019, 1:10 PM

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (7 lines)
Mtests/test-rebase-parameters.t (6 lines)

Diff 18855

hgext/rebase.py

opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
inmemory = ui.configbool(b'rebase', b'experimental.inmemory') inmemory = ui.configbool(b'rebase', b'experimental.inmemory')
action = cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue') action = cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
if action: if action:
cmdutil.check_incompatible_arguments( cmdutil.check_incompatible_arguments(
opts, action, b'confirm', b'dry_run' opts, action, b'confirm', b'dry_run'
) )
cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run') cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run')
cmdutil.check_at_most_one_arg(opts, b'rev', b'source', b'base')
if action or repo.currenttransaction() is not None: if action or repo.currenttransaction() is not None:
# in-memory rebase is not compatible with resuming rebases. # in-memory rebase is not compatible with resuming rebases.
# (Or if it is run within a transaction, since the restart logic can # (Or if it is run within a transaction, since the restart logic can
# fail the entire transaction.) # fail the entire transaction.)
inmemory = False inmemory = False
if opts.get(b'auto_orphans'): if opts.get(b'auto_orphans'):
destspace=None, destspace=None,
): ):
"""use revisions argument to define destmap {srcrev: destrev}""" """use revisions argument to define destmap {srcrev: destrev}"""
if revf is None: if revf is None:
revf = [] revf = []
# destspace is here to work around issues with `hg pull --rebase` see # destspace is here to work around issues with `hg pull --rebase` see
# issue5214 for details # issue5214 for details
if srcf and basef:
raise error.Abort(_(b'cannot specify both a source and a base'))
if revf and basef:
raise error.Abort(_(b'cannot specify both a revision and a base'))
if revf and srcf:
raise error.Abort(_(b'cannot specify both a revision and a source'))
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
if not inmemory: if not inmemory:
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
if ui.configbool(b'commands', b'rebase.requiredest') and not destf: if ui.configbool(b'commands', b'rebase.requiredest') and not destf:
raise error.Abort( raise error.Abort(
_(b'you must specify a destination'), _(b'you must specify a destination'),

tests/test-rebase-parameters.t

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
[255] [255]
$ hg rebase --base 5 --source 4 $ hg rebase --base 5 --source 4
abort: cannot specify both a source and a base abort: cannot specify both --source and --base
[255] [255]
$ hg rebase --rev 5 --source 4 $ hg rebase --rev 5 --source 4
abort: cannot specify both a revision and a source abort: cannot specify both --rev and --source
[255] [255]
$ hg rebase --base 5 --rev 4 $ hg rebase --base 5 --rev 4
abort: cannot specify both a revision and a base abort: cannot specify both --rev and --base
[255] [255]
$ hg rebase --base 6 $ hg rebase --base 6
abort: branch 'default' has 3 heads - please rebase to an explicit rev abort: branch 'default' has 3 heads - please rebase to an explicit rev
(run 'hg heads .' to see heads, specify destination with -d) (run 'hg heads .' to see heads, specify destination with -d)
[255] [255]
$ hg rebase --rev '1 & !1' --dest 8 $ hg rebase --rev '1 & !1' --dest 8