This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7648

bookmarks: use cmdutil.check_incompatible_arguments() for action+rev
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG5cde16489b42: bookmarks: use cmdutil.check_incompatible_arguments() for action+rev

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+rev to bookmarks: use cmdutil.check_incompatible_arguments() for action+rev.Dec 16 2019, 6:18 PM
martinvonz updated this revision to Diff 18775.
pulkit accepted this revision.Dec 17 2019, 2:34 AM
This revision is now accepted and ready to land.Dec 17 2019, 2:34 AM

Revision Contents
Changeset List

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

Diff 18796

mercurial/commands.py

''' '''
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
action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list') action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
if action: if action:
pass 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 rev and action in {b'delete', b'rename', b'list'}:
raise error.Abort(_(b"--rev is incompatible with --%s") % action)
if inactive and action in {b'delete', b'list'}: if inactive and action in {b'delete', b'list'}:
raise error.Abort(_(b"--inactive is incompatible with --%s") % action) 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':

tests/test-bookmarks.t

X 0:f7b1eb17ad24 X 0:f7b1eb17ad24
Y -1:000000000000 Y -1:000000000000
$ hg bookmarks -l . $ hg bookmarks -l .
* 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: --rev is incompatible with --list abort: cannot specify both --list and --rev
[255] [255]
$ hg bookmarks -l --inactive $ hg bookmarks -l --inactive
abort: --inactive is incompatible with --list abort: --inactive is incompatible with --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
$ cd repo $ cd repo
$ hg bookmark -m Y -d Z $ hg bookmark -m Y -d Z
abort: cannot specify both --delete and --rename 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: cannot specify both --delete and --rev
[255] [255]
$ hg bookmark -r 1 -m Z Y $ hg bookmark -r 1 -m Z Y
abort: --rev is incompatible with --rename abort: cannot specify both --rename and --rev
[255] [255]
force bookmark with existing name force bookmark with existing name
$ hg bookmark -f X2 --config "$TESTHOOK" $ hg bookmark -f X2 --config "$TESTHOOK"
test-hook-bookmark: X2: 925d80f479bb026b0fb3deb27503780b13f74123 -> db815d6d32e69058eadefc8cffbad37675707975 test-hook-bookmark: X2: 925d80f479bb026b0fb3deb27503780b13f74123 -> db815d6d32e69058eadefc8cffbad37675707975
force bookmark back to where it was, should deactivate it force bookmark back to where it was, should deactivate it