13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
18
"""Text UI, write output to the console.
26
28
from bzrlib.lazy_import import lazy_import
27
29
lazy_import(globals(), """
30
30
from bzrlib import (
38
from bzrlib.ui import CLIUIFactory
41
class TextUIFactory(CLIUIFactory):
40
from bzrlib.osutils import watch_sigwinch
42
from bzrlib.ui import (
48
class TextUIFactory(UIFactory):
42
49
"""A UI factory for Text user interefaces."""
49
55
"""Create a TextUIFactory.
51
:param bar_type: The type of progress bar to create. It defaults to
52
letting the bzrlib.progress.ProgressBar factory auto
55
super(TextUIFactory, self).__init__(stdin=stdin,
56
stdout=stdout, stderr=stderr)
58
symbol_versioning.warn(symbol_versioning.deprecated_in((1, 11, 0))
59
% "bar_type parameter")
57
super(TextUIFactory, self).__init__()
58
# TODO: there's no good reason not to pass all three streams, maybe we
59
# should deprecate the default values...
60
63
# paints progress, network activity, etc
61
self._progress_view = TextProgressView(self.stderr)
63
def prompt(self, prompt):
64
"""Emit prompt on the CLI."""
65
self.stdout.write(prompt)
64
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()
67
74
def clear_term(self):
68
75
"""Prepare the terminal for output.
72
79
# XXX: If this is preparing to write to stdout, but that's for example
73
80
# directed into a file rather than to the terminal, and the progress
74
81
# bar _is_ going to the terminal, we shouldn't need
75
# to clear it. We might need to separately check for the case of
82
# to clear it. We might need to separately check for the case of
76
83
self._progress_view.clear()
85
def get_boolean(self, prompt):
87
self.prompt(prompt + "? [y/n]: ")
88
line = self.stdin.readline().lower()
89
if line in ('y\n', 'yes\n'):
91
elif line in ('n\n', 'no\n'):
93
elif line in ('', None):
94
# end-of-file; possibly should raise an error here instead
97
def get_integer(self, prompt):
100
line = self.stdin.readline()
106
def get_non_echoed_password(self):
107
isatty = getattr(self.stdin, 'isatty', None)
108
if isatty is not None and isatty():
109
# getpass() ensure the password is not echoed and other
110
# cross-platform niceties
111
password = getpass.getpass('')
113
# echo doesn't make sense without a terminal
114
password = self.stdin.readline()
117
elif password[-1] == '\n':
118
password = password[:-1]
121
def get_password(self, prompt='', **kwargs):
122
"""Prompt the user for a password.
124
:param prompt: The prompt to present the user
125
:param kwargs: Arguments which will be expanded into the prompt.
126
This lets front ends display different things if
128
:return: The password string, return None if the user
129
canceled the request.
132
self.prompt(prompt, **kwargs)
133
# There's currently no way to say 'i decline to enter a password'
134
# as opposed to 'my password is empty' -- does it matter?
135
return self.get_non_echoed_password()
137
def get_username(self, prompt, **kwargs):
138
"""Prompt the user for a username.
140
:param prompt: The prompt to present the user
141
:param kwargs: Arguments which will be expanded into the prompt.
142
This lets front ends display different things if
144
:return: The username string, return None if the user
145
canceled the request.
148
self.prompt(prompt, **kwargs)
149
username = self.stdin.readline()
152
elif username[-1] == '\n':
153
username = username[:-1]
156
def make_progress_view(self):
157
"""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':
166
return TextProgressView(self.stderr)
167
elif os.environ.get('BZR_PROGRESS_BAR') == 'none':
168
return NullProgressView()
169
elif progress._supports_progress(self.stderr):
170
return TextProgressView(self.stderr)
172
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)
78
194
def note(self, msg):
79
195
"""Write an already-formatted message, clearing the progress bar if necessary."""
81
197
self.stdout.write(msg + '\n')
199
def prompt(self, prompt, **kwargs):
200
"""Emit prompt on the CLI.
202
:param kwargs: Dictionary of arguments to insert into the prompt,
203
to allow UIs to reformat the prompt.
206
# See <https://launchpad.net/bugs/365891>
207
prompt = prompt % kwargs
208
prompt = prompt.encode(osutils.get_terminal_encoding(), 'replace')
210
self.stderr.write(prompt)
83
212
def report_transport_activity(self, transport, byte_count, direction):
84
213
"""Called by transports as they do IO.
86
215
This may update a progress bar, spinner, or similar display.
87
216
By default it does nothing.
89
self._progress_view.show_transport_activity(byte_count)
218
self._progress_view.show_transport_activity(transport,
219
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)
91
238
def _progress_updated(self, task):
92
239
"""A task has been updated and wants to be displayed.
94
if task != self._task_stack[-1]:
95
warnings.warn("%r is not the top progress task %r" %
96
(task, self._task_stack[-1]))
241
if not self._task_stack:
242
warnings.warn("%r updated but no tasks are active" %
244
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]))
97
251
self._progress_view.show_progress(task)
99
253
def _progress_all_finished(self):
119
273
self._term_file = term_file
120
274
# true when there's output on the screen we may need to clear
121
275
self._have_output = False
122
# XXX: We could listen for SIGWINCH and update the terminal width...
123
self._width = osutils.terminal_width()
124
276
self._last_transport_msg = ''
125
277
self._spin_pos = 0
126
278
# time we last repainted the screen
127
279
self._last_repaint = 0
128
280
# time we last got information about transport activity
129
281
self._transport_update_time = 0
130
self._task_fraction = None
131
282
self._last_task = None
132
283
self._total_byte_count = 0
133
284
self._bytes_since_update = 0
285
self._bytes_by_direction = {'unknown': 0, 'read': 0, 'write': 0}
286
self._first_byte_time = None
288
# force the progress bar to be off, as at the moment it doesn't
289
# correspond reliably to overall command progress
290
self.enable_bar = False
135
292
def _show_line(self, s):
137
self._term_file.write('\r%-*.*s\r' % (n, n, s))
293
# sys.stderr.write("progress %r\n" % s)
294
width = osutils.terminal_width()
295
if width is not None:
296
# we need one extra space for terminals that wrap on last char
298
s = '%-*.*s' % (width, width, s)
299
self._term_file.write('\r' + s + '\r')
140
302
if self._have_output:
144
306
def _render_bar(self):
145
307
# return a string for the progress bar itself
146
if (self._last_task is not None) and self._last_task.show_bar:
308
if self.enable_bar and (
309
(self._last_task is None) or self._last_task.show_bar):
310
# If there's no task object, we show space for the bar anyhow.
311
# That's because most invocations of bzr will end showing progress
312
# at some point, though perhaps only after doing some initial IO.
313
# It looks better to draw the progress bar initially rather than
314
# to have what looks like an incomplete progress bar.
147
315
spin_str = r'/-\|'[self._spin_pos % 4]
148
316
self._spin_pos += 1
149
f = self._task_fraction or 0
151
# number of markers highlighted in bar
152
markers = int(round(float(cols) * f)) - 1
318
if self._last_task is None:
319
completion_fraction = 0
322
completion_fraction = \
323
self._last_task._overall_completion_fraction() or 0
324
if (completion_fraction < self._fraction and 'progress' in
326
import pdb;pdb.set_trace()
327
self._fraction = completion_fraction
328
markers = int(round(float(cols) * completion_fraction)) - 1
153
329
bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
155
331
elif (self._last_task is None) or self._last_task.show_spinner:
332
# The last task wanted just a spinner, no bar
156
333
spin_str = r'/-\|'[self._spin_pos % 4]
157
334
self._spin_pos += 1
158
335
return spin_str + ' '
178
354
m = t.msg + ':' + m
357
def _render_line(self):
182
358
bar_string = self._render_bar()
183
359
if self._last_task:
184
360
task_msg = self._format_task(self._last_task)
187
trans = self._last_transport_msg
188
if trans and task_msg:
363
if self._last_task and not self._last_task.show_transport_activity:
366
trans = self._last_transport_msg
369
return (bar_string + trans + task_msg)
372
s = self._render_line()
194
373
self._show_line(s)
195
374
self._have_output = True
197
376
def show_progress(self, task):
377
"""Called by the task object when it has changed.
379
:param task: The top task object; its parents are also included
382
must_update = task is not self._last_task
198
383
self._last_task = task
199
384
now = time.time()
200
if now < self._last_repaint + 0.1:
385
if (not must_update) and (now < self._last_repaint + task.update_latency):
202
if now > self._transport_update_time + 5:
387
if now > self._transport_update_time + 10:
203
388
# no recent activity; expire it
204
389
self._last_transport_msg = ''
205
390
self._last_repaint = now
208
def show_transport_activity(self, byte_count):
209
"""Called by transports as they do IO.
393
def show_transport_activity(self, transport, direction, byte_count):
394
"""Called by transports via the ui_factory, as they do IO.
211
396
This may update a progress bar, spinner, or similar display.
212
397
By default it does nothing.
214
# XXX: Probably there should be a transport activity model, and that
215
# too should be seen by the progress view, rather than being poked in
399
# XXX: there should be a transport activity model, and that too should
400
# be seen by the progress view, rather than being poked in here.
217
401
self._total_byte_count += byte_count
218
402
self._bytes_since_update += byte_count
403
if self._first_byte_time is None:
404
# Note that this isn't great, as technically it should be the time
405
# when the bytes started transferring, not when they completed.
406
# However, we usually start with a small request anyway.
407
self._first_byte_time = time.time()
408
if direction in self._bytes_by_direction:
409
self._bytes_by_direction[direction] += byte_count
411
self._bytes_by_direction['unknown'] += byte_count
412
if 'no_activity' in debug.debug_flags:
413
# Can be used as a workaround if
414
# <https://launchpad.net/bugs/321935> reappears and transport
415
# activity is cluttering other output. However, thanks to
416
# TextUIOutputStream this shouldn't be a problem any more.
219
418
now = time.time()
419
if self._total_byte_count < 2000:
420
# a little resistance at first, so it doesn't stay stuck at 0
421
# while connecting...
220
423
if self._transport_update_time is None:
221
424
self._transport_update_time = now
222
elif now >= (self._transport_update_time + 0.2):
425
elif now >= (self._transport_update_time + 0.5):
223
426
# guard against clock stepping backwards, and don't update too
225
rate = self._bytes_since_update / (now - self._transport_update_time)
226
msg = ("%6dkB @ %4dkB/s" %
227
(self._total_byte_count>>10, int(rate)>>10,))
428
rate = (self._bytes_since_update
429
/ (now - self._transport_update_time))
430
# using base-10 units (see HACKING.txt).
431
msg = ("%6dkB %5dkB/s" %
432
(self._total_byte_count / 1000, int(rate) / 1000,))
228
433
self._transport_update_time = now
229
434
self._last_repaint = now
230
435
self._bytes_since_update = 0
231
436
self._last_transport_msg = msg
439
def _format_bytes_by_direction(self):
440
if self._first_byte_time is None:
443
transfer_time = time.time() - self._first_byte_time
444
if transfer_time < 0.001:
445
transfer_time = 0.001
446
bps = self._total_byte_count / transfer_time
448
# using base-10 units (see HACKING.txt).
449
msg = ('Transferred: %.0fkB'
450
' (%.1fkB/s r:%.0fkB w:%.0fkB'
451
% (self._total_byte_count / 1000.,
453
self._bytes_by_direction['read'] / 1000.,
454
self._bytes_by_direction['write'] / 1000.,
456
if self._bytes_by_direction['unknown'] > 0:
457
msg += ' u:%.0fkB)' % (
458
self._bytes_by_direction['unknown'] / 1000.
464
def log_transport_activity(self, display=False):
465
msg = self._format_bytes_by_direction()
467
if display and self._total_byte_count > 0:
469
self._term_file.write(msg + '\n')
472
class TextUIOutputStream(object):
473
"""Decorates an output stream so that the terminal is cleared before writing.
475
This is supposed to ensure that the progress bar does not conflict with bulk
478
# XXX: this does not handle the case of writing part of a line, then doing
479
# progress bar output: the progress bar will probably write over it.
480
# one option is just to buffer that text until we have a full line;
481
# another is to save and restore it
483
# XXX: might need to wrap more methods
485
def __init__(self, ui_factory, wrapped_stream):
486
self.ui_factory = ui_factory
487
self.wrapped_stream = wrapped_stream
488
# this does no transcoding, but it must expose the underlying encoding
489
# because some callers need to know what can be written - see for
490
# example unescape_for_display.
491
self.encoding = getattr(wrapped_stream, 'encoding', None)
494
self.ui_factory.clear_term()
495
self.wrapped_stream.flush()
497
def write(self, to_write):
498
self.ui_factory.clear_term()
499
self.wrapped_stream.write(to_write)
501
def writelines(self, lines):
502
self.ui_factory.clear_term()
503
self.wrapped_stream.writelines(lines)
added
removed
bzrlib/ui/text.py
