Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: use isrevsymbol() for detecting collision with existing symbol
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 06 Apr 2018 11:28:26 -0700
changeset 37397 46d9f998c3ed
parent 37396 9966f44ecab4
child 37398 3235afdfcf1c
bookmarks: use isrevsymbol() for detecting collision with existing symbol Differential Revision: https://phab.mercurial-scm.org/D3167
mercurial/bookmarks.py file | annotate | diff | comparison | revisions 
--- a/mercurial/bookmarks.py	Fri Apr 06 11:26:50 2018 -0700
+++ b/mercurial/bookmarks.py	Fri Apr 06 11:28:26 2018 -0700
@@ -238,7 +238,7 @@
                 _("a bookmark cannot have the name of an existing branch"))
         if len(mark) > 3 and not force:
             try:
-                shadowhash = (mark in self._repo)
+                shadowhash = scmutil.isrevsymbol(self._repo, mark)
             except error.LookupError:  # ambiguous identifier
                 shadowhash = False
             if shadowhash:
mercurial