changeset 31131:1613c55ad3d6

color: pass 'ui' to 'win32print' Same logic as before,'win32print' relies on some data we will move on the 'ui' object soon, we update the API beforehand for clarity.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sun, 06 Nov 2016 20:10:53 +0100
parents 268caf97c38f
children f5131d4f512a
files mercurial/color.py mercurial/ui.py
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/color.py	Sat Feb 25 15:00:51 2017 +0100
+++ b/mercurial/color.py	Sun Nov 06 20:10:53 2016 +0100
@@ -423,11 +423,11 @@
             ansire = re.compile('\033\[([^m]*)m([^\033]*)(.*)',
                                 re.MULTILINE | re.DOTALL)
 
-    def win32print(writefunc, *msgs, **opts):
+    def win32print(ui, writefunc, *msgs, **opts):
         for text in msgs:
-            _win32print(text, writefunc, **opts)
+            _win32print(ui, text, writefunc, **opts)
 
-    def _win32print(text, writefunc, **opts):
+    def _win32print(ui, text, writefunc, **opts):
         label = opts.get('label', '')
         attr = origattr
 
--- a/mercurial/ui.py	Sat Feb 25 15:00:51 2017 +0100
+++ b/mercurial/ui.py	Sun Nov 06 20:10:53 2016 +0100
@@ -805,7 +805,7 @@
         elif self._colormode == 'win32':
             # windows color printing is its own can of crab, defer to
             # the color module and that is it.
-            color.win32print(self._write, *args, **opts)
+            color.win32print(self, self._write, *args, **opts)
         else:
             msgs = args
             if self._colormode is not None:
@@ -831,7 +831,7 @@
         elif self._colormode == 'win32':
             # windows color printing is its own can of crab, defer to
             # the color module and that is it.
-            color.win32print(self._write_err, *args, **opts)
+            color.win32print(self, self._write_err, *args, **opts)
         else:
             msgs = args
             if self._colormode is not None: