This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7662

bookmarks: use check_incompatible_arguments() for inactive+action
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe623ad1b4800: bookmarks: use check_incompatible_arguments() for inactive+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.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (3 lines)
Mtests/test-bookmarks.t (4 lines)

Diff 18797

mercurial/commands.py

cmdutil.check_incompatible_arguments(opts, action, b'rev') cmdutil.check_incompatible_arguments(opts, action, b'rev')
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 inactive and action in {b'delete', b'list'}: cmdutil.check_incompatible_arguments(opts, b'inactive', b'delete', b'list')
raise error.Abort(_(b"--inactive is incompatible with --%s") % action)
if not names and action in {b'add', b'delete'}: if not names and action in {b'add', b'delete'}:
raise error.Abort(_(b"bookmark name required")) raise error.Abort(_(b"bookmark name required"))
if action in {b'add', b'delete', b'rename', b'inactive'}: if action in {b'add', b'delete', b'rename', b'inactive'}:
with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr: with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
if action == b'delete': if action == b'delete':
names = pycompat.maplist(repo._bookmarks.expandname, names) names = pycompat.maplist(repo._bookmarks.expandname, names)
bookmarks.delete(repo, tr, names) bookmarks.delete(repo, tr, names)

tests/test-bookmarks.t

* X2 0:f7b1eb17ad24 * X2 0:f7b1eb17ad24
$ hg bookmarks -l X A Y $ hg bookmarks -l X A Y
abort: bookmark 'A' does not exist abort: bookmark 'A' does not exist
[255] [255]
$ hg bookmarks -l -r0 $ hg bookmarks -l -r0
abort: cannot specify both --list and --rev abort: cannot specify both --list and --rev
[255] [255]
$ hg bookmarks -l --inactive $ hg bookmarks -l --inactive
abort: --inactive is incompatible with --list abort: cannot specify both --inactive and --list
[255] [255]
$ hg log -T '{bookmarks % "{rev} {bookmark}\n"}' $ hg log -T '{bookmarks % "{rev} {bookmark}\n"}'
0 X 0 X
0 X2 0 X2
$ echo b > b $ echo b > b
$ hg add b $ hg add b
$ hg bookmark -d A $ hg bookmark -d A
abort: bookmark 'A' does not exist abort: bookmark 'A' does not exist
[255] [255]
delete with --inactive delete with --inactive
$ hg bookmark -d --inactive Y $ hg bookmark -d --inactive Y
abort: --inactive is incompatible with --delete abort: cannot specify both --inactive and --delete
[255] [255]
bookmark name with spaces should be stripped bookmark name with spaces should be stripped
$ hg bookmark ' x y ' $ hg bookmark ' x y '
list bookmarks list bookmarks