equal
deleted
inserted
replaced
167 if mark and marks[mark] in deletefrom: |
167 if mark and marks[mark] in deletefrom: |
168 if mark != bm: |
168 if mark != bm: |
169 del marks[mark] |
169 del marks[mark] |
170 deleted = True |
170 deleted = True |
171 return deleted |
171 return deleted |
|
172 |
|
173 def calculateupdate(ui, repo, checkout): |
|
174 '''Return a tuple (targetrev, movemarkfrom) indicating the rev to |
|
175 check out and where to move the active bookmark from, if needed.''' |
|
176 movemarkfrom = None |
|
177 if checkout is None: |
|
178 curmark = repo._bookmarkcurrent |
|
179 if iscurrent(repo): |
|
180 movemarkfrom = repo['.'].node() |
|
181 elif curmark: |
|
182 ui.status(_("updating to active bookmark %s\n") % curmark) |
|
183 checkout = curmark |
|
184 return (checkout, movemarkfrom) |
172 |
185 |
173 def update(repo, parents, node): |
186 def update(repo, parents, node): |
174 deletefrom = parents |
187 deletefrom = parents |
175 marks = repo._bookmarks |
188 marks = repo._bookmarks |
176 update = False |
189 update = False |