Mercurial > hg-stable

changeset 30993:e5363cb96233

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
color: move the '_render_effects' function to the core module
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Thu, 22 Dec 2016 02:38:53 +0100
parents a3c7e42c7a1f
children ae5d60bb70c9
files hgext/color.py mercurial/color.py
diffstat 2 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/color.py	Thu Dec 22 02:37:18 2016 +0100
+++ b/hgext/color.py	Thu Dec 22 02:38:53 2016 +0100
@@ -297,20 +297,6 @@
         return realmode
     return None
 
-def render_effects(text, effects):
-    'Wrap text in commands to turn on each effect.'
-    if not text:
-        return text
-    if not color._terminfo_params:
-        start = [str(color._effects[e]) for e in ['none'] + effects.split()]
-        start = '\033[' + ';'.join(start) + 'm'
-        stop = '\033[' + str(color._effects['none']) + 'm'
-    else:
-        start = ''.join(color._effect_str(effect)
-                        for effect in ['none'] + effects.split())
-        stop = color._effect_str('none')
-    return ''.join([start, text, stop])
-
 class colorui(uimod.ui):
     _colormode = 'ansi'
     def write(self, *args, **opts):
@@ -369,7 +355,7 @@
                 effects.append(l)
         effects = ' '.join(effects)
         if effects:
-            return '\n'.join([render_effects(line, effects)
+            return '\n'.join([color._render_effects(line, effects)
                               for line in msg.split('\n')])
         return msg
 
--- a/mercurial/color.py	Thu Dec 22 02:37:18 2016 +0100
+++ b/mercurial/color.py	Thu Dec 22 02:38:53 2016 +0100
@@ -158,3 +158,17 @@
         return curses.tparm(curses.tigetstr('setab'), val)
     else:
         return curses.tparm(curses.tigetstr('setaf'), val)
+
+def _render_effects(text, effects):
+    'Wrap text in commands to turn on each effect.'
+    if not text:
+        return text
+    if not _terminfo_params:
+        start = [str(_effects[e]) for e in ['none'] + effects.split()]
+        start = '\033[' + ';'.join(start) + 'm'
+        stop = '\033[' + str(_effects['none']) + 'm'
+    else:
+        start = ''.join(_effect_str(effect)
+                        for effect in ['none'] + effects.split())
+        stop = _effect_str('none')
+    return ''.join([start, text, stop])