destutil: look up bookmarks only among bookmarks
Differential Revision: https://phab.mercurial-scm.org/D3164
--- a/mercurial/destutil.py Fri Apr 06 10:49:43 2018 -0700
+++ b/mercurial/destutil.py Fri Apr 06 10:48:11 2018 -0700
@@ -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]