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