##// END OF EJS Templates
update: label bookmark name in message...
Pierre-Yves David -
r29902:a77d4821 default
parent child Browse files
Show More
@@ -738,20 +738,22 b' def updatetotally(ui, repo, checkout, br'
738 if movemarkfrom == repo['.'].node():
738 if movemarkfrom == repo['.'].node():
739 pass # no-op update
739 pass # no-op update
740 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
740 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
741 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
741 b = ui.label(repo._activebookmark, 'bookmarks.active')
742 ui.status(_("updating bookmark %s\n") % b)
742 else:
743 else:
743 # this can happen with a non-linear update
744 # this can happen with a non-linear update
744 ui.status(_("(leaving bookmark %s)\n") %
745 b = ui.label(repo._activebookmark, 'bookmarks')
745 repo._activebookmark)
746 ui.status(_("(leaving bookmark %s)\n") % b)
746 bookmarks.deactivate(repo)
747 bookmarks.deactivate(repo)
747 elif brev in repo._bookmarks:
748 elif brev in repo._bookmarks:
748 if brev != repo._activebookmark:
749 if brev != repo._activebookmark:
749 ui.status(_("(activating bookmark %s)\n") % brev)
750 b = ui.label(brev, 'bookmarks.active')
751 ui.status(_("(activating bookmark %s)\n") % b)
750 bookmarks.activate(repo, brev)
752 bookmarks.activate(repo, brev)
751 elif brev:
753 elif brev:
752 if repo._activebookmark:
754 if repo._activebookmark:
753 ui.status(_("(leaving bookmark %s)\n") %
755 b = ui.label(repo._activebookmark, 'bookmarks')
754 repo._activebookmark)
756 ui.status(_("(leaving bookmark %s)\n") % b)
755 bookmarks.deactivate(repo)
757 bookmarks.deactivate(repo)
756
758
757 if warndest:
759 if warndest:
General Comments 0
You need to be logged in to leave comments. Login now