Mercurial > public > mercurial-scm > hg
diff mercurial/bookmarks.py @ 45913:9acbe30953e8
errors: raise InputError on bad bookmark argument
Differential Revision: https://phab.mercurial-scm.org/D9385
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 17 Nov 2020 16:32:03 -0800 |
| parents | f189c5280d48 |
| children | 89a2afe31e82 |
line wrap: on
line diff
--- a/mercurial/bookmarks.py Mon Nov 23 12:27:22 2020 -0800 +++ b/mercurial/bookmarks.py Tue Nov 17 16:32:03 2020 -0800 @@ -901,7 +901,7 @@ """ mark = mark.strip() if not mark: - raise error.Abort( + raise error.InputError( _(b"bookmark names cannot consist entirely of whitespace") ) scmutil.checknewlabel(repo, mark, b'bookmark') @@ -917,7 +917,7 @@ changes = [] for mark in names: if mark not in marks: - raise error.Abort(_(b"bookmark '%s' does not exist") % mark) + raise error.InputError(_(b"bookmark '%s' does not exist") % mark) if mark == repo._activebookmark: deactivate(repo) changes.append((mark, None)) @@ -937,7 +937,7 @@ marks = repo._bookmarks mark = checkformat(repo, new) if old not in marks: - raise error.Abort(_(b"bookmark '%s' does not exist") % old) + raise error.InputError(_(b"bookmark '%s' does not exist") % old) changes = [] for bm in marks.checkconflict(mark, force): changes.append((bm, None)) @@ -1041,7 +1041,7 @@ bmarks = {} for bmark in names or marks: if bmark not in marks: - raise error.Abort(_(b"bookmark '%s' does not exist") % bmark) + raise error.InputError(_(b"bookmark '%s' does not exist") % bmark) active = repo._activebookmark if bmark == active: prefix, label = b'*', activebookmarklabel