62
60
self.stderr = stderr
63
61
# paints progress, network activity, etc
64
62
self._progress_view = self.make_progress_view()
65
# hook up the signals to watch for terminal size changes
68
def be_quiet(self, state):
69
if state and not self._quiet:
71
UIFactory.be_quiet(self, state)
72
self._progress_view = self.make_progress_view()
74
64
def clear_term(self):
75
65
"""Prepare the terminal for output.
156
137
def make_progress_view(self):
157
138
"""Construct and return a new ProgressView subclass for this UI.
159
# with --quiet, never any progress view
160
# <https://bugs.edge.launchpad.net/bzr/+bug/320035>. Otherwise if the
161
# user specifically requests either text or no progress bars, always
162
# do that. otherwise, guess based on $TERM and tty presence.
164
return NullProgressView()
165
elif os.environ.get('BZR_PROGRESS_BAR') == 'text':
140
# if the user specifically requests either text or no progress bars,
141
# always do that. otherwise, guess based on $TERM and tty presence.
142
if os.environ.get('BZR_PROGRESS_BAR') == 'text':
166
143
return TextProgressView(self.stderr)
167
144
elif os.environ.get('BZR_PROGRESS_BAR') == 'none':
168
145
return NullProgressView()
172
149
return NullProgressView()
174
def _make_output_stream_explicit(self, encoding, encoding_type):
175
if encoding_type == 'exact':
176
# force sys.stdout to be binary stream on win32;
177
# NB: this leaves the file set in that mode; may cause problems if
178
# one process tries to do binary and then text output
179
if sys.platform == 'win32':
180
fileno = getattr(self.stdout, 'fileno', None)
183
msvcrt.setmode(fileno(), os.O_BINARY)
184
return TextUIOutputStream(self, self.stdout)
186
encoded_stdout = codecs.getwriter(encoding)(self.stdout,
187
errors=encoding_type)
188
# For whatever reason codecs.getwriter() does not advertise its encoding
189
# it just returns the encoding of the wrapped file, which is completely
190
# bogus. So set the attribute, so we can find the correct encoding later.
191
encoded_stdout.encoding = encoding
192
return TextUIOutputStream(self, encoded_stdout)
194
151
def note(self, msg):
195
152
"""Write an already-formatted message, clearing the progress bar if necessary."""
196
153
self.clear_term()
218
175
self._progress_view.show_transport_activity(transport,
219
176
direction, byte_count)
221
def log_transport_activity(self, display=False):
222
"""See UIFactory.log_transport_activity()"""
223
log = getattr(self._progress_view, 'log_transport_activity', None)
227
def show_error(self, msg):
229
self.stderr.write("bzr: error: %s\n" % msg)
231
def show_message(self, msg):
234
def show_warning(self, msg):
236
if isinstance(msg, unicode):
237
te = osutils.get_terminal_encoding()
238
msg = msg.encode(te, 'replace')
239
self.stderr.write("bzr: warning: %s\n" % msg)
241
178
def _progress_updated(self, task):
242
179
"""A task has been updated and wants to be displayed.
245
182
warnings.warn("%r updated but no tasks are active" %
247
184
elif task != self._task_stack[-1]:
248
# We used to check it was the top task, but it's hard to always
249
# get this right and it's not necessarily useful: any actual
250
# problems will be evident in use
251
#warnings.warn("%r is not the top progress task %r" %
252
# (task, self._task_stack[-1]))
185
warnings.warn("%r is not the top progress task %r" %
186
(task, self._task_stack[-1]))
254
187
self._progress_view.show_progress(task)
256
189
def _progress_all_finished(self):
257
190
self._progress_view.clear()
259
def show_user_warning(self, warning_id, **message_args):
260
"""Show a text message to the user.
262
Explicitly not for warnings about bzr apis, deprecations or internals.
264
# eventually trace.warning should migrate here, to avoid logging and
265
# be easier to test; that has a lot of test fallout so for now just
266
# new code can call this
267
if warning_id not in self.suppressed_warnings:
268
self.stderr.write(self.format_user_warning(warning_id, message_args) +
272
193
class TextProgressView(object):
273
194
"""Display of progress bar and other information on a tty.
297
221
self._last_task = None
298
222
self._total_byte_count = 0
299
223
self._bytes_since_update = 0
300
self._bytes_by_direction = {'unknown': 0, 'read': 0, 'write': 0}
301
self._first_byte_time = None
303
# force the progress bar to be off, as at the moment it doesn't
304
# correspond reliably to overall command progress
305
self.enable_bar = False
307
225
def _show_line(self, s):
308
226
# sys.stderr.write("progress %r\n" % s)
309
width = osutils.terminal_width()
310
if width is not None:
311
# we need one extra space for terminals that wrap on last char
313
s = '%-*.*s' % (width, width, s)
314
self._term_file.write('\r' + s + '\r')
228
self._term_file.write('\r%-*.*s\r' % (n, n, s))
317
231
if self._have_output:
333
246
if self._last_task is None:
334
247
completion_fraction = 0
337
249
completion_fraction = \
338
250
self._last_task._overall_completion_fraction() or 0
339
if (completion_fraction < self._fraction and 'progress' in
341
import pdb;pdb.set_trace()
342
self._fraction = completion_fraction
343
251
markers = int(round(float(cols) * completion_fraction)) - 1
344
252
bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
346
elif (self._last_task is None) or self._last_task.show_spinner:
254
elif self._last_task.show_spinner:
347
255
# The last task wanted just a spinner, no bar
348
256
spin_str = r'/-\|'[self._spin_pos % 4]
349
257
self._spin_pos += 1
411
319
This may update a progress bar, spinner, or similar display.
412
320
By default it does nothing.
414
# XXX: there should be a transport activity model, and that too should
415
# be seen by the progress view, rather than being poked in here.
322
# XXX: Probably there should be a transport activity model, and that
323
# too should be seen by the progress view, rather than being poked in
325
if not self._have_output:
326
# As a workaround for <https://launchpad.net/bugs/321935> we only
327
# show transport activity when there's already a progress bar
328
# shown, which time the application code is expected to know to
329
# clear off the progress bar when it's going to send some other
330
# output. Eventually it would be nice to have that automatically
416
333
self._total_byte_count += byte_count
417
334
self._bytes_since_update += byte_count
418
if self._first_byte_time is None:
419
# Note that this isn't great, as technically it should be the time
420
# when the bytes started transferring, not when they completed.
421
# However, we usually start with a small request anyway.
422
self._first_byte_time = time.time()
423
if direction in self._bytes_by_direction:
424
self._bytes_by_direction[direction] += byte_count
426
self._bytes_by_direction['unknown'] += byte_count
427
if 'no_activity' in debug.debug_flags:
428
# Can be used as a workaround if
429
# <https://launchpad.net/bugs/321935> reappears and transport
430
# activity is cluttering other output. However, thanks to
431
# TextUIOutputStream this shouldn't be a problem any more.
433
335
now = time.time()
434
336
if self._total_byte_count < 2000:
435
337
# a little resistance at first, so it doesn't stay stuck at 0
440
342
elif now >= (self._transport_update_time + 0.5):
441
343
# guard against clock stepping backwards, and don't update too
443
rate = (self._bytes_since_update
444
/ (now - self._transport_update_time))
445
# using base-10 units (see HACKING.txt).
446
msg = ("%6dkB %5dkB/s" %
447
(self._total_byte_count / 1000, int(rate) / 1000,))
345
rate = self._bytes_since_update / (now - self._transport_update_time)
346
msg = ("%6dKB %5dKB/s" %
347
(self._total_byte_count>>10, int(rate)>>10,))
448
348
self._transport_update_time = now
449
349
self._last_repaint = now
450
350
self._bytes_since_update = 0
451
351
self._last_transport_msg = msg
454
def _format_bytes_by_direction(self):
455
if self._first_byte_time is None:
458
transfer_time = time.time() - self._first_byte_time
459
if transfer_time < 0.001:
460
transfer_time = 0.001
461
bps = self._total_byte_count / transfer_time
463
# using base-10 units (see HACKING.txt).
464
msg = ('Transferred: %.0fkB'
465
' (%.1fkB/s r:%.0fkB w:%.0fkB'
466
% (self._total_byte_count / 1000.,
468
self._bytes_by_direction['read'] / 1000.,
469
self._bytes_by_direction['write'] / 1000.,
471
if self._bytes_by_direction['unknown'] > 0:
472
msg += ' u:%.0fkB)' % (
473
self._bytes_by_direction['unknown'] / 1000.
479
def log_transport_activity(self, display=False):
480
msg = self._format_bytes_by_direction()
482
if display and self._total_byte_count > 0:
484
self._term_file.write(msg + '\n')
487
class TextUIOutputStream(object):
488
"""Decorates an output stream so that the terminal is cleared before writing.
490
This is supposed to ensure that the progress bar does not conflict with bulk
493
# XXX: this does not handle the case of writing part of a line, then doing
494
# progress bar output: the progress bar will probably write over it.
495
# one option is just to buffer that text until we have a full line;
496
# another is to save and restore it
498
# XXX: might need to wrap more methods
500
def __init__(self, ui_factory, wrapped_stream):
501
self.ui_factory = ui_factory
502
self.wrapped_stream = wrapped_stream
503
# this does no transcoding, but it must expose the underlying encoding
504
# because some callers need to know what can be written - see for
505
# example unescape_for_display.
506
self.encoding = getattr(wrapped_stream, 'encoding', None)
509
self.ui_factory.clear_term()
510
self.wrapped_stream.flush()
512
def write(self, to_write):
513
self.ui_factory.clear_term()
514
self.wrapped_stream.write(to_write)
516
def writelines(self, lines):
517
self.ui_factory.clear_term()
518
self.wrapped_stream.writelines(lines)
added
removed
bzrlib/ui/text.py
