This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7647

bookmarks: use cmdutil.check_at_most_one_arg() for action
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3b50de911200: bookmarks: use cmdutil.check_at_most_one_arg() for action

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 retitled this revision from bookmarks: use cmdutil.check_unique_argument() for action to bookmarks: use cmdutil.check_at_most_one_arg() for action.Dec 16 2019, 6:18 PM
martinvonz updated this revision to Diff 18774.
pulkit accepted this revision.Dec 17 2019, 2:33 AM
This revision is now accepted and ready to land.Dec 17 2019, 2:33 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (10 lines)
Mtests/test-bookmarks.t (2 lines)

Diff 18795

mercurial/commands.py

hg book -ql . hg book -ql .
''' '''
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
force = opts.get(b'force') force = opts.get(b'force')
rev = opts.get(b'rev') rev = opts.get(b'rev')
inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
selactions = [k for k in [b'delete', b'rename', b'list'] if opts.get(k)] action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
if len(selactions) > 1: if action:
raise error.Abort( pass
_(b'--%s and --%s are incompatible') % tuple(selactions[:2])
)
if selactions:
action = selactions[0]
elif names or rev: elif names or rev:
action = b'add' action = b'add'
elif inactive: elif inactive:
action = b'inactive' # meaning deactivate action = b'inactive' # meaning deactivate
else: else:
action = b'list' action = b'list'
if rev and action in {b'delete', b'rename', b'list'}: if rev and action in {b'delete', b'rename', b'list'}:

tests/test-bookmarks.t

$ cd .. $ cd ..
incompatible options incompatible options
$ cd repo $ cd repo
$ hg bookmark -m Y -d Z $ hg bookmark -m Y -d Z
abort: --delete and --rename are incompatible abort: cannot specify both --delete and --rename
[255] [255]
$ hg bookmark -r 1 -d Z $ hg bookmark -r 1 -d Z
abort: --rev is incompatible with --delete abort: --rev is incompatible with --delete
[255] [255]
$ hg bookmark -r 1 -m Z Y $ hg bookmark -r 1 -m Z Y
abort: --rev is incompatible with --rename abort: --rev is incompatible with --rename