Mercurial > public > mercurial-scm > hg

diff mercurial/bookmarks.py @ 37359:e27298bf11dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: calculateupdate() returns a bookmark, not a rev This changes the inaccurate/unclear documentation and also changes the code so "node" now contains a binary nodeid. Differential Revision: https://phab.mercurial-scm.org/D3087
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 04 Apr 2018 15:13:32 -0700
parents a494cccb673e
children a973bb92ab71
line wrap: on
line diff
--- a/mercurial/bookmarks.py	Wed Apr 04 10:13:08 2018 -0700
+++ b/mercurial/bookmarks.py	Wed Apr 04 15:13:32 2018 -0700
@@ -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