Patchwork D3167: bookmarks: use isrevsymbol() for detecting collision with existing symbol

login
register
mail settings
Submitter phabricator
Date April 6, 2018, 6:51 p.m.
Message ID <fbf7fc7914a99600ed72d4d392482265@localhost.localdomain>
Download mbox | patch
Permalink /patch/30455/
State Not Applicable
Headers show

Comments

phabricator - April 6, 2018, 6:51 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG46d9f998c3ed: bookmarks: use isrevsymbol() for detecting collision with existing symbol (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3167?vs=7794&id=7799

REVISION DETAIL
  https://phab.mercurial-scm.org/D3167

AFFECTED FILES
  mercurial/bookmarks.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -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: