changeset 31100:c42feb5f3143

color: move '_colormode' to the core 'ui' class Having all 'ui' objects aware of 'color' allows us to update the core code to handle color. The mode will stay 'None' in the default case so that will not introduce any changes.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Mon, 20 Feb 2017 12:12:08 +0100
parents abb92b3d370e
children 1482b57701ad
files hgext/color.py mercurial/ui.py
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/color.py	Tue Jan 17 17:25:48 2017 +0100
+++ b/hgext/color.py	Mon Feb 20 12:12:08 2017 +0100
@@ -297,7 +297,6 @@
     return None
 
 class colorui(uimod.ui):
-    _colormode = None
     def write(self, *args, **opts):
         if self._colormode is None:
             return super(colorui, self).write(*args, **opts)
--- a/mercurial/ui.py	Tue Jan 17 17:25:48 2017 +0100
+++ b/mercurial/ui.py	Mon Feb 20 12:12:08 2017 +0100
@@ -127,6 +127,8 @@
     raise error.SignalInterrupt
 
 class ui(object):
+    # color mode: see mercurial/color.py for possible value
+    _colormode = None
     def __init__(self, src=None):
         """Create a fresh new ui object if no src given