martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3164 AFFECTED FILES mercurial/destutil.py CHANGE DETAILS 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] To: martinvonz, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel