Show More
@@ -58,7 +58,7 b' def _destupdatebook(repo, clean):' | |||||
58 | node = None |
|
58 | node = None | |
59 | activemark, movemark = bookmarks.calculateupdate(repo.ui, repo) |
|
59 | activemark, movemark = bookmarks.calculateupdate(repo.ui, repo) | |
60 | if activemark is not None: |
|
60 | if activemark is not None: | |
61 |
node = repo. |
|
61 | node = repo._bookmarks[activemark] | |
62 | return node, movemark, activemark |
|
62 | return node, movemark, activemark | |
63 |
|
63 | |||
64 | def _destupdatebranch(repo, clean): |
|
64 | def _destupdatebranch(repo, clean): | |
@@ -236,7 +236,7 b" def _destmergebook(repo, action='merge'," | |||||
236 | """find merge destination in the active bookmark case""" |
|
236 | """find merge destination in the active bookmark case""" | |
237 | node = None |
|
237 | node = None | |
238 | bmheads = bookmarks.headsforactive(repo) |
|
238 | bmheads = bookmarks.headsforactive(repo) | |
239 |
curhead = repo[repo._activebookmark] |
|
239 | curhead = repo._bookmarks[repo._activebookmark] | |
240 | if len(bmheads) == 2: |
|
240 | if len(bmheads) == 2: | |
241 | if curhead == bmheads[0]: |
|
241 | if curhead == bmheads[0]: | |
242 | node = bmheads[1] |
|
242 | node = bmheads[1] | |
@@ -361,7 +361,7 b' def stackbase(ui, repo):' | |||||
361 |
|
361 | |||
362 | def _statusotherbook(ui, repo): |
|
362 | def _statusotherbook(ui, repo): | |
363 | bmheads = bookmarks.headsforactive(repo) |
|
363 | bmheads = bookmarks.headsforactive(repo) | |
364 |
curhead = repo[repo._activebookmark] |
|
364 | curhead = repo._bookmarks[repo._activebookmark] | |
365 | if repo.revs('%n and parents()', curhead): |
|
365 | if repo.revs('%n and parents()', curhead): | |
366 | # we are on the active bookmark |
|
366 | # we are on the active bookmark | |
367 | bmheads = [b for b in bmheads if curhead != b] |
|
367 | bmheads = [b for b in bmheads if curhead != b] |
General Comments 0
You need to be logged in to leave comments.
Login now