This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7661

rebase: use cmdutil.check_incompatible_arguments() for action+confirm/dryrun
ClosedPublic

Authored by martinvonz on Dec 13 2019, 5:56 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG905b21783968: rebase: use cmdutil.check_incompatible_arguments() for action+confirm/dryrun

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.

Revision Contents
Changeset List

Diff 18853

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')
dryrun = opts.get(b'dry_run') dryrun = opts.get(b'dry_run')
confirm = opts.get(b'confirm') confirm = opts.get(b'confirm')
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 dryrun and action: if action:
raise error.Abort(_(b'cannot specify both --dry-run and --%s') % action) cmdutil.check_incompatible_arguments(
if confirm and action: opts, action, b'confirm', b'dry_run'
raise error.Abort(_(b'cannot specify both --confirm and --%s') % action) )
cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run') cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run')
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

tests/test-rebase-inmemory.t

o 1:d2ae7f538514 test o 1:d2ae7f538514 test
| b | b
| |
o 0:cb9a9f314b8b test o 0:cb9a9f314b8b test
a a
Make sure it throws error while passing --continue or --abort with --dry-run Make sure it throws error while passing --continue or --abort with --dry-run
$ hg rebase -s 2 -d 6 -n --continue $ hg rebase -s 2 -d 6 -n --continue
abort: cannot specify both --dry-run and --continue abort: cannot specify both --continue and --dry-run
[255] [255]
$ hg rebase -s 2 -d 6 -n --abort $ hg rebase -s 2 -d 6 -n --abort
abort: cannot specify both --dry-run and --abort abort: cannot specify both --abort and --dry-run
[255] [255]
Check dryrun gives correct results when there is no conflict in rebasing Check dryrun gives correct results when there is no conflict in rebasing
$ hg rebase -s 2 -d 6 -n $ hg rebase -s 2 -d 6 -n
starting dry-run rebase; repository will not be changed starting dry-run rebase; repository will not be changed
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
rebasing 4:e860deea161a "e" rebasing 4:e860deea161a "e"
o 0:cb9a9f314b8b test o 0:cb9a9f314b8b test
a a
Check it gives error when both --dryrun and --confirm is used: Check it gives error when both --dryrun and --confirm is used:
$ hg rebase -s 2 -d . --confirm --dry-run $ hg rebase -s 2 -d . --confirm --dry-run
abort: cannot specify both --confirm and --dry-run abort: cannot specify both --confirm and --dry-run
[255] [255]
$ hg rebase -s 2 -d . --confirm --abort $ hg rebase -s 2 -d . --confirm --abort
abort: cannot specify both --confirm and --abort abort: cannot specify both --abort and --confirm
[255] [255]
$ hg rebase -s 2 -d . --confirm --continue $ hg rebase -s 2 -d . --confirm --continue
abort: cannot specify both --confirm and --continue abort: cannot specify both --continue and --confirm
[255] [255]
Test --confirm option when there are no conflicts: Test --confirm option when there are no conflicts:
$ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF $ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF
> n > n
> EOF > EOF
starting in-memory rebase starting in-memory rebase
rebasing 2:177f92b77385 "c" rebasing 2:177f92b77385 "c"

tests/test-rebase-obsolete.t

================================================= =================================================
$ hg rebase -s 3 -d 5 $ hg rebase -s 3 -d 5
rebasing 3:055a42cdd887 "d" rebasing 3:055a42cdd887 "d"
merging d merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark') warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg rebase --stop --dry-run $ hg rebase --stop --dry-run
abort: cannot specify both --dry-run and --stop abort: cannot specify both --stop and --dry-run
[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 specify both --stop and --continue abort: cannot specify both --stop and --continue