Patchwork D3164: destutil: look up bookmarks only among bookmarks

login
register
mail settings
Submitter phabricator
Date April 7, 2018, 5:38 a.m.
Message ID <f9fc8fd98fa06097f7869751d997b4e2@localhost.localdomain>
Download mbox | patch
Permalink /patch/30519/
State Not Applicable
Headers show

Comments

phabricator - April 7, 2018, 5:38 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2b38c80557a4: destutil: look up bookmarks only among bookmarks (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3164?vs=7791&id=7858

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

AFFECTED FILES
  mercurial/destutil.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/destutil.py b/mercurial/destutil.py
--- a/mercurial/destutil.py
+++ b/mercurial/destutil.py
@@ -58,7 +58,7 @@ 
     node = None
     activemark, movemark = bookmarks.calculateupdate(repo.ui, repo)
     if activemark is not None:
-        node = repo.lookup(activemark)
+        node = repo._bookmarks[activemark]
     return node, movemark, activemark
 
 def _destupdatebranch(repo, clean):
@@ -236,7 +236,7 @@ 
     """find merge destination in the active bookmark case"""
     node = None
     bmheads = bookmarks.headsforactive(repo)
-    curhead = repo[repo._activebookmark].node()
+    curhead = repo._bookmarks[repo._activebookmark]
     if len(bmheads) == 2:
         if curhead == bmheads[0]:
             node = bmheads[1]
@@ -361,7 +361,7 @@ 
 
 def _statusotherbook(ui, repo):
     bmheads = bookmarks.headsforactive(repo)
-    curhead = repo[repo._activebookmark].node()
+    curhead = repo._bookmarks[repo._activebookmark]
     if repo.revs('%n and parents()', curhead):
         # we are on the active bookmark
         bmheads = [b for b in bmheads if curhead != b]