Show More
@@ -886,13 +886,17 b' class ui(object):' | |||||
886 | "cmdname.type" is recommended. For example, status issues |
|
886 | "cmdname.type" is recommended. For example, status issues | |
887 | a label of "status.modified" for modified files. |
|
887 | a label of "status.modified" for modified files. | |
888 | ''' |
|
888 | ''' | |
889 | if self._buffers and not opts.get(r'prompt', False): |
|
889 | if self._buffers: | |
890 | if self._bufferapplylabels: |
|
890 | if self._bufferapplylabels: | |
891 | label = opts.get(r'label', '') |
|
891 | label = opts.get(r'label', '') | |
892 | self._buffers[-1].extend(self.label(a, label) for a in args) |
|
892 | self._buffers[-1].extend(self.label(a, label) for a in args) | |
893 | else: |
|
893 | else: | |
894 | self._buffers[-1].extend(args) |
|
894 | self._buffers[-1].extend(args) | |
895 | elif self._colormode == 'win32': |
|
895 | else: | |
|
896 | self._writenobuf(*args, **opts) | |||
|
897 | ||||
|
898 | def _writenobuf(self, *args, **opts): | |||
|
899 | if self._colormode == 'win32': | |||
896 | # windows color printing is its own can of crab, defer to |
|
900 | # windows color printing is its own can of crab, defer to | |
897 | # the color module and that is it. |
|
901 | # the color module and that is it. | |
898 | color.win32print(self, self._write, *args, **opts) |
|
902 | color.win32print(self, self._write, *args, **opts) | |
@@ -1276,7 +1280,7 b' class ui(object):' | |||||
1276 | if not self.interactive(): |
|
1280 | if not self.interactive(): | |
1277 | self.write(msg, ' ', default or '', "\n") |
|
1281 | self.write(msg, ' ', default or '', "\n") | |
1278 | return default |
|
1282 | return default | |
1279 |
self.write(msg, label='ui.prompt' |
|
1283 | self._writenobuf(msg, label='ui.prompt') | |
1280 | self.flush() |
|
1284 | self.flush() | |
1281 | try: |
|
1285 | try: | |
1282 | r = self._readline() |
|
1286 | r = self._readline() |
General Comments 0
You need to be logged in to leave comments.
Login now