Mercurial > hg-stable
changeset 11705:e95bacedae12
merge with stable
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Thu, 29 Jul 2010 12:10:22 +0900 |
| parents | 55a2af02e45c (current diff) 18c47562d331 (diff) |
| children | 5fdf08b6b50c |
| files | hgext/bookmarks.py |
| diffstat | 3 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/bookmarks.py Thu Jul 29 10:39:59 2010 +0900 +++ b/hgext/bookmarks.py Thu Jul 29 12:10:22 2010 +0900 @@ -136,6 +136,9 @@ if "\n" in mark: raise util.Abort(_("bookmark name cannot contain newlines")) mark = mark.strip() + if not mark: + raise util.Abort(_("bookmark names cannot consist entirely of " + "whitespace")) if mark in marks and not force: raise util.Abort(_("a bookmark of the same name already exists")) if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
--- a/tests/test-bookmarks Thu Jul 29 10:39:59 2010 +0900 +++ b/tests/test-bookmarks Thu Jul 29 12:10:22 2010 +0900 @@ -100,4 +100,7 @@ echo % revision but no bookmark name hg bookmark -r . +echo % bookmark name with whitespace only +hg bookmark ' ' + true
--- a/tests/test-bookmarks.out Thu Jul 29 10:39:59 2010 +0900 +++ b/tests/test-bookmarks.out Thu Jul 29 12:10:22 2010 +0900 @@ -74,3 +74,5 @@ * x y 2:0316ce92851d % revision but no bookmark name abort: bookmark name required +% bookmark name with whitespace only +abort: bookmark names cannot consist entirely of whitespace