Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: disallow bookmarks named 'tip', '.', or 'null'
authorKevin Bullock <kbullock@ringworld.org>
Wed, 17 Oct 2012 16:32:43 -0500
changeset 17816 19388ba75a06
parent 17815 be1467342038
child 17817 b17be267b59c
bookmarks: disallow bookmarks named 'tip', '.', or 'null' This makes bookmarks reject the same reserved names as tags and branches.
mercurial/bookmarks.py file | annotate | diff | comparison | revisions
tests/test-bookmarks.t file | annotate | diff | comparison | revisions 
--- a/mercurial/bookmarks.py	Wed Oct 17 17:03:01 2012 -0500
+++ b/mercurial/bookmarks.py	Wed Oct 17 16:32:43 2012 -0500
@@ -15,6 +15,8 @@
         if c in mark:
             raise util.Abort(_("bookmark '%s' contains illegal "
                 "character" % mark))
+    if mark in ['tip', '.', 'null']:
+        raise util.Abort(_('the name \'%s\' is reserved') % mark)
 
 def read(repo):
     '''Parse .hg/bookmarks file and return a dictionary
--- a/tests/test-bookmarks.t	Wed Oct 17 17:03:01 2012 -0500
+++ b/tests/test-bookmarks.t	Wed Oct 17 16:32:43 2012 -0500
@@ -222,6 +222,21 @@
   abort: bookmark names cannot consist entirely of whitespace
   [255]
 
+bookmark with reserved name
+
+  $ hg bookmark tip
+  abort: the name 'tip' is reserved
+  [255]
+
+  $ hg bookmark .
+  abort: the name '.' is reserved
+  [255]
+
+  $ hg bookmark null
+  abort: the name 'null' is reserved
+  [255]
+
+
 bookmark with existing name
 
   $ hg bookmark Z
Mercurial