diff hgext/color.py @ 11311:fcd06ecd4cb7

Merge backout

--- a/hgext/color.py	Tue Jun 08 21:09:41 2010 +0200
+++ b/hgext/color.py	Tue Jun 08 15:52:56 2010 -0500
@@ -108,9 +108,7 @@
            'status.ignored': 'black bold',
            'status.modified': 'blue bold',
            'status.removed': 'red bold',
-           'status.unknown': 'magenta bold underline',
-           'ui.labeled': 'none',
-           'ui.plain': 'none'}
+           'status.unknown': 'magenta bold underline'}
 
 
 def render_effects(text, effects):
@@ -144,8 +142,6 @@
 
 _buffers = None
 def style(msg, label):
-    if label in ('ui.plain', 'ui.labeled'):
-        return msg
     effects = []
     for l in label.split():
         s = _styles.get(l, '')