Mercurial > hg
changeset 37359:e27298bf11dd
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 | d5e1678026fd |
| children | d0d55980ffa7 |
| files | mercurial/bookmarks.py mercurial/destutil.py |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
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
--- a/mercurial/destutil.py Wed Apr 04 10:13:08 2018 -0700 +++ b/mercurial/destutil.py Wed Apr 04 15:13:32 2018 -0700 @@ -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):