diff --git a/hgext/color.py b/hgext/color.py
--- a/hgext/color.py
+++ b/hgext/color.py
@@ -398,13 +398,11 @@ class colorui(uimod.ui):
                 *[self.label(str(a), label) for a in args], **opts)
 
     def showlabel(self, msg, label):
-        if ' ' in label:
-            label = '[' + label + ']'
         if label:
             if msg and msg[-1] == '\n':
-                return "%s(%s)\n" % (label, msg[:-1])
+                return "[%s|%s]\n" % (label, msg[:-1])
             else:
-                return "%s(%s)" % (label, msg)
+                return "[%s|%s]" % (label, msg)
         else:
             return msg
 
diff --git a/tests/test-status-color.t b/tests/test-status-color.t
--- a/tests/test-status-color.t
+++ b/tests/test-status-color.t
@@ -21,12 +21,12 @@ hg status in repo root:
   \x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4min_root\x1b[0m (esc)
 
   $ hg status --color=debug
-  status.unknown(? )status.unknown(a/1/in_a_1)
-  status.unknown(? )status.unknown(a/in_a)
-  status.unknown(? )status.unknown(b/1/in_b_1)
-  status.unknown(? )status.unknown(b/2/in_b_2)
-  status.unknown(? )status.unknown(b/in_b)
-  status.unknown(? )status.unknown(in_root)
+  [status.unknown|? ][status.unknown|a/1/in_a_1]
+  [status.unknown|? ][status.unknown|a/in_a]
+  [status.unknown|? ][status.unknown|b/1/in_b_1]
+  [status.unknown|? ][status.unknown|b/2/in_b_2]
+  [status.unknown|? ][status.unknown|b/in_b]
+  [status.unknown|? ][status.unknown|in_root]
 
 hg status . in repo root:
 
@@ -146,11 +146,11 @@ Make sure ui.formatted=False works
   adding modified
   adding removed
   $ hg log --color=debug
-  [log.changeset changeset.draft](changeset:   0:389aef86a55e)
-  log.tag(tag:         tip)
-  log.user(user:        test)
-  log.date(date:        Thu Jan 01 00:00:00 1970 +0000)
-  log.summary(summary:     initial checkin)
+  [log.changeset changeset.draft|changeset:   0:389aef86a55e]
+  [log.tag|tag:         tip]
+  [log.user|user:        test]
+  [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
+  [log.summary|summary:     initial checkin]
   
   $ touch modified added unknown ignored
   $ hg add added