Show More
@@ -76,6 +76,15 b' def _destupdateobs(repo, clean, check):' | |||
|
76 | 76 | movemark = repo['.'].node() |
|
77 | 77 | return node, movemark, None |
|
78 | 78 | |
|
79 | def _destupdatebook(repo, clean, check): | |
|
80 | """decide on an update destination from active bookmark""" | |
|
81 | # we also move the active bookmark, if any | |
|
82 | activemark = None | |
|
83 | node, movemark = bookmarks.calculateupdate(repo.ui, repo, None) | |
|
84 | if node is not None: | |
|
85 | activemark = node | |
|
86 | return node, movemark, activemark | |
|
87 | ||
|
79 | 88 | def destupdate(repo, clean=False, check=False): |
|
80 | 89 | """destination for bare update operation |
|
81 | 90 | |
@@ -91,13 +100,10 b' def destupdate(repo, clean=False, check=' | |||
|
91 | 100 | movemark = activemark = None |
|
92 | 101 | |
|
93 | 102 | node, movemark, activemark = _destupdateobs(repo, clean, check) |
|
103 | if node is None: | |
|
104 | node, movemark, activemark = _destupdatebook(repo, clean, check) | |
|
94 | 105 | |
|
95 | 106 | if node is None: |
|
96 | # we also move the active bookmark, if any | |
|
97 | node, movemark = bookmarks.calculateupdate(repo.ui, repo, None) | |
|
98 | if node is not None: | |
|
99 | activemark = node | |
|
100 | ||
|
101 | 107 | if node is None: |
|
102 | 108 | try: |
|
103 | 109 | node = repo.branchtip(wc.branch()) |
General Comments 0
You need to be logged in to leave comments.
Login now