This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7663

transplant: use check_incompatible_arguments()
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd50b4ad1d4a5: transplant: use check_incompatible_arguments()

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, 5:59 PM
pulkit accepted this revision.Dec 17 2019, 2:36 AM
This revision is now accepted and ready to land.Dec 17 2019, 2:36 AM
martinvonz added a commit: rHGd50b4ad1d4a5: transplant: use check_incompatible_arguments().Dec 17 2019, 3:00 AM
Closed by commit rHGd50b4ad1d4a5: transplant: use check_incompatible_arguments() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/transplant.py (20 lines)
Mtests/test-transplant.t (4 lines)

Diff 18798

hgext/transplant.py

for head in heads: for head in heads:
ancestors.append(ctx.ancestor(repo[head]).node()) ancestors.append(ctx.ancestor(repo[head]).node())
for node in repo.changelog.nodesbetween(ancestors, heads)[0]: for node in repo.changelog.nodesbetween(ancestors, heads)[0]:
if match(node): if match(node):
yield node yield node
def checkopts(opts, revs): def checkopts(opts, revs):
if opts.get(b'continue'): if opts.get(b'continue'):
if opts.get(b'branch') or opts.get(b'all') or opts.get(b'merge'): cmdutil.check_incompatible_arguments(
raise error.Abort( opts, b'continue', b'branch', b'all', b'merge'
_(
b'--continue is incompatible with '
b'--branch, --all and --merge'
)
) )
return return
if opts.get(b'stop'): if opts.get(b'stop'):
if opts.get(b'branch') or opts.get(b'all') or opts.get(b'merge'): cmdutil.check_incompatible_arguments(
raise error.Abort( opts, b'stop', b'branch', b'all', b'merge'
_(
b'--stop is incompatible with '
b'--branch, --all and --merge'
)
) )
return return
if not ( if not (
opts.get(b'source') opts.get(b'source')
or revs or revs
or opts.get(b'merge') or opts.get(b'merge')
or opts.get(b'branch') or opts.get(b'branch')
): ):
raise error.Abort( raise error.Abort(

tests/test-transplant.t

#endif #endif
$ hg init t $ hg init t
$ cd t $ cd t
$ hg transplant $ hg transplant
abort: no source URL, branch revision, or revision list provided abort: no source URL, branch revision, or revision list provided
[255] [255]
$ hg transplant --continue --all $ hg transplant --continue --all
abort: --continue is incompatible with --branch, --all and --merge abort: cannot specify both --continue and --all
[255] [255]
$ hg transplant --stop --all $ hg transplant --stop --all
abort: --stop is incompatible with --branch, --all and --merge abort: cannot specify both --stop and --all
[255] [255]
$ hg transplant --all tip $ hg transplant --all tip
abort: --all requires a branch revision abort: --all requires a branch revision
[255] [255]
$ hg transplant --all --branch default tip $ hg transplant --all --branch default tip
abort: --all is incompatible with a revision list abort: --all is incompatible with a revision list
[255] [255]
$ echo r1 > r1 $ echo r1 > r1