color: extract color and effect display from 'debugcolor'
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Thu, 03 Nov 2016 14:48:47 +0100
changeset 30284 7556507f7197
parent 30283 e1f6898a80e1
child 30285 bb2dfc0ea5b4
color: extract color and effect display from 'debugcolor' We are about to introduce a second mode for 'hg debugcolor' that would list the known label and their configuration, so we split the code related to color and effect out of the main function.
hgext/color.py
--- a/hgext/color.py	Thu Nov 03 14:29:19 2016 +0100
+++ b/hgext/color.py	Thu Nov 03 14:48:47 2016 +0100
@@ -539,6 +539,10 @@
 @command('debugcolor', [], 'hg debugcolor')
 def debugcolor(ui, repo, **opts):
     """show available colors and effects"""
+    ui.write(('color mode: %s\n') % ui._colormode)
+    return _debugdisplaycolor(ui)
+
+def _debugdisplaycolor(ui):
     global _styles
     oldstyle = _styles
     try:
@@ -551,7 +555,6 @@
                     _styles[k] = k[6:]
                 elif k.startswith('terminfo.'):
                     _styles[k] = k[9:]
-        ui.write(('color mode: %s\n') % ui._colormode)
         ui.write(_('available colors:\n'))
         for colorname, label in _styles.items():
             ui.write(('%s\n') % colorname, label=label)