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
self.stderr.write("bzr: warning: %s\n" % msg)
238
178
def _progress_updated(self, task):
239
179
"""A task has been updated and wants to be displayed.
242
182
warnings.warn("%r updated but no tasks are active" %
244
184
elif task != self._task_stack[-1]:
245
# We used to check it was the top task, but it's hard to always
246
# get this right and it's not necessarily useful: any actual
247
# problems will be evident in use
248
#warnings.warn("%r is not the top progress task %r" %
249
# (task, self._task_stack[-1]))
185
warnings.warn("%r is not the top progress task %r" %
186
(task, self._task_stack[-1]))
251
187
self._progress_view.show_progress(task)
253
189
def _progress_all_finished(self):
254
190
self._progress_view.clear()
256
def show_user_warning(self, warning_id, **message_args):
257
"""Show a text message to the user.
259
Explicitly not for warnings about bzr apis, deprecations or internals.
261
# eventually trace.warning should migrate here, to avoid logging and
262
# be easier to test; that has a lot of test fallout so for now just
263
# new code can call this
264
if warning_id not in self.suppressed_warnings:
265
self.stderr.write(self.format_user_warning(warning_id, message_args) +
269
193
class TextProgressView(object):
270
194
"""Display of progress bar and other information on a tty.
294
221
self._last_task = None
295
222
self._total_byte_count = 0
296
223
self._bytes_since_update = 0
297
self._bytes_by_direction = {'unknown': 0, 'read': 0, 'write': 0}
298
self._first_byte_time = None
300
# force the progress bar to be off, as at the moment it doesn't
301
# correspond reliably to overall command progress
302
self.enable_bar = False
304
225
def _show_line(self, s):
305
226
# sys.stderr.write("progress %r\n" % s)
306
width = osutils.terminal_width()
307
if width is not None:
308
# we need one extra space for terminals that wrap on last char
310
s = '%-*.*s' % (width, width, s)
311
self._term_file.write('\r' + s + '\r')
228
self._term_file.write('\r%-*.*s\r' % (n, n, s))
314
231
if self._have_output:
330
246
if self._last_task is None:
331
247
completion_fraction = 0
334
249
completion_fraction = \
335
250
self._last_task._overall_completion_fraction() or 0
336
if (completion_fraction < self._fraction and 'progress' in
338
import pdb;pdb.set_trace()
339
self._fraction = completion_fraction
340
251
markers = int(round(float(cols) * completion_fraction)) - 1
341
252
bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
343
elif (self._last_task is None) or self._last_task.show_spinner:
254
elif self._last_task.show_spinner:
344
255
# The last task wanted just a spinner, no bar
345
256
spin_str = r'/-\|'[self._spin_pos % 4]
346
257
self._spin_pos += 1
408
319
This may update a progress bar, spinner, or similar display.
409
320
By default it does nothing.
411
# XXX: there should be a transport activity model, and that too should
412
# 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
413
333
self._total_byte_count += byte_count
414
334
self._bytes_since_update += byte_count
415
if self._first_byte_time is None:
416
# Note that this isn't great, as technically it should be the time
417
# when the bytes started transferring, not when they completed.
418
# However, we usually start with a small request anyway.
419
self._first_byte_time = time.time()
420
if direction in self._bytes_by_direction:
421
self._bytes_by_direction[direction] += byte_count
423
self._bytes_by_direction['unknown'] += byte_count
424
if 'no_activity' in debug.debug_flags:
425
# Can be used as a workaround if
426
# <https://launchpad.net/bugs/321935> reappears and transport
427
# activity is cluttering other output. However, thanks to
428
# TextUIOutputStream this shouldn't be a problem any more.
430
335
now = time.time()
431
336
if self._total_byte_count < 2000:
432
337
# a little resistance at first, so it doesn't stay stuck at 0
437
342
elif now >= (self._transport_update_time + 0.5):
438
343
# guard against clock stepping backwards, and don't update too
440
rate = (self._bytes_since_update
441
/ (now - self._transport_update_time))
442
# using base-10 units (see HACKING.txt).
443
msg = ("%6dkB %5dkB/s" %
444
(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,))
445
348
self._transport_update_time = now
446
349
self._last_repaint = now
447
350
self._bytes_since_update = 0
448
351
self._last_transport_msg = msg
451
def _format_bytes_by_direction(self):
452
if self._first_byte_time is None:
455
transfer_time = time.time() - self._first_byte_time
456
if transfer_time < 0.001:
457
transfer_time = 0.001
458
bps = self._total_byte_count / transfer_time
460
# using base-10 units (see HACKING.txt).
461
msg = ('Transferred: %.0fkB'
462
' (%.1fkB/s r:%.0fkB w:%.0fkB'
463
% (self._total_byte_count / 1000.,
465
self._bytes_by_direction['read'] / 1000.,
466
self._bytes_by_direction['write'] / 1000.,
468
if self._bytes_by_direction['unknown'] > 0:
469
msg += ' u:%.0fkB)' % (
470
self._bytes_by_direction['unknown'] / 1000.
476
def log_transport_activity(self, display=False):
477
msg = self._format_bytes_by_direction()
479
if display and self._total_byte_count > 0:
481
self._term_file.write(msg + '\n')
484
class TextUIOutputStream(object):
485
"""Decorates an output stream so that the terminal is cleared before writing.
487
This is supposed to ensure that the progress bar does not conflict with bulk
490
# XXX: this does not handle the case of writing part of a line, then doing
491
# progress bar output: the progress bar will probably write over it.
492
# one option is just to buffer that text until we have a full line;
493
# another is to save and restore it
495
# XXX: might need to wrap more methods
497
def __init__(self, ui_factory, wrapped_stream):
498
self.ui_factory = ui_factory
499
self.wrapped_stream = wrapped_stream
500
# this does no transcoding, but it must expose the underlying encoding
501
# because some callers need to know what can be written - see for
502
# example unescape_for_display.
503
self.encoding = getattr(wrapped_stream, 'encoding', None)
506
self.ui_factory.clear_term()
507
self.wrapped_stream.flush()
509
def write(self, to_write):
510
self.ui_factory.clear_term()
511
self.wrapped_stream.write(to_write)
513
def writelines(self, lines):
514
self.ui_factory.clear_term()
515
self.wrapped_stream.writelines(lines)
added
removed
bzrlib/ui/text.py
