# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1487589203 -3600
# Node ID 1482b57701add64f3668708dabf11cf1d3f68271
# Parent  c42feb5f314362490400171f5cbe1dba6a641f71
color: inline the 'showlabel' method

This function is quite simple and only have one call site… located a handful of line
under the definition. We inline the function for the sake of simplicity. One of
the motivation to do that now is that it reduce the amount of new method we
will have to add to the core 'ui' class for color support.

diff -r c42feb5f3143 -r 1482b57701ad hgext/color.py
--- 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():