/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
6182.2.28 by Benoît Pierre
Cleanup helper class for TextUIFactory.choose.
46
class _ChooseUI(object):
47
48
    """ Helper class for choose implementation.
49
    """
50
51
    def __init__(self, ui, msg, choices, default):
52
        self.ui = ui
53
        self._setup_mode()
54
        self._build_alternatives(msg, choices, default)
55
56
    def _setup_mode(self):
57
        """Setup input mode (line-based, char-based) and echo-back.
58
59
        Line-based input is used if the BZR_TEXTUI_INPUT environment
60
        variable is set to 'line-based', or if there is no controlling
61
        terminal.
62
        """
63
        if os.environ.get('BZR_TEXTUI_INPUT') != 'line-based' and \
64
           self.ui.stdin == sys.stdin and self.ui.stdin.isatty():
65
            self.line_based = False
66
            self.echo_back = True
67
        else:
68
            self.line_based = True
69
            self.echo_back = not self.ui.stdin.isatty()
70
71
    def _build_alternatives(self, msg, choices, default):
72
        """Parse choices string.
73
74
        Setup final prompt and the lists of choices and associated
75
        shortcuts.
76
        """
77
        index = 0
78
        help_list = []
79
        self.alternatives = {}
80
        choices = choices.split('\n')
81
        if default is not None and default not in range(0, len(choices)):
82
            raise ValueError("invalid default index")
83
        for c in choices:
84
            name = c.replace('&', '').lower()
85
            choice = (name, index)
86
            if name in self.alternatives:
87
                raise ValueError("duplicated choice: %s" % name)
88
            self.alternatives[name] = choice
89
            shortcut = c.find('&')
90
            if -1 != shortcut and (shortcut + 1) < len(c):
91
                help = c[:shortcut]
92
                help += '[' + c[shortcut + 1] + ']'
93
                help += c[(shortcut + 2):]
94
                shortcut = c[shortcut + 1]
95
            else:
96
                c = c.replace('&', '')
97
                shortcut = c[0]
98
                help = '[%s]%s' % (shortcut, c[1:])
99
            shortcut = shortcut.lower()
100
            if shortcut in self.alternatives:
101
                raise ValueError("duplicated shortcut: %s" % shortcut)
102
            self.alternatives[shortcut] = choice
103
            # Add redirections for default.
104
            if index == default:
105
                self.alternatives[''] = choice
106
                self.alternatives['\r'] = choice
107
            help_list.append(help)
108
            index += 1
109
110
        self.prompt = u'%s (%s): ' % (msg, ', '.join(help_list))
111
112
    def _getline(self):
113
        line = self.ui.stdin.readline()
114
        if '' == line:
115
            raise EOFError
116
        return line.strip()
117
118
    def _getchar(self):
119
        char = osutils.getchar()
120
        if char == chr(3): # INTR
121
            raise KeyboardInterrupt
122
        if char == chr(4): # EOF (^d, C-d)
123
            raise EOFError
124
        return char
125
126
    def interact(self):
127
        """Keep asking the user until a valid choice is made.
128
        """
129
        if self.line_based:
130
            getchoice = self._getline
131
        else:
132
            getchoice = self._getchar
133
        iter = 0
134
        while True:
135
            iter += 1
136
            if 1 == iter or self.line_based:
137
                self.ui.prompt(self.prompt)
138
            try:
139
                choice = getchoice()
140
            except EOFError:
141
                self.ui.stderr.write('\n')
142
                return None
143
            except KeyboardInterrupt:
144
                self.ui.stderr.write('\n')
145
                raise KeyboardInterrupt
146
            choice = choice.lower()
147
            if choice not in self.alternatives:
148
                # Not a valid choice, keep on asking.
149
                continue
150
            name, index = self.alternatives[choice]
151
            if self.echo_back:
152
                self.ui.stderr.write(name + '\n')
153
            return index
154
155
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
156
class TextUIFactory(UIFactory):
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
157
    """A UI factory for Text user interefaces."""
158
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
159
    def __init__(self,
3882.8.11 by Martin Pool
Choose the UIFactory class depending on the terminal capabilities
160
                 stdin=None,
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
161
                 stdout=None,
162
                 stderr=None):
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
163
        """Create a TextUIFactory.
164
        """
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
165
        super(TextUIFactory, self).__init__()
4449.3.28 by Martin Pool
todo
166
        # TODO: there's no good reason not to pass all three streams, maybe we
167
        # should deprecate the default values...
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
168
        self.stdin = stdin
169
        self.stdout = stdout
170
        self.stderr = stderr
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
171
        # paints progress, network activity, etc
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
172
        self._progress_view = self.make_progress_view()
4797.20.2 by
Register SIGWINCH only when creating a TextUIFactory
173
6182.2.13 by Benoît Pierre
Rename ui.confirm to ui.choose.
174
    def choose(self, msg, choices, default=None):
6182.2.11 by Benoît Pierre
Small tweak to TextUIFactory.confirm documentation.
175
        """Prompt the user for a list of alternatives.
6182.2.2 by Benoît Pierre
Implement TextUIFactory.confirm.
176
6182.2.14 by Benoît Pierre
Rework TextUIFactory.choose again to make the code simpler to follow.
177
        Support both line-based and char-based editing.
6182.2.2 by Benoît Pierre
Implement TextUIFactory.confirm.
178
179
        In line-based mode, both the shortcut and full choice name are valid
6182.2.13 by Benoît Pierre
Rename ui.confirm to ui.choose.
180
        answers, e.g. for choose('prompt', '&yes\n&no'): 'y', ' Y ', ' yes',
6182.2.2 by Benoît Pierre
Implement TextUIFactory.confirm.
181
        'YES ' are all valid input lines for choosing 'yes'.
182
183
        An empty line, when in line-based mode, or pressing enter in char-based
184
        mode will select the default choice (if any).
185
186
        Choice is echoed back if:
187
        - input is char-based; which means a controlling terminal is available,
188
          and osutils.getchar is used
189
        - input is line-based, and no controlling terminal is available
190
        """
6182.2.14 by Benoît Pierre
Rework TextUIFactory.choose again to make the code simpler to follow.
191
6182.2.28 by Benoît Pierre
Cleanup helper class for TextUIFactory.choose.
192
        choose_ui = _ChooseUI(self, msg, choices, default)
6182.2.14 by Benoît Pierre
Rework TextUIFactory.choose again to make the code simpler to follow.
193
        return choose_ui.interact()
6182.2.2 by Benoît Pierre
Implement TextUIFactory.confirm.
194
4961.1.2 by Martin Pool
quietness-state is now tracked on UIFactory
195
    def be_quiet(self, state):
196
        if state and not self._quiet:
197
            self.clear_term()
198
        UIFactory.be_quiet(self, state)
4961.1.3 by Martin Pool
trace quietness now controls whether the progress bar appears
199
        self._progress_view = self.make_progress_view()
4961.1.2 by Martin Pool
quietness-state is now tracked on UIFactory
200
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
201
    def clear_term(self):
202
        """Prepare the terminal for output.
203
204
        This will, clear any progress bars, and leave the cursor at the
205
        leftmost position."""
3882.7.6 by Martin Pool
Preliminary support for drawing network io into the progress bar
206
        # XXX: If this is preparing to write to stdout, but that's for example
207
        # directed into a file rather than to the terminal, and the progress
208
        # bar _is_ going to the terminal, we shouldn't need
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
209
        # 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
210
        self._progress_view.clear()
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
211
4597.3.37 by Vincent Ladeuil
Allows ui factories to query users for an integer.
212
    def get_integer(self, prompt):
213
        while True:
214
            self.prompt(prompt)
215
            line = self.stdin.readline()
216
            try:
217
                return int(line)
218
            except ValueError:
219
                pass
220
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
221
    def get_non_echoed_password(self):
222
        isatty = getattr(self.stdin, 'isatty', None)
223
        if isatty is not None and isatty():
224
            # getpass() ensure the password is not echoed and other
225
            # cross-platform niceties
226
            password = getpass.getpass('')
227
        else:
228
            # echo doesn't make sense without a terminal
229
            password = self.stdin.readline()
230
            if not password:
231
                password = None
232
            elif password[-1] == '\n':
233
                password = password[:-1]
234
        return password
235
5863.6.1 by Jelmer Vernooij
Require a unicode prompt to be passed into all methods that prompt.
236
    def get_password(self, prompt=u'', **kwargs):
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
237
        """Prompt the user for a password.
238
239
        :param prompt: The prompt to present the user
240
        :param kwargs: Arguments which will be expanded into the prompt.
241
                       This lets front ends display different things if
242
                       they so choose.
243
        :return: The password string, return None if the user
244
                 canceled the request.
245
        """
246
        prompt += ': '
247
        self.prompt(prompt, **kwargs)
248
        # There's currently no way to say 'i decline to enter a password'
249
        # as opposed to 'my password is empty' -- does it matter?
250
        return self.get_non_echoed_password()
251
252
    def get_username(self, prompt, **kwargs):
253
        """Prompt the user for a username.
254
255
        :param prompt: The prompt to present the user
256
        :param kwargs: Arguments which will be expanded into the prompt.
257
                       This lets front ends display different things if
258
                       they so choose.
259
        :return: The username string, return None if the user
260
                 canceled the request.
261
        """
262
        prompt += ': '
263
        self.prompt(prompt, **kwargs)
264
        username = self.stdin.readline()
265
        if not username:
266
            username = None
267
        elif username[-1] == '\n':
268
            username = username[:-1]
269
        return username
270
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
271
    def make_progress_view(self):
272
        """Construct and return a new ProgressView subclass for this UI.
273
        """
4961.1.2 by Martin Pool
quietness-state is now tracked on UIFactory
274
        # with --quiet, never any progress view
5243.1.2 by Martin
Point launchpad links in comments at production server rather than edge
275
        # <https://bugs.launchpad.net/bzr/+bug/320035>.  Otherwise if the
4961.1.2 by Martin Pool
quietness-state is now tracked on UIFactory
276
        # user specifically requests either text or no progress bars, always
277
        # do that.  otherwise, guess based on $TERM and tty presence.
278
        if self.is_quiet():
279
            return NullProgressView()
280
        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
281
            return TextProgressView(self.stderr)
282
        elif os.environ.get('BZR_PROGRESS_BAR') == 'none':
283
            return NullProgressView()
284
        elif progress._supports_progress(self.stderr):
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
285
            return TextProgressView(self.stderr)
286
        else:
287
            return NullProgressView()
288
4792.8.5 by Martin Pool
Support encoding_type=exact for make_output_stream
289
    def _make_output_stream_explicit(self, encoding, encoding_type):
290
        if encoding_type == 'exact':
291
            # force sys.stdout to be binary stream on win32; 
292
            # NB: this leaves the file set in that mode; may cause problems if
293
            # one process tries to do binary and then text output
294
            if sys.platform == 'win32':
295
                fileno = getattr(self.stdout, 'fileno', None)
296
                if fileno:
297
                    import msvcrt
298
                    msvcrt.setmode(fileno(), os.O_BINARY)
299
            return TextUIOutputStream(self, self.stdout)
300
        else:
301
            encoded_stdout = codecs.getwriter(encoding)(self.stdout,
302
                errors=encoding_type)
4792.8.10 by Martin Pool
Put tweaks to codecs.getwriter encoding into the place it's created
303
            # For whatever reason codecs.getwriter() does not advertise its encoding
304
            # it just returns the encoding of the wrapped file, which is completely
305
            # bogus. So set the attribute, so we can find the correct encoding later.
306
            encoded_stdout.encoding = encoding
4792.8.5 by Martin Pool
Support encoding_type=exact for make_output_stream
307
            return TextUIOutputStream(self, encoded_stdout)
4792.8.2 by Martin Pool
New method ui_factory.make_output_stream
308
3882.8.4 by Martin Pool
All UI factories should support note()
309
    def note(self, msg):
310
        """Write an already-formatted message, clearing the progress bar if necessary."""
311
        self.clear_term()
312
        self.stdout.write(msg + '\n')
313
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
314
    def prompt(self, prompt, **kwargs):
315
        """Emit prompt on the CLI.
316
        
317
        :param kwargs: Dictionary of arguments to insert into the prompt,
318
            to allow UIs to reformat the prompt.
319
        """
5863.6.1 by Jelmer Vernooij
Require a unicode prompt to be passed into all methods that prompt.
320
        if type(prompt) != unicode:
321
            raise ValueError("prompt %r not a unicode string" % prompt)
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
322
        if kwargs:
323
            # See <https://launchpad.net/bugs/365891>
324
            prompt = prompt % kwargs
325
        prompt = prompt.encode(osutils.get_terminal_encoding(), 'replace')
326
        self.clear_term()
6182.2.10 by Benoît Pierre
Flush stdout before prompting in TextUIFactory.
327
        self.stdout.flush()
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
328
        self.stderr.write(prompt)
329
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
330
    def report_transport_activity(self, transport, byte_count, direction):
331
        """Called by transports as they do IO.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
332
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
333
        This may update a progress bar, spinner, or similar display.
334
        By default it does nothing.
335
        """
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
336
        self._progress_view.show_transport_activity(transport,
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
337
            direction, byte_count)
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
338
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
339
    def log_transport_activity(self, display=False):
340
        """See UIFactory.log_transport_activity()"""
341
        log = getattr(self._progress_view, 'log_transport_activity', None)
342
        if log is not None:
343
            log(display=display)
344
4711.1.7 by Martin Pool
Add UIFactory.show_error, show_warning, show_message
345
    def show_error(self, msg):
346
        self.clear_term()
347
        self.stderr.write("bzr: error: %s\n" % msg)
348
4711.1.8 by Martin Pool
Add show_warning and show_message tests and implementations
349
    def show_message(self, msg):
350
        self.note(msg)
351
352
    def show_warning(self, msg):
353
        self.clear_term()
5167.1.1 by Parth Malwankar
commit command can now accept message (-m) same as a unicode filename
354
        if isinstance(msg, unicode):
355
            te = osutils.get_terminal_encoding()
5167.1.4 by Parth Malwankar
show_warning now uses 'replace' option for encoding the message.
356
            msg = msg.encode(te, 'replace')
4711.1.8 by Martin Pool
Add show_warning and show_message tests and implementations
357
        self.stderr.write("bzr: warning: %s\n" % msg)
358
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
359
    def _progress_updated(self, task):
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
360
        """A task has been updated and wants to be displayed.
361
        """
4070.1.1 by Martin Pool
Be more robust about pb updates when none are active
362
        if not self._task_stack:
363
            warnings.warn("%r updated but no tasks are active" %
364
                (task,))
365
        elif task != self._task_stack[-1]:
4961.2.19 by Martin Pool
Suppress un-helpful warning about progress task ordering
366
            # We used to check it was the top task, but it's hard to always
367
            # get this right and it's not necessarily useful: any actual
368
            # problems will be evident in use
369
            #warnings.warn("%r is not the top progress task %r" %
370
            #     (task, self._task_stack[-1]))
371
            pass
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
372
        self._progress_view.show_progress(task)
373
3948.2.5 by Martin Pool
rename to _progress_all_finished
374
    def _progress_all_finished(self):
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
375
        self._progress_view.clear()
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
376
4634.144.8 by Martin Pool
Generalize to ui_factory.show_user_warning
377
    def show_user_warning(self, warning_id, **message_args):
4634.144.5 by Martin Pool
Cleaner presentation and tests for warn_cross_format_fetch
378
        """Show a text message to the user.
379
380
        Explicitly not for warnings about bzr apis, deprecations or internals.
381
        """
382
        # eventually trace.warning should migrate here, to avoid logging and
383
        # be easier to test; that has a lot of test fallout so for now just
384
        # new code can call this
4634.144.11 by Martin Pool
Rename squelched to suppressed
385
        if warning_id not in self.suppressed_warnings:
4634.144.9 by Martin Pool
Suppress user warnings about cross-format fetch during upgrade
386
            self.stderr.write(self.format_user_warning(warning_id, message_args) +
387
                '\n')
4634.144.5 by Martin Pool
Cleaner presentation and tests for warn_cross_format_fetch
388
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
389
390
class TextProgressView(object):
391
    """Display of progress bar and other information on a tty.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
392
393
    This shows one line of text, including possibly a network indicator, spinner,
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
394
    progress bar, message, etc.
395
396
    One instance of this is created and held by the UI, and fed updates when a
397
    task wants to be painted.
398
399
    Transports feed data to this through the ui_factory object.
3948.2.2 by Martin Pool
Corrections to finishing progress bars
400
401
    The Progress views can comprise a tree with _parent_task pointers, but
402
    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
403
    """
404
405
    def __init__(self, term_file):
406
        self._term_file = term_file
407
        # true when there's output on the screen we may need to clear
408
        self._have_output = False
409
        self._last_transport_msg = ''
410
        self._spin_pos = 0
411
        # time we last repainted the screen
412
        self._last_repaint = 0
413
        # time we last got information about transport activity
414
        self._transport_update_time = 0
415
        self._last_task = None
416
        self._total_byte_count = 0
417
        self._bytes_since_update = 0
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
418
        self._bytes_by_direction = {'unknown': 0, 'read': 0, 'write': 0}
4906.1.5 by John Arbash Meinel
Include the KiB/s for the transfer.
419
        self._first_byte_time = None
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
420
        self._fraction = 0
4880.2.1 by Martin Pool
Text progress view is now only a spinner not a bar.
421
        # force the progress bar to be off, as at the moment it doesn't 
422
        # correspond reliably to overall command progress
423
        self.enable_bar = False
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
424
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
425
    def _avail_width(self):
426
        # we need one extra space for terminals that wrap on last char
427
        w = osutils.terminal_width() 
428
        if w is None:
5050.16.1 by Martin Pool
Clear off progress bars by painting spaces.
429
            return None
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
430
        else:
431
            return w - 1
432
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
433
    def _show_line(self, s):
5050.16.1 by Martin Pool
Clear off progress bars by painting spaces.
434
        # sys.stderr.write("progress %r\n" % s)
435
        width = self._avail_width()
436
        if width is not None:
437
            s = '%-*.*s' % (width, width, s)
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
438
        self._term_file.write('\r' + s + '\r')
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
439
440
    def clear(self):
441
        if self._have_output:
442
            self._show_line('')
443
        self._have_output = False
444
445
    def _render_bar(self):
446
        # 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.
447
        if self.enable_bar and (
448
            (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
449
            # If there's no task object, we show space for the bar anyhow.
450
            # That's because most invocations of bzr will end showing progress
451
            # at some point, though perhaps only after doing some initial IO.
452
            # It looks better to draw the progress bar initially rather than
453
            # to have what looks like an incomplete progress bar.
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
454
            spin_str =  r'/-\|'[self._spin_pos % 4]
455
            self._spin_pos += 1
456
            cols = 20
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
457
            if self._last_task is None:
458
                completion_fraction = 0
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
459
                self._fraction = 0
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
460
            else:
461
                completion_fraction = \
462
                    self._last_task._overall_completion_fraction() or 0
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
463
            if (completion_fraction < self._fraction and 'progress' in
464
                debug.debug_flags):
465
                import pdb;pdb.set_trace()
466
            self._fraction = completion_fraction
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
467
            markers = int(round(float(cols) * completion_fraction)) - 1
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
468
            bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
469
            return bar_str
4912.1.1 by Martin Pool
Transport activity indicator is now shown even if there's no pb
470
        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
471
            # The last task wanted just a spinner, no bar
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
472
            spin_str =  r'/-\|'[self._spin_pos % 4]
473
            self._spin_pos += 1
474
            return spin_str + ' '
475
        else:
476
            return ''
477
478
    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
479
        """Format task-specific parts of progress bar.
480
481
        :returns: (text_part, counter_part) both unicode strings.
482
        """
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
483
        if not task.show_count:
484
            s = ''
4017.1.1 by John Arbash Meinel
Get a pb.tick() to work after calling pb.update()
485
        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
486
            s = ' %d/%d' % (task.current_cnt, task.total_cnt)
487
        elif task.current_cnt is not None:
488
            s = ' %d' % (task.current_cnt)
489
        else:
490
            s = ''
491
        # compose all the parent messages
492
        t = task
493
        m = task.msg
494
        while t._parent_task:
495
            t = t._parent_task
496
            if t.msg:
497
                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
498
        return m, s
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
499
4110.2.16 by Martin Pool
Refactor TextProgressView a bit and add another test
500
    def _render_line(self):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
501
        bar_string = self._render_bar()
502
        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
503
            task_part, counter_part = self._format_task(self._last_task)
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
504
        else:
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
505
            task_part = counter_part = ''
4580.3.5 by Martin Pool
selftest sets ProgressTask.show_transport_activity off
506
        if self._last_task and not self._last_task.show_transport_activity:
507
            trans = ''
508
        else:
509
            trans = self._last_transport_msg
5339.2.3 by Martin Pool
Show the progress spinner between the transport rate and the message.
510
        # the bar separates the transport activity from the message, so even
511
        # if there's no bar or spinner, we must show something if both those
512
        # fields are present
513
        if (task_part or trans) and not bar_string:
514
            bar_string = '| '
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
515
        # preferentially truncate the task message if we don't have enough
516
        # space
5339.2.3 by Martin Pool
Show the progress spinner between the transport rate and the message.
517
        avail_width = self._avail_width()
518
        if avail_width is not None:
519
            # 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
520
            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.
521
            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
522
            if gap > 0:
523
                task_part = task_part[:-gap-2] + '..'
5339.2.3 by Martin Pool
Show the progress spinner between the transport rate and the message.
524
        s = trans + bar_string + task_part + counter_part
525
        if avail_width is not None:
526
            if len(s) < avail_width:
527
                s = s.ljust(avail_width)
528
            elif len(s) > avail_width:
529
                s = s[:avail_width]
530
        return s
4110.2.16 by Martin Pool
Refactor TextProgressView a bit and add another test
531
532
    def _repaint(self):
533
        s = self._render_line()
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
534
        self._show_line(s)
535
        self._have_output = True
536
537
    def show_progress(self, task):
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
538
        """Called by the task object when it has changed.
539
        
540
        :param task: The top task object; its parents are also included 
541
            by following links.
542
        """
4110.2.18 by Martin Pool
Progress bars always repaint when task structure is changed
543
        must_update = task is not self._last_task
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
544
        self._last_task = task
545
        now = time.time()
4580.3.1 by Martin Pool
ProgressTasks can specify an update latency
546
        if (not must_update) and (now < self._last_repaint + task.update_latency):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
547
            return
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
548
        if now > self._transport_update_time + 10:
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
549
            # no recent activity; expire it
550
            self._last_transport_msg = ''
551
        self._last_repaint = now
552
        self._repaint()
553
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
554
    def show_transport_activity(self, transport, direction, byte_count):
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
555
        """Called by transports via the ui_factory, as they do IO.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
556
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
557
        This may update a progress bar, spinner, or similar display.
558
        By default it does nothing.
559
        """
4906.1.8 by John Arbash Meinel
Merge bzr.dev, resolve conflicts.
560
        # XXX: there should be a transport activity model, and that too should
561
        #      be seen by the progress view, rather than being poked in here.
4906.1.2 by John Arbash Meinel
Get the basic interface tested.
562
        self._total_byte_count += byte_count
563
        self._bytes_since_update += byte_count
4906.1.5 by John Arbash Meinel
Include the KiB/s for the transfer.
564
        if self._first_byte_time is None:
565
            # Note that this isn't great, as technically it should be the time
566
            # when the bytes started transferring, not when they completed.
567
            # However, we usually start with a small request anyway.
568
            self._first_byte_time = time.time()
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
569
        if direction in self._bytes_by_direction:
570
            self._bytes_by_direction[direction] += byte_count
571
        else:
572
            self._bytes_by_direction['unknown'] += byte_count
4912.1.4 by Martin Pool
Rename to -Dno_activity; incidentally fixes ReST syntax error
573
        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
574
            # Can be used as a workaround if
575
            # <https://launchpad.net/bugs/321935> reappears and transport
576
            # activity is cluttering other output.  However, thanks to
577
            # 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
578
            return
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
579
        now = time.time()
4912.1.3 by Martin Pool
Revert: don't show transport activity til some data has been sent.
580
        if self._total_byte_count < 2000:
581
            # a little resistance at first, so it doesn't stay stuck at 0
582
            # while connecting...
583
            return
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
584
        if self._transport_update_time is None:
585
            self._transport_update_time = now
4043.1.1 by John Arbash Meinel
Increase the debounce time for 'transport activity' to 0.5s
586
        elif now >= (self._transport_update_time + 0.5):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
587
            # guard against clock stepping backwards, and don't update too
588
            # often
4989.1.6 by Vincent Ladeuil
Add comments and update HACKING.txt about which units should be used.
589
            rate = (self._bytes_since_update
590
                    / (now - self._transport_update_time))
591
            # using base-10 units (see HACKING.txt).
5339.2.3 by Martin Pool
Show the progress spinner between the transport rate and the message.
592
            msg = ("%6dkB %5dkB/s " %
4989.1.1 by Gordon Tyler
Changed show_transport_activity and log_transport_activity to use base-10 SI units.
593
                    (self._total_byte_count / 1000, int(rate) / 1000,))
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
594
            self._transport_update_time = now
595
            self._last_repaint = now
596
            self._bytes_since_update = 0
597
            self._last_transport_msg = msg
598
            self._repaint()
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
599
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
600
    def _format_bytes_by_direction(self):
4906.1.5 by John Arbash Meinel
Include the KiB/s for the transfer.
601
        if self._first_byte_time is None:
602
            bps = 0.0
603
        else:
604
            transfer_time = time.time() - self._first_byte_time
605
            if transfer_time < 0.001:
606
                transfer_time = 0.001
607
            bps = self._total_byte_count / transfer_time
608
4989.1.6 by Vincent Ladeuil
Add comments and update HACKING.txt about which units should be used.
609
        # 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.
610
        msg = ('Transferred: %.0fkB'
611
               ' (%.1fkB/s r:%.0fkB w:%.0fkB'
612
               % (self._total_byte_count / 1000.,
613
                  bps / 1000.,
614
                  self._bytes_by_direction['read'] / 1000.,
615
                  self._bytes_by_direction['write'] / 1000.,
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
616
                 ))
617
        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.
618
            msg += ' u:%.0fkB)' % (
619
                self._bytes_by_direction['unknown'] / 1000.
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
620
                )
621
        else:
622
            msg += ')'
623
        return msg
624
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
625
    def log_transport_activity(self, display=False):
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
626
        msg = self._format_bytes_by_direction()
627
        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.
628
        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.
629
            self.clear()
4906.1.4 by John Arbash Meinel
Play around with the ui display a bit more.
630
            self._term_file.write(msg + '\n')
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
631
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
632
633
class TextUIOutputStream(object):
634
    """Decorates an output stream so that the terminal is cleared before writing.
635
636
    This is supposed to ensure that the progress bar does not conflict with bulk
637
    text output.
638
    """
639
    # XXX: this does not handle the case of writing part of a line, then doing
640
    # progress bar output: the progress bar will probably write over it.
641
    # one option is just to buffer that text until we have a full line;
642
    # another is to save and restore it
643
644
    # XXX: might need to wrap more methods
645
646
    def __init__(self, ui_factory, wrapped_stream):
647
        self.ui_factory = ui_factory
648
        self.wrapped_stream = wrapped_stream
4792.8.13 by Martin Pool
TextUIOutputStream must have an .encoding
649
        # this does no transcoding, but it must expose the underlying encoding
650
        # because some callers need to know what can be written - see for
651
        # example unescape_for_display.
4792.8.15 by Martin Pool
TextUIOutputStream can cope if the wrapped stream doesn't have a .encoding
652
        self.encoding = getattr(wrapped_stream, 'encoding', None)
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
653
4792.8.7 by Martin Pool
Add TextUIOutputStream.flush
654
    def flush(self):
655
        self.ui_factory.clear_term()
656
        self.wrapped_stream.flush()
657
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
658
    def write(self, to_write):
659
        self.ui_factory.clear_term()
660
        self.wrapped_stream.write(to_write)
4792.8.3 by Martin Pool
Add TextUIOutputStream.writelines
661
662
    def writelines(self, lines):
663
        self.ui_factory.clear_term()
664
        self.wrapped_stream.writelines(lines)