--- a/hgext/color.py Mon Feb 20 12:12:08 2017 +0100
+++ b/hgext/color.py Mon Feb 20 12:13:23 2017 +0100
@@ -328,21 +328,18 @@
return super(colorui, self).write_err(
*[self.label(a, label) for a in args], **opts)
- def showlabel(self, msg, label):
- if label and msg:
- if msg[-1] == '\n':
- return "[%s|%s]\n" % (label, msg[:-1])
- else:
- return "[%s|%s]" % (label, msg)
- else:
- return msg
-
def label(self, msg, label):
if self._colormode is None:
return super(colorui, self).label(msg, label)
if self._colormode == 'debug':
- return self.showlabel(msg, label)
+ if label and msg:
+ if msg[-1] == '\n':
+ return "[%s|%s]\n" % (label, msg[:-1])
+ else:
+ return "[%s|%s]" % (label, msg)
+ else:
+ return msg
effects = []
for l in label.split():