~bzr-pqm/bzr/bzr.dev

5752.3.8 by John Arbash Meinel
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts
1
# Copyright (C) 2005-2011 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.49.21 by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.49.21 by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.49.21 by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1185.49.21 by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
16
17
18
"""Text UI, write output to the console.
19
"""
20
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
21
import os
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
22
import sys
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
23
import time
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
24
25
from bzrlib.lazy_import import lazy_import
26
lazy_import(globals(), """
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
27
import codecs
28
import getpass
29
import warnings
30
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
31
from bzrlib import (
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
32
    debug,
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
33
    progress,
2294.4.1 by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests.
34
    osutils,
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
35
    trace,
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
36
    )
3882.8.8 by Martin Pool
Progress and UI test cleanups
37
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
38
""")
39
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
40
from bzrlib.ui import (
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
41
    UIFactory,
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
42
    NullProgressView,
43
    )
1687.1.4 by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean().
44
45
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
46
class TextUIFactory(UIFactory):
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
47
    """A UI factory for Text user interefaces."""
48
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
49
    def __init__(self,
3882.8.11 by Martin Pool
Choose the UIFactory class depending on the terminal capabilities
50
                 stdin=None,
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
51
                 stdout=None,
52
                 stderr=None):
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
53
        """Create a TextUIFactory.
54
        """
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
55
        super(TextUIFactory, self).__init__()
4449.3.28 by Martin Pool
todo
56
        # TODO: there's no good reason not to pass all three streams, maybe we
57
        # should deprecate the default values...
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
58
        self.stdin = stdin
59
        self.stdout = stdout
60
        self.stderr = stderr
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
61
        # paints progress, network activity, etc
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
62
        self._progress_view = self.make_progress_view()
4797.20.2 by
Register SIGWINCH only when creating a TextUIFactory
63
4961.1.2 by Martin Pool
quietness-state is now tracked on UIFactory
64
    def be_quiet(self, state):
65
        if state and not self._quiet:
66
            self.clear_term()
67
        UIFactory.be_quiet(self, state)
4961.1.3 by Martin Pool
trace quietness now controls whether the progress bar appears
68
        self._progress_view = self.make_progress_view()
4961.1.2 by Martin Pool
quietness-state is now tracked on UIFactory
69
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
70
    def clear_term(self):
71
        """Prepare the terminal for output.
72
73
        This will, clear any progress bars, and leave the cursor at the
74
        leftmost position."""
3882.7.6 by Martin Pool
Preliminary support for drawing network io into the progress bar
75
        # XXX: If this is preparing to write to stdout, but that's for example
76
        # directed into a file rather than to the terminal, and the progress
77
        # bar _is_ going to the terminal, we shouldn't need
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
78
        # to clear it.  We might need to separately check for the case of
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
79
        self._progress_view.clear()
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
80
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
81
    def get_boolean(self, prompt):
82
        while True:
83
            self.prompt(prompt + "? [y/n]: ")
4449.3.37 by Martin Pool
TextUIFactory should cope with EOF when in get_boolean
84
            line = self.stdin.readline().lower()
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
85
            if line in ('y\n', 'yes\n'):
86
                return True
4449.3.37 by Martin Pool
TextUIFactory should cope with EOF when in get_boolean
87
            elif line in ('n\n', 'no\n'):
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
88
                return False
4449.3.37 by Martin Pool
TextUIFactory should cope with EOF when in get_boolean
89
            elif line in ('', None):
90
                # end-of-file; possibly should raise an error here instead
91
                return None
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
92
4597.3.37 by Vincent Ladeuil
Allows ui factories to query users for an integer.
93
    def get_integer(self, prompt):
94
        while True:
95
            self.prompt(prompt)
96
            line = self.stdin.readline()
97
            try:
98
                return int(line)
99
            except ValueError:
100
                pass
101
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
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('')
108
        else:
109
            # echo doesn't make sense without a terminal
110
            password = self.stdin.readline()
111
            if not password:
112
                password = None
113
            elif password[-1] == '\n':
114
                password = password[:-1]
115
        return password
116
5863.6.1 by Jelmer Vernooij
Require a unicode prompt to be passed into all methods that prompt.
117
    def get_password(self, prompt=u'', **kwargs):
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
118
        """Prompt the user for a password.
119
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
123
                       they so choose.
124
        :return: The password string, return None if the user
125
                 canceled the request.
126
        """
127
        prompt += ': '
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()
132
133
    def get_username(self, prompt, **kwargs):
134
        """Prompt the user for a username.
135
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
139
                       they so choose.
140
        :return: The username string, return None if the user
141
                 canceled the request.
142
        """
143
        prompt += ': '
144
        self.prompt(prompt, **kwargs)
145
        username = self.stdin.readline()
146
        if not username:
147
            username = None
148
        elif username[-1] == '\n':
149
            username = username[:-1]
150
        return username
151
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
152
    def make_progress_view(self):
153
        """Construct and return a new ProgressView subclass for this UI.
154
        """
4961.1.2 by Martin Pool
quietness-state is now tracked on UIFactory
155
        # with --quiet, never any progress view
5243.1.2 by Martin
Point launchpad links in comments at production server rather than edge
156
        # <https://bugs.launchpad.net/bzr/+bug/320035>.  Otherwise if the
4961.1.2 by Martin Pool
quietness-state is now tracked on UIFactory
157
        # user specifically requests either text or no progress bars, always
158
        # do that.  otherwise, guess based on $TERM and tty presence.
159
        if self.is_quiet():
160
            return NullProgressView()
161
        elif os.environ.get('BZR_PROGRESS_BAR') == 'text':
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
162
            return TextProgressView(self.stderr)
163
        elif os.environ.get('BZR_PROGRESS_BAR') == 'none':
164
            return NullProgressView()
165
        elif progress._supports_progress(self.stderr):
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
166
            return TextProgressView(self.stderr)
167
        else:
168
            return NullProgressView()
169
4792.8.5 by Martin Pool
Support encoding_type=exact for make_output_stream
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)
177
                if fileno:
178
                    import msvcrt
179
                    msvcrt.setmode(fileno(), os.O_BINARY)
180
            return TextUIOutputStream(self, self.stdout)
181
        else:
182
            encoded_stdout = codecs.getwriter(encoding)(self.stdout,
183
                errors=encoding_type)
4792.8.10 by Martin Pool
Put tweaks to codecs.getwriter encoding into the place it's created
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
4792.8.5 by Martin Pool
Support encoding_type=exact for make_output_stream
188
            return TextUIOutputStream(self, encoded_stdout)
4792.8.2 by Martin Pool
New method ui_factory.make_output_stream
189
3882.8.4 by Martin Pool
All UI factories should support note()
190
    def note(self, msg):
191
        """Write an already-formatted message, clearing the progress bar if necessary."""
192
        self.clear_term()
193
        self.stdout.write(msg + '\n')
194
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
195
    def prompt(self, prompt, **kwargs):
196
        """Emit prompt on the CLI.
197
        
198
        :param kwargs: Dictionary of arguments to insert into the prompt,
199
            to allow UIs to reformat the prompt.
200
        """
5863.6.1 by Jelmer Vernooij
Require a unicode prompt to be passed into all methods that prompt.
201
        if type(prompt) != unicode:
202
            raise ValueError("prompt %r not a unicode string" % prompt)
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
203
        if kwargs:
204
            # See <https://launchpad.net/bugs/365891>
205
            prompt = prompt % kwargs
206
        prompt = prompt.encode(osutils.get_terminal_encoding(), 'replace')
207
        self.clear_term()
208
        self.stderr.write(prompt)
209
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
210
    def report_transport_activity(self, transport, byte_count, direction):
211
        """Called by transports as they do IO.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
212
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
213
        This may update a progress bar, spinner, or similar display.
214
        By default it does nothing.
215
        """
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
216
        self._progress_view.show_transport_activity(transport,
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
217
            direction, byte_count)
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
218
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
219
    def log_transport_activity(self, display=False):
220
        """See UIFactory.log_transport_activity()"""
221
        log = getattr(self._progress_view, 'log_transport_activity', None)
222
        if log is not None:
223
            log(display=display)
224
4711.1.7 by Martin Pool
Add UIFactory.show_error, show_warning, show_message
225
    def show_error(self, msg):
226
        self.clear_term()
227
        self.stderr.write("bzr: error: %s\n" % msg)
228
4711.1.8 by Martin Pool
Add show_warning and show_message tests and implementations
229
    def show_message(self, msg):
230
        self.note(msg)
231
232
    def show_warning(self, msg):
233
        self.clear_term()
5167.1.1 by Parth Malwankar
commit command can now accept message (-m) same as a unicode filename
234
        if isinstance(msg, unicode):
235
            te = osutils.get_terminal_encoding()
5167.1.4 by Parth Malwankar
show_warning now uses 'replace' option for encoding the message.
236
            msg = msg.encode(te, 'replace')
4711.1.8 by Martin Pool
Add show_warning and show_message tests and implementations
237
        self.stderr.write("bzr: warning: %s\n" % msg)
238
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
239
    def _progress_updated(self, task):
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
240
        """A task has been updated and wants to be displayed.
241
        """
4070.1.1 by Martin Pool
Be more robust about pb updates when none are active
242
        if not self._task_stack:
243
            warnings.warn("%r updated but no tasks are active" %
244
                (task,))
245
        elif task != self._task_stack[-1]:
4961.2.19 by Martin Pool
Suppress un-helpful warning about progress task ordering
246
            # We used to check it was the top task, but it's hard to always
247
            # get this right and it's not necessarily useful: any actual
248
            # problems will be evident in use
249
            #warnings.warn("%r is not the top progress task %r" %
250
            #     (task, self._task_stack[-1]))
251
            pass
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
252
        self._progress_view.show_progress(task)
253
3948.2.5 by Martin Pool
rename to _progress_all_finished
254
    def _progress_all_finished(self):
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
255
        self._progress_view.clear()
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
256
4634.144.8 by Martin Pool
Generalize to ui_factory.show_user_warning
257
    def show_user_warning(self, warning_id, **message_args):
4634.144.5 by Martin Pool
Cleaner presentation and tests for warn_cross_format_fetch
258
        """Show a text message to the user.
259
260
        Explicitly not for warnings about bzr apis, deprecations or internals.
261
        """
262
        # eventually trace.warning should migrate here, to avoid logging and
263
        # be easier to test; that has a lot of test fallout so for now just
264
        # new code can call this
4634.144.11 by Martin Pool
Rename squelched to suppressed
265
        if warning_id not in self.suppressed_warnings:
4634.144.9 by Martin Pool
Suppress user warnings about cross-format fetch during upgrade
266
            self.stderr.write(self.format_user_warning(warning_id, message_args) +
267
                '\n')
4634.144.5 by Martin Pool
Cleaner presentation and tests for warn_cross_format_fetch
268
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
269
270
class TextProgressView(object):
271
    """Display of progress bar and other information on a tty.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
272
273
    This shows one line of text, including possibly a network indicator, spinner,
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
274
    progress bar, message, etc.
275
276
    One instance of this is created and held by the UI, and fed updates when a
277
    task wants to be painted.
278
279
    Transports feed data to this through the ui_factory object.
3948.2.2 by Martin Pool
Corrections to finishing progress bars
280
281
    The Progress views can comprise a tree with _parent_task pointers, but
282
    this only prints the stack from the nominated current task up to the root.
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
283
    """
284
285
    def __init__(self, term_file):
286
        self._term_file = term_file
287
        # true when there's output on the screen we may need to clear
288
        self._have_output = False
289
        self._last_transport_msg = ''
290
        self._spin_pos = 0
291
        # time we last repainted the screen
292
        self._last_repaint = 0
293
        # time we last got information about transport activity
294
        self._transport_update_time = 0
295
        self._last_task = None
296
        self._total_byte_count = 0
297
        self._bytes_since_update = 0
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
298
        self._bytes_by_direction = {'unknown': 0, 'read': 0, 'write': 0}
4906.1.5 by John Arbash Meinel
Include the KiB/s for the transfer.
299
        self._first_byte_time = None
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
300
        self._fraction = 0
4880.2.1 by Martin Pool
Text progress view is now only a spinner not a bar.
301
        # force the progress bar to be off, as at the moment it doesn't 
302
        # correspond reliably to overall command progress
303
        self.enable_bar = False
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
304
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
305
    def _avail_width(self):
306
        # we need one extra space for terminals that wrap on last char
307
        w = osutils.terminal_width() 
308
        if w is None:
5050.16.1 by Martin Pool
Clear off progress bars by painting spaces.
309
            return None
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
310
        else:
311
            return w - 1
312
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
313
    def _show_line(self, s):
5050.16.1 by Martin Pool
Clear off progress bars by painting spaces.
314
        # sys.stderr.write("progress %r\n" % s)
315
        width = self._avail_width()
316
        if width is not None:
317
            s = '%-*.*s' % (width, width, s)
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
318
        self._term_file.write('\r' + s + '\r')
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
319
320
    def clear(self):
321
        if self._have_output:
322
            self._show_line('')
323
        self._have_output = False
324
325
    def _render_bar(self):
326
        # return a string for the progress bar itself
4880.2.1 by Martin Pool
Text progress view is now only a spinner not a bar.
327
        if self.enable_bar and (
328
            (self._last_task is None) or self._last_task.show_bar):
4103.3.3 by Martin Pool
Show the progress bar part when showing activity by default
329
            # If there's no task object, we show space for the bar anyhow.
330
            # That's because most invocations of bzr will end showing progress
331
            # at some point, though perhaps only after doing some initial IO.
332
            # It looks better to draw the progress bar initially rather than
333
            # to have what looks like an incomplete progress bar.
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
334
            spin_str =  r'/-\|'[self._spin_pos % 4]
335
            self._spin_pos += 1
336
            cols = 20
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
337
            if self._last_task is None:
338
                completion_fraction = 0
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
339
                self._fraction = 0
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
340
            else:
341
                completion_fraction = \
342
                    self._last_task._overall_completion_fraction() or 0
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
343
            if (completion_fraction < self._fraction and 'progress' in
344
                debug.debug_flags):
345
                import pdb;pdb.set_trace()
346
            self._fraction = completion_fraction
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
347
            markers = int(round(float(cols) * completion_fraction)) - 1
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
348
            bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
349
            return bar_str
4912.1.1 by Martin Pool
Transport activity indicator is now shown even if there's no pb
350
        elif (self._last_task is None) or self._last_task.show_spinner:
4103.3.3 by Martin Pool
Show the progress bar part when showing activity by default
351
            # The last task wanted just a spinner, no bar
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
352
            spin_str =  r'/-\|'[self._spin_pos % 4]
353
            self._spin_pos += 1
354
            return spin_str + ' '
355
        else:
356
            return ''
357
358
    def _format_task(self, task):
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
359
        """Format task-specific parts of progress bar.
360
361
        :returns: (text_part, counter_part) both unicode strings.
362
        """
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
363
        if not task.show_count:
364
            s = ''
4017.1.1 by John Arbash Meinel
Get a pb.tick() to work after calling pb.update()
365
        elif task.current_cnt is not None and task.total_cnt is not None:
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
366
            s = ' %d/%d' % (task.current_cnt, task.total_cnt)
367
        elif task.current_cnt is not None:
368
            s = ' %d' % (task.current_cnt)
369
        else:
370
            s = ''
371
        # compose all the parent messages
372
        t = task
373
        m = task.msg
374
        while t._parent_task:
375
            t = t._parent_task
376
            if t.msg:
377
                m = t.msg + ':' + m
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
378
        return m, s
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
379
4110.2.16 by Martin Pool
Refactor TextProgressView a bit and add another test
380
    def _render_line(self):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
381
        bar_string = self._render_bar()
382
        if self._last_task:
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
383
            task_part, counter_part = self._format_task(self._last_task)
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
384
        else:
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
385
            task_part = counter_part = ''
4580.3.5 by Martin Pool
selftest sets ProgressTask.show_transport_activity off
386
        if self._last_task and not self._last_task.show_transport_activity:
387
            trans = ''
388
        else:
389
            trans = self._last_transport_msg
5339.2.3 by Martin Pool
Show the progress spinner between the transport rate and the message.
390
        # the bar separates the transport activity from the message, so even
391
        # if there's no bar or spinner, we must show something if both those
392
        # fields are present
393
        if (task_part or trans) and not bar_string:
394
            bar_string = '| '
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
395
        # preferentially truncate the task message if we don't have enough
396
        # space
5339.2.3 by Martin Pool
Show the progress spinner between the transport rate and the message.
397
        avail_width = self._avail_width()
398
        if avail_width is not None:
399
            # if terminal avail_width is unknown, don't truncate
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
400
            current_len = len(bar_string) + len(trans) + len(task_part) + len(counter_part)
5339.2.3 by Martin Pool
Show the progress spinner between the transport rate and the message.
401
            gap = current_len - avail_width
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
402
            if gap > 0:
403
                task_part = task_part[:-gap-2] + '..'
5339.2.3 by Martin Pool
Show the progress spinner between the transport rate and the message.
404
        s = trans + bar_string + task_part + counter_part
405
        if avail_width is not None:
406
            if len(s) < avail_width:
407
                s = s.ljust(avail_width)
408
            elif len(s) > avail_width:
409
                s = s[:avail_width]
410
        return s
4110.2.16 by Martin Pool
Refactor TextProgressView a bit and add another test
411
412
    def _repaint(self):
413
        s = self._render_line()
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
414
        self._show_line(s)
415
        self._have_output = True
416
417
    def show_progress(self, task):
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
418
        """Called by the task object when it has changed.
419
        
420
        :param task: The top task object; its parents are also included 
421
            by following links.
422
        """
4110.2.18 by Martin Pool
Progress bars always repaint when task structure is changed
423
        must_update = task is not self._last_task
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
424
        self._last_task = task
425
        now = time.time()
4580.3.1 by Martin Pool
ProgressTasks can specify an update latency
426
        if (not must_update) and (now < self._last_repaint + task.update_latency):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
427
            return
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
428
        if now > self._transport_update_time + 10:
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
429
            # no recent activity; expire it
430
            self._last_transport_msg = ''
431
        self._last_repaint = now
432
        self._repaint()
433
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
434
    def show_transport_activity(self, transport, direction, byte_count):
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
435
        """Called by transports via the ui_factory, as they do IO.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
436
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
437
        This may update a progress bar, spinner, or similar display.
438
        By default it does nothing.
439
        """
4906.1.8 by John Arbash Meinel
Merge bzr.dev, resolve conflicts.
440
        # XXX: there should be a transport activity model, and that too should
441
        #      be seen by the progress view, rather than being poked in here.
4906.1.2 by John Arbash Meinel
Get the basic interface tested.
442
        self._total_byte_count += byte_count
443
        self._bytes_since_update += byte_count
4906.1.5 by John Arbash Meinel
Include the KiB/s for the transfer.
444
        if self._first_byte_time is None:
445
            # Note that this isn't great, as technically it should be the time
446
            # when the bytes started transferring, not when they completed.
447
            # However, we usually start with a small request anyway.
448
            self._first_byte_time = time.time()
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
449
        if direction in self._bytes_by_direction:
450
            self._bytes_by_direction[direction] += byte_count
451
        else:
452
            self._bytes_by_direction['unknown'] += byte_count
4912.1.4 by Martin Pool
Rename to -Dno_activity; incidentally fixes ReST syntax error
453
        if 'no_activity' in debug.debug_flags:
4912.1.1 by Martin Pool
Transport activity indicator is now shown even if there's no pb
454
            # Can be used as a workaround if
455
            # <https://launchpad.net/bugs/321935> reappears and transport
456
            # activity is cluttering other output.  However, thanks to
457
            # TextUIOutputStream this shouldn't be a problem any more.
4480.1.1 by Martin Pool
(mbp) only show transport activity when progress is already visible
458
            return
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
459
        now = time.time()
4912.1.3 by Martin Pool
Revert: don't show transport activity til some data has been sent.
460
        if self._total_byte_count < 2000:
461
            # a little resistance at first, so it doesn't stay stuck at 0
462
            # while connecting...
463
            return
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
464
        if self._transport_update_time is None:
465
            self._transport_update_time = now
4043.1.1 by John Arbash Meinel
Increase the debounce time for 'transport activity' to 0.5s
466
        elif now >= (self._transport_update_time + 0.5):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
467
            # guard against clock stepping backwards, and don't update too
468
            # often
4989.1.6 by Vincent Ladeuil
Add comments and update HACKING.txt about which units should be used.
469
            rate = (self._bytes_since_update
470
                    / (now - self._transport_update_time))
471
            # using base-10 units (see HACKING.txt).
5339.2.3 by Martin Pool
Show the progress spinner between the transport rate and the message.
472
            msg = ("%6dkB %5dkB/s " %
4989.1.1 by Gordon Tyler
Changed show_transport_activity and log_transport_activity to use base-10 SI units.
473
                    (self._total_byte_count / 1000, int(rate) / 1000,))
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
474
            self._transport_update_time = now
475
            self._last_repaint = now
476
            self._bytes_since_update = 0
477
            self._last_transport_msg = msg
478
            self._repaint()
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
479
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
480
    def _format_bytes_by_direction(self):
4906.1.5 by John Arbash Meinel
Include the KiB/s for the transfer.
481
        if self._first_byte_time is None:
482
            bps = 0.0
483
        else:
484
            transfer_time = time.time() - self._first_byte_time
485
            if transfer_time < 0.001:
486
                transfer_time = 0.001
487
            bps = self._total_byte_count / transfer_time
488
4989.1.6 by Vincent Ladeuil
Add comments and update HACKING.txt about which units should be used.
489
        # using base-10 units (see HACKING.txt).
4989.1.1 by Gordon Tyler
Changed show_transport_activity and log_transport_activity to use base-10 SI units.
490
        msg = ('Transferred: %.0fkB'
491
               ' (%.1fkB/s r:%.0fkB w:%.0fkB'
492
               % (self._total_byte_count / 1000.,
493
                  bps / 1000.,
494
                  self._bytes_by_direction['read'] / 1000.,
495
                  self._bytes_by_direction['write'] / 1000.,
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
496
                 ))
497
        if self._bytes_by_direction['unknown'] > 0:
4989.1.1 by Gordon Tyler
Changed show_transport_activity and log_transport_activity to use base-10 SI units.
498
            msg += ' u:%.0fkB)' % (
499
                self._bytes_by_direction['unknown'] / 1000.
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
500
                )
501
        else:
502
            msg += ')'
503
        return msg
504
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
505
    def log_transport_activity(self, display=False):
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
506
        msg = self._format_bytes_by_direction()
507
        trace.mutter(msg)
4906.1.7 by John Arbash Meinel
Switch to KiB/K for each value. Don't display if there are no bytes.
508
        if display and self._total_byte_count > 0:
4906.1.3 by John Arbash Meinel
Use clear() so that we clear a progress bar, but don't introduce a newline.
509
            self.clear()
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
510
            self._term_file.write(msg + '\n')
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
511
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
512
513
class TextUIOutputStream(object):
514
    """Decorates an output stream so that the terminal is cleared before writing.
515
516
    This is supposed to ensure that the progress bar does not conflict with bulk
517
    text output.
518
    """
519
    # XXX: this does not handle the case of writing part of a line, then doing
520
    # progress bar output: the progress bar will probably write over it.
521
    # one option is just to buffer that text until we have a full line;
522
    # another is to save and restore it
523
524
    # XXX: might need to wrap more methods
525
526
    def __init__(self, ui_factory, wrapped_stream):
527
        self.ui_factory = ui_factory
528
        self.wrapped_stream = wrapped_stream
4792.8.13 by Martin Pool
TextUIOutputStream must have an .encoding
529
        # this does no transcoding, but it must expose the underlying encoding
530
        # because some callers need to know what can be written - see for
531
        # example unescape_for_display.
4792.8.15 by Martin Pool
TextUIOutputStream can cope if the wrapped stream doesn't have a .encoding
532
        self.encoding = getattr(wrapped_stream, 'encoding', None)
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
533
4792.8.7 by Martin Pool
Add TextUIOutputStream.flush
534
    def flush(self):
535
        self.ui_factory.clear_term()
536
        self.wrapped_stream.flush()
537
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
538
    def write(self, to_write):
539
        self.ui_factory.clear_term()
540
        self.wrapped_stream.write(to_write)
4792.8.3 by Martin Pool
Add TextUIOutputStream.writelines
541
542
    def writelines(self, lines):
543
        self.ui_factory.clear_term()
544
        self.wrapped_stream.writelines(lines)