This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7645

rebase: use cmdutil.check_at_most_one_arg() for action+revision
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8c87cc169946: rebase: use cmdutil.check_at_most_one_arg() for action+revision

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:54 AM
martinvonz updated this revision to Diff 18715.Dec 13 2019, 5:59 PM
martinvonz retitled this revision from rebase: use cmdutil.check_unique_argument() for action+revision to rebase: use cmdutil.check_at_most_one_arg() for action+revision.Dec 16 2019, 6:18 PM
martinvonz updated this revision to Diff 18772.
martinvonz updated this revision to Diff 18824.Dec 17 2019, 1:10 PM
pulkit accepted this revision.Dec 18 2019, 12:56 AM
This revision is now accepted and ready to land.Dec 18 2019, 12:56 AM

Revision Contents
Changeset List

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

Diff 18680

hgext/rebase.py

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')
action = cmdutil.check_unique_argument(opts, b'abort', b'stop', b'continue') action = cmdutil.check_unique_argument(opts, b'abort', b'stop', b'continue')
if action: if action:
cmdutil.check_unique_argument(opts, b'confirm', b'dry-run', action) cmdutil.check_unique_argument(opts, b'confirm', b'dry-run', action)
cmdutil.check_unique_argument(
opts, action, b'rev', b'source', b'base', b'dest'
)
cmdutil.check_unique_argument(opts, b'confirm', b'dry-run') cmdutil.check_unique_argument(opts, b'confirm', b'dry-run')
cmdutil.check_unique_argument(opts, b'rev', b'source', b'base') cmdutil.check_unique_argument(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 rbsrt.collapsemsg and not rbsrt.collapsef: if rbsrt.collapsemsg and not rbsrt.collapsef:
raise error.Abort(_(b'message can only be specified with collapse')) raise error.Abort(_(b'message can only be specified with collapse'))
if action: if action:
if rbsrt.collapsef: if rbsrt.collapsef:
raise error.Abort( raise error.Abort(
_(b'cannot use collapse with continue or abort') _(b'cannot use collapse with continue or abort')
) )
if srcf or basef or destf:
raise error.Abort(
_(b'abort and continue do not allow specifying revisions')
)
if action == b'abort' and opts.get(b'tool', False): if action == b'abort' and opts.get(b'tool', False):
ui.warn(_(b'tool option will be ignored\n')) ui.warn(_(b'tool option will be ignored\n'))
if action == b'continue': if action == b'continue':
ms = mergemod.mergestate.read(repo) ms = mergemod.mergestate.read(repo)
mergeutil.checkunresolved(ms) mergeutil.checkunresolved(ms)
retcode = rbsrt._prepareabortorcontinue( retcode = rbsrt._prepareabortorcontinue(
isabort=(action == b'abort') isabort=(action == b'abort')

tests/test-rebase-parameters.t

abort: cannot specify both --abort and --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: cannot specify both --continue and --dest
[255] [255]
$ hg rebase --base 5 --source 4 $ hg rebase --base 5 --source 4
abort: cannot specify both --source and --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 --rev and --source abort: cannot specify both --rev and --source