This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7644

rebase: use cmdutil.check_incompatible_arguments() for --auto-orphans
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG412f199b4092: rebase: use cmdutil.check_incompatible_arguments() for --auto-orphans

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 18714.Dec 13 2019, 5:59 PM
martinvonz retitled this revision from rebase: use cmdutil.check_unique_argument() for --auto-orphans to rebase: use cmdutil.check_incompatible_arguments() for --auto-orphans.Dec 16 2019, 6:18 PM
martinvonz updated this revision to Diff 18771.
pulkit mentioned this in D7641: rebase: use cmdutil.check_at_most_one_arg() for --confirm/--dry-run.Dec 17 2019, 11:02 AM
pulkit added a subscriber: pulkit.
pulkit added inline comments.
tests/test-rebase-obsolete.t
2057

Unrelated change?

martinvonz added inline comments.Dec 17 2019, 1:01 PM
tests/test-rebase-obsolete.t
2057

Oops, that belongs in D7661. Thanks!

martinvonz updated this revision to Diff 18823.Dec 17 2019, 1:10 PM
pulkit accepted this revision.Dec 18 2019, 12:55 AM
This revision is now accepted and ready to land.Dec 18 2019, 12:55 AM

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (10 lines)
Mtests/test-rebase-obsolete.t (2 lines)

Diff 18856

hgext/rebase.py

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'):
for key in opts: disallowed_opts = set(opts) - {b'auto_orphans'}
if key != b'auto_orphans' and opts.get(key): cmdutil.check_incompatible_arguments(
raise error.Abort( opts, b'auto_orphans', *disallowed_opts
_(b'--auto-orphans is incompatible with %s') % (b'--' + key)
) )
userrevs = list(repo.revs(opts.get(b'auto_orphans'))) userrevs = list(repo.revs(opts.get(b'auto_orphans')))
opts[b'rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)] opts[b'rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)]
opts[b'dest'] = b'_destautoorphanrebase(SRC)' opts[b'dest'] = b'_destautoorphanrebase(SRC)'
if opts.get(b'dry_run') or opts.get(b'confirm'): if opts.get(b'dry_run') or opts.get(b'confirm'):
return _dryrunrebase(ui, repo, action, opts) return _dryrunrebase(ui, repo, action, opts)
elif action == b'stop': elif action == b'stop':
rbsrt = rebaseruntime(repo, ui) rbsrt = rebaseruntime(repo, ui)

tests/test-rebase-obsolete.t

| o 4:9520eea781bc E | o 4:9520eea781bc E
|/ |/
o 0:cd010b8cd998 A o 0:cd010b8cd998 A
$ cd .. $ cd ..
$ cp -R hidden stabilize $ cp -R hidden stabilize
$ cd stabilize $ cd stabilize
$ hg rebase --auto-orphans '0::' -d 10 $ hg rebase --auto-orphans '0::' -d 10
abort: --auto-orphans is incompatible with --dest abort: cannot specify both --auto-orphans and --dest
[255] [255]
$ hg rebase --auto-orphans '0::' $ hg rebase --auto-orphans '0::'
rebasing 9:cf44d2f5a9f4 "D" rebasing 9:cf44d2f5a9f4 "D"
$ hg log -G $ hg log -G
o 12:7e3935feaa68 D o 12:7e3935feaa68 D
| |
o 11:0d8f238b634c C o 11:0d8f238b634c C
| |
================================================= =================================================
$ 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 --stop and --dry-run abort: cannot specify both --stop and --dry-run
pulkitUnsubmitted
Not Done

Unrelated change?

pulkit: Unrelated change?
martinvonzAuthorUnsubmitted
Done

Oops, that belongs in D7661. Thanks!

martinvonz: Oops, that belongs in D7661. Thanks!
[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