Mercurial > hg-stable
changeset 39768:2d478b05fb14
bookmarks: reject --delete with --inactive which makes no sense
A deleted bookmark is neither active nor inactive.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 15 Sep 2018 12:34:13 +0900 |
| parents | 5dfc0ca02aa0 |
| children | b05b4b91de3d |
| files | mercurial/commands.py tests/test-bookmarks.t |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Sep 15 12:32:01 2018 +0900 +++ b/mercurial/commands.py Sat Sep 15 12:34:13 2018 +0900 @@ -980,8 +980,8 @@ raise error.Abort(_("--rev is incompatible with --%s") % action) if names and action == 'active': raise error.Abort(_("NAMES is incompatible with --active")) - if inactive and action == 'active': - raise error.Abort(_("--inactive is incompatible with --active")) + if inactive and action in {'delete', 'active'}: + raise error.Abort(_("--inactive is incompatible with --%s") % action) if not names and action in {'add', 'delete'}: raise error.Abort(_("bookmark name required"))
--- a/tests/test-bookmarks.t Sat Sep 15 12:32:01 2018 +0900 +++ b/tests/test-bookmarks.t Sat Sep 15 12:34:13 2018 +0900 @@ -327,6 +327,12 @@ abort: bookmark 'A' does not exist [255] +delete with --inactive + + $ hg bookmark -d --inactive Y + abort: --inactive is incompatible with --delete + [255] + bookmark name with spaces should be stripped $ hg bookmark ' x y '