# HG changeset patch # User Pierre-Yves David # Date 2016-11-06 19:10:53 # Node ID 1613c55ad3d621bc78d4b176bd985e813a8cbd30 # Parent 268caf97c38f4543c088e2e3938b9f33e55ff959 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. diff --git a/mercurial/color.py b/mercurial/color.py --- a/mercurial/color.py +++ b/mercurial/color.py @@ -423,11 +423,11 @@ if pycompat.osname == 'nt': 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 diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -805,7 +805,7 @@ class ui(object): 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 @@ class ui(object): 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: