D3087: bookmarks: calculateupdate() returns a bookmark, not a rev
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Apr 4 22:53:59 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This changes the inaccurate/unclear documentation and also changes the
code so "node" now contains a binary nodeid.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3087
AFFECTED FILES
mercurial/bookmarks.py
mercurial/destutil.py
CHANGE DETAILS
diff --git a/mercurial/destutil.py b/mercurial/destutil.py
--- a/mercurial/destutil.py
+++ b/mercurial/destutil.py
@@ -55,10 +55,10 @@
def _destupdatebook(repo, clean):
"""decide on an update destination from active bookmark"""
# we also move the active bookmark, if any
- activemark = None
- node, movemark = bookmarks.calculateupdate(repo.ui, repo, None)
- if node is not None:
- activemark = node
+ node = None
+ activemark, movemark = bookmarks.calculateupdate(repo.ui, repo, None)
+ if activemark is not None:
+ node = repo.lookup(activemark)
return node, movemark, activemark
def _destupdatebranch(repo, clean):
diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -349,8 +349,8 @@
return heads
def calculateupdate(ui, repo, checkout):
- '''Return a tuple (targetrev, movemarkfrom) indicating the rev to
- check out and where to move the active bookmark from, if needed.'''
+ '''Return a tuple (activemark, movemarkfrom) indicating the active bookmark
+ and where to move the active bookmark from, if needed.'''
movemarkfrom = None
if checkout is None:
activemark = repo._activebookmark
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list