facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

destupdate: extract logic based on bookmarks in its own function

Browse Source 
One of the main goal of having consolidated destination function is to allow
extension to play with this logic. We extract sub logic to make is wrapping more
practical.
This commit is contained in:
Pierre-Yves David 2015-10-15 02:27:30 +01:00
parent 6594fee40e
commit 07af7a7ec4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mercurial/destutil.py
View File

@ -76,6 +76,15 @@ def _destupdateobs(repo, clean, check):
movemark = repo['.'].node()
return node, movemark, None
def _destupdatebook(repo, clean, check):
"""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
return node, movemark, activemark
def destupdate(repo, clean=False, check=False):
"""destination for bare update operation
@ -91,13 +100,10 @@ def destupdate(repo, clean=False, check=False):
movemark = activemark = None
node, movemark, activemark = _destupdateobs(repo, clean, check)
if node is None:
node, movemark, activemark = _destupdatebook(repo, clean, check)
if node is None:
# we also move the active bookmark, if any
node, movemark = bookmarks.calculateupdate(repo.ui, repo, None)
if node is not None:
activemark = node
if node is None:
try:
node = repo.branchtip(wc.branch())