Show More
@@ -487,11 +487,7 b' if pycompat.iswindows:' | |||||
487 | ansire = re.compile(b'\033\[([^m]*)m([^\033]*)(.*)', |
|
487 | ansire = re.compile(b'\033\[([^m]*)m([^\033]*)(.*)', | |
488 | re.MULTILINE | re.DOTALL) |
|
488 | re.MULTILINE | re.DOTALL) | |
489 |
|
489 | |||
490 |
def win32print(ui, writefunc, |
|
490 | def win32print(ui, writefunc, text, **opts): | |
491 | for text in msgs: |
|
|||
492 | _win32print(ui, text, writefunc, **opts) |
|
|||
493 |
|
||||
494 | def _win32print(ui, text, writefunc, **opts): |
|
|||
495 | label = opts.get(r'label', '') |
|
491 | label = opts.get(r'label', '') | |
496 | attr = origattr |
|
492 | attr = origattr | |
497 |
|
493 |
@@ -951,16 +951,16 b' class ui(object):' | |||||
951 |
|
951 | |||
952 | def _writenobuf(self, write, *args, **opts): |
|
952 | def _writenobuf(self, write, *args, **opts): | |
953 | self._progclear() |
|
953 | self._progclear() | |
|
954 | msg = b''.join(args) | |||
954 | if self._colormode == 'win32': |
|
955 | if self._colormode == 'win32': | |
955 | # windows color printing is its own can of crab, defer to |
|
956 | # windows color printing is its own can of crab, defer to | |
956 | # the color module and that is it. |
|
957 | # the color module and that is it. | |
957 |
color.win32print(self, write, |
|
958 | color.win32print(self, write, msg, **opts) | |
958 | else: |
|
959 | else: | |
959 | msgs = args |
|
|||
960 | if self._colormode is not None: |
|
960 | if self._colormode is not None: | |
961 | label = opts.get(r'label', '') |
|
961 | label = opts.get(r'label', '') | |
962 |
msg |
|
962 | msg = self.label(msg, label) | |
963 |
write( |
|
963 | write(msg) | |
964 |
|
964 | |||
965 | def _write(self, data): |
|
965 | def _write(self, data): | |
966 | # opencode timeblockedsection because this is a critical path |
|
966 | # opencode timeblockedsection because this is a critical path |
General Comments 0
You need to be logged in to leave comments.
Login now