Mercurial > public > mercurial-scm > hg

diff mercurial/bookmarks.py @ 17816:19388ba75a06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: disallow bookmarks named 'tip', '.', or 'null' This makes bookmarks reject the same reserved names as tags and branches.
author Kevin Bullock <kbullock@ringworld.org>
date Wed, 17 Oct 2012 16:32:43 -0500
parents be1467342038
children 5023027240a1
line wrap: on
line diff
--- 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