D3135: bookmarks: drop always-None argument from calculateupdate()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Apr 5 15:51:12 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Thanks to Yuya for noticing.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3135
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
@@ -56,7 +56,7 @@
"""decide on an update destination from active bookmark"""
# we also move the active bookmark, if any
node = None
- activemark, movemark = bookmarks.calculateupdate(repo.ui, repo, None)
+ activemark, movemark = bookmarks.calculateupdate(repo.ui, repo)
if activemark is not None:
node = repo.lookup(activemark)
return node, movemark, activemark
diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -348,17 +348,16 @@
heads.append(n)
return heads
-def calculateupdate(ui, repo, checkout):
+def calculateupdate(ui, repo):
'''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
- if isactivewdirparent(repo):
- movemarkfrom = repo['.'].node()
- elif activemark:
- ui.status(_("updating to active bookmark %s\n") % activemark)
- checkout = activemark
+ checkout, movemarkfrom = None, None
+ activemark = repo._activebookmark
+ if isactivewdirparent(repo):
+ movemarkfrom = repo['.'].node()
+ elif activemark:
+ ui.status(_("updating to active bookmark %s\n") % activemark)
+ checkout = activemark
return (checkout, movemarkfrom)
def update(repo, parents, node):
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list