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.ui import (
46
class TextUIFactory(UIFactory):
42
47
"""A UI factory for Text user interefaces."""
49
53
"""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")
55
super(TextUIFactory, self).__init__()
56
# TODO: there's no good reason not to pass all three streams, maybe we
57
# should deprecate the default values...
60
61
# paints progress, network activity, etc
61
self._progress_view = TextProgressView(self.stderr)
62
self._progress_view = self.make_progress_view()
64
def be_quiet(self, state):
65
if state and not self._quiet:
67
UIFactory.be_quiet(self, state)
68
self._progress_view = self.make_progress_view()
63
def prompt(self, prompt):
64
"""Emit prompt on the CLI."""
65
self.stdout.write(prompt)
67
70
def clear_term(self):
68
71
"""Prepare the terminal for output.
72
75
# XXX: If this is preparing to write to stdout, but that's for example
73
76
# directed into a file rather than to the terminal, and the progress
74
77
# bar _is_ going to the terminal, we shouldn't need
75
# to clear it. We might need to separately check for the case of
78
# to clear it. We might need to separately check for the case of
76
79
self._progress_view.clear()
81
def get_boolean(self, prompt):
83
self.prompt(prompt + "? [y/n]: ")
84
line = self.stdin.readline().lower()
85
if line in ('y\n', 'yes\n'):
87
elif line in ('n\n', 'no\n'):
89
elif line in ('', None):
90
# end-of-file; possibly should raise an error here instead
93
def get_integer(self, prompt):
96
line = self.stdin.readline()
102
def get_non_echoed_password(self):
103
isatty = getattr(self.stdin, 'isatty', None)
104
if isatty is not None and isatty():
105
# getpass() ensure the password is not echoed and other
106
# cross-platform niceties
107
password = getpass.getpass('')
109
# echo doesn't make sense without a terminal
110
password = self.stdin.readline()
113
elif password[-1] == '\n':
114
password = password[:-1]
117
def get_password(self, prompt='', **kwargs):
118
"""Prompt the user for a password.
120
:param prompt: The prompt to present the user
121
:param kwargs: Arguments which will be expanded into the prompt.
122
This lets front ends display different things if
124
:return: The password string, return None if the user
125
canceled the request.
128
self.prompt(prompt, **kwargs)
129
# There's currently no way to say 'i decline to enter a password'
130
# as opposed to 'my password is empty' -- does it matter?
131
return self.get_non_echoed_password()
133
def get_username(self, prompt, **kwargs):
134
"""Prompt the user for a username.
136
:param prompt: The prompt to present the user
137
:param kwargs: Arguments which will be expanded into the prompt.
138
This lets front ends display different things if
140
:return: The username string, return None if the user
141
canceled the request.
144
self.prompt(prompt, **kwargs)
145
username = self.stdin.readline()
148
elif username[-1] == '\n':
149
username = username[:-1]
152
def make_progress_view(self):
153
"""Construct and return a new ProgressView subclass for this UI.
155
# with --quiet, never any progress view
156
# <https://bugs.edge.launchpad.net/bzr/+bug/320035>. Otherwise if the
157
# user specifically requests either text or no progress bars, always
158
# do that. otherwise, guess based on $TERM and tty presence.
160
return NullProgressView()
161
elif os.environ.get('BZR_PROGRESS_BAR') == 'text':
162
return TextProgressView(self.stderr)
163
elif os.environ.get('BZR_PROGRESS_BAR') == 'none':
164
return NullProgressView()
165
elif progress._supports_progress(self.stderr):
166
return TextProgressView(self.stderr)
168
return NullProgressView()
170
def _make_output_stream_explicit(self, encoding, encoding_type):
171
if encoding_type == 'exact':
172
# force sys.stdout to be binary stream on win32;
173
# NB: this leaves the file set in that mode; may cause problems if
174
# one process tries to do binary and then text output
175
if sys.platform == 'win32':
176
fileno = getattr(self.stdout, 'fileno', None)
179
msvcrt.setmode(fileno(), os.O_BINARY)
180
return TextUIOutputStream(self, self.stdout)
182
encoded_stdout = codecs.getwriter(encoding)(self.stdout,
183
errors=encoding_type)
184
# For whatever reason codecs.getwriter() does not advertise its encoding
185
# it just returns the encoding of the wrapped file, which is completely
186
# bogus. So set the attribute, so we can find the correct encoding later.
187
encoded_stdout.encoding = encoding
188
return TextUIOutputStream(self, encoded_stdout)
78
190
def note(self, msg):
79
191
"""Write an already-formatted message, clearing the progress bar if necessary."""
81
193
self.stdout.write(msg + '\n')
195
def prompt(self, prompt, **kwargs):
196
"""Emit prompt on the CLI.
198
:param kwargs: Dictionary of arguments to insert into the prompt,
199
to allow UIs to reformat the prompt.
202
# See <https://launchpad.net/bugs/365891>
203
prompt = prompt % kwargs
204
prompt = prompt.encode(osutils.get_terminal_encoding(), 'replace')
206
self.stderr.write(prompt)
83
208
def report_transport_activity(self, transport, byte_count, direction):
84
209
"""Called by transports as they do IO.
86
211
This may update a progress bar, spinner, or similar display.
87
212
By default it does nothing.
89
self._progress_view.show_transport_activity(byte_count)
214
self._progress_view.show_transport_activity(transport,
215
direction, byte_count)
217
def log_transport_activity(self, display=False):
218
"""See UIFactory.log_transport_activity()"""
219
log = getattr(self._progress_view, 'log_transport_activity', None)
223
def show_error(self, msg):
225
self.stderr.write("bzr: error: %s\n" % msg)
227
def show_message(self, msg):
230
def show_warning(self, msg):
232
self.stderr.write("bzr: warning: %s\n" % msg)
91
234
def _progress_updated(self, task):
92
235
"""A task has been updated and wants to be displayed.
94
if task != self._task_stack[-1]:
237
if not self._task_stack:
238
warnings.warn("%r updated but no tasks are active" %
240
elif task != self._task_stack[-1]:
95
241
warnings.warn("%r is not the top progress task %r" %
96
242
(task, self._task_stack[-1]))
97
243
self._progress_view.show_progress(task)
119
265
self._term_file = term_file
120
266
# true when there's output on the screen we may need to clear
121
267
self._have_output = False
122
# XXX: We could listen for SIGWINCH and update the terminal width...
123
self._width = osutils.terminal_width()
124
268
self._last_transport_msg = ''
125
269
self._spin_pos = 0
126
270
# time we last repainted the screen
127
271
self._last_repaint = 0
128
272
# time we last got information about transport activity
129
273
self._transport_update_time = 0
130
self._task_fraction = None
131
274
self._last_task = None
132
275
self._total_byte_count = 0
133
276
self._bytes_since_update = 0
277
self._bytes_by_direction = {'unknown': 0, 'read': 0, 'write': 0}
278
self._first_byte_time = None
280
# force the progress bar to be off, as at the moment it doesn't
281
# correspond reliably to overall command progress
282
self.enable_bar = False
135
284
def _show_line(self, s):
137
self._term_file.write('\r%-*.*s\r' % (n, n, s))
285
# sys.stderr.write("progress %r\n" % s)
286
width = osutils.terminal_width()
287
if width is not None:
288
# we need one extra space for terminals that wrap on last char
290
s = '%-*.*s' % (width, width, s)
291
self._term_file.write('\r' + s + '\r')
140
294
if self._have_output:
144
298
def _render_bar(self):
145
299
# return a string for the progress bar itself
146
if (self._last_task is not None) and self._last_task.show_bar:
300
if self.enable_bar and (
301
(self._last_task is None) or self._last_task.show_bar):
302
# If there's no task object, we show space for the bar anyhow.
303
# That's because most invocations of bzr will end showing progress
304
# at some point, though perhaps only after doing some initial IO.
305
# It looks better to draw the progress bar initially rather than
306
# to have what looks like an incomplete progress bar.
147
307
spin_str = r'/-\|'[self._spin_pos % 4]
148
308
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
310
if self._last_task is None:
311
completion_fraction = 0
314
completion_fraction = \
315
self._last_task._overall_completion_fraction() or 0
316
if (completion_fraction < self._fraction and 'progress' in
318
import pdb;pdb.set_trace()
319
self._fraction = completion_fraction
320
markers = int(round(float(cols) * completion_fraction)) - 1
153
321
bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
155
323
elif (self._last_task is None) or self._last_task.show_spinner:
324
# The last task wanted just a spinner, no bar
156
325
spin_str = r'/-\|'[self._spin_pos % 4]
157
326
self._spin_pos += 1
158
327
return spin_str + ' '
178
346
m = t.msg + ':' + m
349
def _render_line(self):
182
350
bar_string = self._render_bar()
183
351
if self._last_task:
184
352
task_msg = self._format_task(self._last_task)
187
trans = self._last_transport_msg
188
if trans and task_msg:
355
if self._last_task and not self._last_task.show_transport_activity:
358
trans = self._last_transport_msg
361
return (bar_string + trans + task_msg)
364
s = self._render_line()
194
365
self._show_line(s)
195
366
self._have_output = True
197
368
def show_progress(self, task):
369
"""Called by the task object when it has changed.
371
:param task: The top task object; its parents are also included
374
must_update = task is not self._last_task
198
375
self._last_task = task
199
376
now = time.time()
200
if now < self._last_repaint + 0.1:
377
if (not must_update) and (now < self._last_repaint + task.update_latency):
202
if now > self._transport_update_time + 5:
379
if now > self._transport_update_time + 10:
203
380
# no recent activity; expire it
204
381
self._last_transport_msg = ''
205
382
self._last_repaint = now
208
def show_transport_activity(self, byte_count):
209
"""Called by transports as they do IO.
385
def show_transport_activity(self, transport, direction, byte_count):
386
"""Called by transports via the ui_factory, as they do IO.
211
388
This may update a progress bar, spinner, or similar display.
212
389
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
391
# XXX: there should be a transport activity model, and that too should
392
# be seen by the progress view, rather than being poked in here.
217
393
self._total_byte_count += byte_count
218
394
self._bytes_since_update += byte_count
395
if self._first_byte_time is None:
396
# Note that this isn't great, as technically it should be the time
397
# when the bytes started transferring, not when they completed.
398
# However, we usually start with a small request anyway.
399
self._first_byte_time = time.time()
400
if direction in self._bytes_by_direction:
401
self._bytes_by_direction[direction] += byte_count
403
self._bytes_by_direction['unknown'] += byte_count
404
if 'no_activity' in debug.debug_flags:
405
# Can be used as a workaround if
406
# <https://launchpad.net/bugs/321935> reappears and transport
407
# activity is cluttering other output. However, thanks to
408
# TextUIOutputStream this shouldn't be a problem any more.
219
410
now = time.time()
411
if self._total_byte_count < 2000:
412
# a little resistance at first, so it doesn't stay stuck at 0
413
# while connecting...
220
415
if self._transport_update_time is None:
221
416
self._transport_update_time = now
222
elif now >= (self._transport_update_time + 0.2):
417
elif now >= (self._transport_update_time + 0.5):
223
418
# guard against clock stepping backwards, and don't update too
225
420
rate = self._bytes_since_update / (now - self._transport_update_time)
226
msg = ("%6dkB @ %4dkB/s" %
227
(self._total_byte_count>>10, int(rate)>>10,))
421
msg = ("%6dKB %5dKB/s" %
422
(self._total_byte_count>>10, int(rate)>>10,))
228
423
self._transport_update_time = now
229
424
self._last_repaint = now
230
425
self._bytes_since_update = 0
231
426
self._last_transport_msg = msg
429
def _format_bytes_by_direction(self):
430
if self._first_byte_time is None:
433
transfer_time = time.time() - self._first_byte_time
434
if transfer_time < 0.001:
435
transfer_time = 0.001
436
bps = self._total_byte_count / transfer_time
438
msg = ('Transferred: %.0fKiB'
439
' (%.1fK/s r:%.0fK w:%.0fK'
440
% (self._total_byte_count / 1024.,
442
self._bytes_by_direction['read'] / 1024.,
443
self._bytes_by_direction['write'] / 1024.,
445
if self._bytes_by_direction['unknown'] > 0:
446
msg += ' u:%.0fK)' % (
447
self._bytes_by_direction['unknown'] / 1024.
453
def log_transport_activity(self, display=False):
454
msg = self._format_bytes_by_direction()
456
if display and self._total_byte_count > 0:
458
self._term_file.write(msg + '\n')
461
class TextUIOutputStream(object):
462
"""Decorates an output stream so that the terminal is cleared before writing.
464
This is supposed to ensure that the progress bar does not conflict with bulk
467
# XXX: this does not handle the case of writing part of a line, then doing
468
# progress bar output: the progress bar will probably write over it.
469
# one option is just to buffer that text until we have a full line;
470
# another is to save and restore it
472
# XXX: might need to wrap more methods
474
def __init__(self, ui_factory, wrapped_stream):
475
self.ui_factory = ui_factory
476
self.wrapped_stream = wrapped_stream
477
# this does no transcoding, but it must expose the underlying encoding
478
# because some callers need to know what can be written - see for
479
# example unescape_for_display.
480
self.encoding = getattr(wrapped_stream, 'encoding', None)
483
self.ui_factory.clear_term()
484
self.wrapped_stream.flush()
486
def write(self, to_write):
487
self.ui_factory.clear_term()
488
self.wrapped_stream.write(to_write)
490
def writelines(self, lines):
491
self.ui_factory.clear_term()
492
self.wrapped_stream.writelines(lines)
added
removed
bzrlib/ui/text.py
