diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1002,13 +1002,15 @@ def bookmark(ui, repo, *names, **opts): else: prefix, label = ' ', '' - if ui.quiet: - ui.write("%s\n" % bmark, label=label) - else: - pad = " " * (25 - encoding.colwidth(bmark)) - ui.write(" %s %s%s %d:%s\n" % ( - prefix, bmark, pad, repo.changelog.rev(n), hexfn(n)), + if not ui.quiet: + ui.write(' %s ' % prefix, label=label) + ui.write(bmark, label=label) + pad = " " * (25 - encoding.colwidth(bmark)) + if not ui.quiet: + ui.write('%s %d:%s' % ( + pad, repo.changelog.rev(n), hexfn(n)), label=label) + ui.write('\n') @command('branch', [('f', 'force', None, diff --git a/tests/test-bookmarks-current.t b/tests/test-bookmarks-current.t --- a/tests/test-bookmarks-current.t +++ b/tests/test-bookmarks-current.t @@ -18,7 +18,7 @@ list bookmarks with color $ hg --config extensions.color= --config color.mode=ansi \ > bookmark --color=always - \x1b[0;32m * X -1:000000000000\x1b[0m (esc) + \x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc) update to bookmark X diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t --- a/tests/test-bookmarks.t +++ b/tests/test-bookmarks.t @@ -18,7 +18,7 @@ list bookmarks with color $ hg --config extensions.color= --config color.mode=ansi \ > bookmarks --color=always - \x1b[0;32m * X -1:000000000000\x1b[0m (esc) + \x1b[0;32m * \x1b[0m\x1b[0;32mX\x1b[0m\x1b[0;32m -1:000000000000\x1b[0m (esc) $ echo a > a $ hg add a