# HG changeset patch # User Pierre-Yves David # Date 2016-08-22 12:44:14 # Node ID a77d48219eddb0919750a317b2cf565e46f93010 # Parent 4d1e6f91f1c7d5d044f5d94d54ccd5050fc851dd update: label bookmark name in message We label bookmark name as such in various messages. This will help them to standout (or at least give the user the option to make them stand out). We use a distinct label for the 'active' bookmark, this can help users to catch bookmark operation affecting their working copy. diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -738,20 +738,22 @@ def updatetotally(ui, repo, checkout, br if movemarkfrom == repo['.'].node(): pass # no-op update elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()): - ui.status(_("updating bookmark %s\n") % repo._activebookmark) + b = ui.label(repo._activebookmark, 'bookmarks.active') + ui.status(_("updating bookmark %s\n") % b) else: # this can happen with a non-linear update - ui.status(_("(leaving bookmark %s)\n") % - repo._activebookmark) + b = ui.label(repo._activebookmark, 'bookmarks') + ui.status(_("(leaving bookmark %s)\n") % b) bookmarks.deactivate(repo) elif brev in repo._bookmarks: if brev != repo._activebookmark: - ui.status(_("(activating bookmark %s)\n") % brev) + b = ui.label(brev, 'bookmarks.active') + ui.status(_("(activating bookmark %s)\n") % b) bookmarks.activate(repo, brev) elif brev: if repo._activebookmark: - ui.status(_("(leaving bookmark %s)\n") % - repo._activebookmark) + b = ui.label(repo._activebookmark, 'bookmarks') + ui.status(_("(leaving bookmark %s)\n") % b) bookmarks.deactivate(repo) if warndest: