diff mercurial/commands.py @ 22775:b59c2c8c45df

bookmarks: split ui.write() so that it can be easily ported to formatter api

Test output changes because color labels are applied separately.

--- a/mercurial/commands.py	Fri Oct 03 00:15:39 2014 +0900
+++ b/mercurial/commands.py	Fri Oct 03 00:36:36 2014 +0900
@@ -1002,13 +1002,15 @@
             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,