/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
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
17
"""Text UI, write output to the console."""
1185.49.21 by John Arbash Meinel
Refactored bzrlib/ui.py into a module with the possibility for multiple ui forms.
18
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
19
from __future__ import absolute_import
20
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
21
import codecs
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
22
import os
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
23
import sys
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
24
import warnings
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
25
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
26
from ..lazy_import import lazy_import
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
27
lazy_import(globals(), """
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
28
import getpass
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
29
import time
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
30
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
31
from breezy 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,
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
34
    )
35
""")
36
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
37
from .. import (
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
38
    config,
2294.4.1 by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests.
39
    osutils,
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
40
    trace,
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
41
    )
6695.1.1 by Martin
Make ui package pass tests on Python 3
42
from ..sixish import (
43
    text_type,
44
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
45
from . import (
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
46
    NullProgressView,
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
47
    UIFactory,
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
48
    )
1687.1.4 by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean().
49
50
6182.2.28 by Benoît Pierre
Cleanup helper class for TextUIFactory.choose.
51
class _ChooseUI(object):
52
53
    """ Helper class for choose implementation.
54
    """
55
56
    def __init__(self, ui, msg, choices, default):
57
        self.ui = ui
58
        self._setup_mode()
59
        self._build_alternatives(msg, choices, default)
60
61
    def _setup_mode(self):
62
        """Setup input mode (line-based, char-based) and echo-back.
63
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
64
        Line-based input is used if the BRZ_TEXTUI_INPUT environment
6182.2.28 by Benoît Pierre
Cleanup helper class for TextUIFactory.choose.
65
        variable is set to 'line-based', or if there is no controlling
66
        terminal.
67
        """
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
68
        if os.environ.get('BRZ_TEXTUI_INPUT') != 'line-based' and \
6182.2.28 by Benoît Pierre
Cleanup helper class for TextUIFactory.choose.
69
           self.ui.stdin == sys.stdin and self.ui.stdin.isatty():
70
            self.line_based = False
71
            self.echo_back = True
72
        else:
73
            self.line_based = True
74
            self.echo_back = not self.ui.stdin.isatty()
75
76
    def _build_alternatives(self, msg, choices, default):
77
        """Parse choices string.
78
79
        Setup final prompt and the lists of choices and associated
80
        shortcuts.
81
        """
82
        index = 0
83
        help_list = []
84
        self.alternatives = {}
85
        choices = choices.split('\n')
86
        if default is not None and default not in range(0, len(choices)):
87
            raise ValueError("invalid default index")
88
        for c in choices:
89
            name = c.replace('&', '').lower()
90
            choice = (name, index)
91
            if name in self.alternatives:
92
                raise ValueError("duplicated choice: %s" % name)
93
            self.alternatives[name] = choice
94
            shortcut = c.find('&')
95
            if -1 != shortcut and (shortcut + 1) < len(c):
96
                help = c[:shortcut]
97
                help += '[' + c[shortcut + 1] + ']'
98
                help += c[(shortcut + 2):]
99
                shortcut = c[shortcut + 1]
100
            else:
101
                c = c.replace('&', '')
102
                shortcut = c[0]
103
                help = '[%s]%s' % (shortcut, c[1:])
104
            shortcut = shortcut.lower()
105
            if shortcut in self.alternatives:
106
                raise ValueError("duplicated shortcut: %s" % shortcut)
107
            self.alternatives[shortcut] = choice
108
            # Add redirections for default.
109
            if index == default:
110
                self.alternatives[''] = choice
111
                self.alternatives['\r'] = choice
112
            help_list.append(help)
113
            index += 1
114
115
        self.prompt = u'%s (%s): ' % (msg, ', '.join(help_list))
116
117
    def _getline(self):
118
        line = self.ui.stdin.readline()
119
        if '' == line:
120
            raise EOFError
121
        return line.strip()
122
123
    def _getchar(self):
124
        char = osutils.getchar()
125
        if char == chr(3): # INTR
126
            raise KeyboardInterrupt
127
        if char == chr(4): # EOF (^d, C-d)
128
            raise EOFError
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
129
        return char.decode("ascii", "replace")
6182.2.28 by Benoît Pierre
Cleanup helper class for TextUIFactory.choose.
130
131
    def interact(self):
132
        """Keep asking the user until a valid choice is made.
133
        """
134
        if self.line_based:
135
            getchoice = self._getline
136
        else:
137
            getchoice = self._getchar
138
        iter = 0
139
        while True:
140
            iter += 1
141
            if 1 == iter or self.line_based:
142
                self.ui.prompt(self.prompt)
143
            try:
144
                choice = getchoice()
145
            except EOFError:
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
146
                self.ui.stderr.write(u'\n')
6182.2.28 by Benoît Pierre
Cleanup helper class for TextUIFactory.choose.
147
                return None
148
            except KeyboardInterrupt:
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
149
                self.ui.stderr.write(u'\n')
150
                raise
6182.2.28 by Benoît Pierre
Cleanup helper class for TextUIFactory.choose.
151
            choice = choice.lower()
152
            if choice not in self.alternatives:
153
                # Not a valid choice, keep on asking.
154
                continue
155
            name, index = self.alternatives[choice]
156
            if self.echo_back:
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
157
                self.ui.stderr.write(name + u'\n')
6182.2.28 by Benoît Pierre
Cleanup helper class for TextUIFactory.choose.
158
            return index
159
160
6561.2.1 by Vincent Ladeuil
Add a ``progress_bar`` config option.
161
opt_progress_bar = config.Option(
162
    'progress_bar', help='Progress bar type.',
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
163
    default_from_env=['BRZ_PROGRESS_BAR'], default=None,
6561.2.1 by Vincent Ladeuil
Add a ``progress_bar`` config option.
164
    invalid='error')
165
166
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
167
class TextUIFactory(UIFactory):
6561.2.1 by Vincent Ladeuil
Add a ``progress_bar`` config option.
168
    """A UI factory for Text user interfaces."""
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
169
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
170
    def __init__(self, stdin, stdout, stderr):
171
        """Create a TextUIFactory."""
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
172
        super(TextUIFactory, self).__init__()
173
        self.stdin = stdin
174
        self.stdout = stdout
175
        self.stderr = stderr
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
176
        # paints progress, network activity, etc
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
177
        self._progress_view = self.make_progress_view()
4797.20.2 by
Register SIGWINCH only when creating a TextUIFactory
178
6182.2.13 by Benoît Pierre
Rename ui.confirm to ui.choose.
179
    def choose(self, msg, choices, default=None):
6182.2.11 by Benoît Pierre
Small tweak to TextUIFactory.confirm documentation.
180
        """Prompt the user for a list of alternatives.
6182.2.2 by Benoît Pierre
Implement TextUIFactory.confirm.
181
6182.2.14 by Benoît Pierre
Rework TextUIFactory.choose again to make the code simpler to follow.
182
        Support both line-based and char-based editing.
6182.2.2 by Benoît Pierre
Implement TextUIFactory.confirm.
183
184
        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.
185
        answers, e.g. for choose('prompt', '&yes\n&no'): 'y', ' Y ', ' yes',
6182.2.2 by Benoît Pierre
Implement TextUIFactory.confirm.
186
        'YES ' are all valid input lines for choosing 'yes'.
187
188
        An empty line, when in line-based mode, or pressing enter in char-based
189
        mode will select the default choice (if any).
190
191
        Choice is echoed back if:
192
        - input is char-based; which means a controlling terminal is available,
193
          and osutils.getchar is used
194
        - input is line-based, and no controlling terminal is available
195
        """
6182.2.14 by Benoît Pierre
Rework TextUIFactory.choose again to make the code simpler to follow.
196
6182.2.28 by Benoît Pierre
Cleanup helper class for TextUIFactory.choose.
197
        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.
198
        return choose_ui.interact()
6182.2.2 by Benoît Pierre
Implement TextUIFactory.confirm.
199
4961.1.2 by Martin Pool
quietness-state is now tracked on UIFactory
200
    def be_quiet(self, state):
201
        if state and not self._quiet:
202
            self.clear_term()
203
        UIFactory.be_quiet(self, state)
4961.1.3 by Martin Pool
trace quietness now controls whether the progress bar appears
204
        self._progress_view = self.make_progress_view()
4961.1.2 by Martin Pool
quietness-state is now tracked on UIFactory
205
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
206
    def clear_term(self):
207
        """Prepare the terminal for output.
208
209
        This will, clear any progress bars, and leave the cursor at the
210
        leftmost position."""
3882.7.6 by Martin Pool
Preliminary support for drawing network io into the progress bar
211
        # XXX: If this is preparing to write to stdout, but that's for example
212
        # directed into a file rather than to the terminal, and the progress
213
        # bar _is_ going to the terminal, we shouldn't need
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
214
        # 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
215
        self._progress_view.clear()
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
216
4597.3.37 by Vincent Ladeuil
Allows ui factories to query users for an integer.
217
    def get_integer(self, prompt):
218
        while True:
219
            self.prompt(prompt)
220
            line = self.stdin.readline()
221
            try:
222
                return int(line)
223
            except ValueError:
224
                pass
225
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
226
    def get_non_echoed_password(self):
227
        isatty = getattr(self.stdin, 'isatty', None)
228
        if isatty is not None and isatty():
229
            # getpass() ensure the password is not echoed and other
230
            # cross-platform niceties
231
            password = getpass.getpass('')
232
        else:
233
            # echo doesn't make sense without a terminal
234
            password = self.stdin.readline()
235
            if not password:
236
                password = None
6559.2.1 by Vincent Ladeuil
Makes AuthenticationConfig always return unicode user names and passwords.
237
            else:
238
                if password[-1] == '\n':
239
                    password = password[:-1]
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
240
        return password
241
5863.6.1 by Jelmer Vernooij
Require a unicode prompt to be passed into all methods that prompt.
242
    def get_password(self, prompt=u'', **kwargs):
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
243
        """Prompt the user for a password.
244
245
        :param prompt: The prompt to present the user
246
        :param kwargs: Arguments which will be expanded into the prompt.
247
                       This lets front ends display different things if
248
                       they so choose.
249
        :return: The password string, return None if the user
250
                 canceled the request.
251
        """
252
        prompt += ': '
253
        self.prompt(prompt, **kwargs)
254
        # There's currently no way to say 'i decline to enter a password'
255
        # as opposed to 'my password is empty' -- does it matter?
256
        return self.get_non_echoed_password()
257
258
    def get_username(self, prompt, **kwargs):
259
        """Prompt the user for a username.
260
261
        :param prompt: The prompt to present the user
262
        :param kwargs: Arguments which will be expanded into the prompt.
263
                       This lets front ends display different things if
264
                       they so choose.
265
        :return: The username string, return None if the user
266
                 canceled the request.
267
        """
268
        prompt += ': '
269
        self.prompt(prompt, **kwargs)
270
        username = self.stdin.readline()
271
        if not username:
272
            username = None
6559.2.1 by Vincent Ladeuil
Makes AuthenticationConfig always return unicode user names and passwords.
273
        else:
274
            if username[-1] == '\n':
275
                username = username[:-1]
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
276
        return username
277
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
278
    def make_progress_view(self):
279
        """Construct and return a new ProgressView subclass for this UI.
280
        """
4961.1.2 by Martin Pool
quietness-state is now tracked on UIFactory
281
        # with --quiet, never any progress view
5243.1.2 by Martin
Point launchpad links in comments at production server rather than edge
282
        # <https://bugs.launchpad.net/bzr/+bug/320035>.  Otherwise if the
4961.1.2 by Martin Pool
quietness-state is now tracked on UIFactory
283
        # user specifically requests either text or no progress bars, always
284
        # do that.  otherwise, guess based on $TERM and tty presence.
285
        if self.is_quiet():
286
            return NullProgressView()
6561.2.1 by Vincent Ladeuil
Add a ``progress_bar`` config option.
287
        pb_type = config.GlobalStack().get('progress_bar')
288
        if pb_type == 'none': # Explicit requirement
289
            return NullProgressView()
290
        if (pb_type == 'text' # Explicit requirement
291
            or progress._supports_progress(self.stderr)): # Guess
292
            return TextProgressView(self.stderr)
293
        # No explicit requirement and no successful guess
294
        return NullProgressView()
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
295
4792.8.5 by Martin Pool
Support encoding_type=exact for make_output_stream
296
    def _make_output_stream_explicit(self, encoding, encoding_type):
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
297
        return TextUIOutputStream(self, self.stdout, encoding, encoding_type)
4792.8.2 by Martin Pool
New method ui_factory.make_output_stream
298
3882.8.4 by Martin Pool
All UI factories should support note()
299
    def note(self, msg):
300
        """Write an already-formatted message, clearing the progress bar if necessary."""
301
        self.clear_term()
302
        self.stdout.write(msg + '\n')
303
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
304
    def prompt(self, prompt, **kwargs):
305
        """Emit prompt on the CLI.
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
306
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
307
        :param kwargs: Dictionary of arguments to insert into the prompt,
308
            to allow UIs to reformat the prompt.
309
        """
6695.1.1 by Martin
Make ui package pass tests on Python 3
310
        if not isinstance(prompt, text_type):
5863.6.1 by Jelmer Vernooij
Require a unicode prompt to be passed into all methods that prompt.
311
            raise ValueError("prompt %r not a unicode string" % prompt)
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
312
        if kwargs:
313
            # See <https://launchpad.net/bugs/365891>
314
            prompt = prompt % kwargs
315
        self.clear_term()
6182.2.10 by Benoît Pierre
Flush stdout before prompting in TextUIFactory.
316
        self.stdout.flush()
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
317
        self.stderr.write(prompt)
318
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
319
    def report_transport_activity(self, transport, byte_count, direction):
320
        """Called by transports as they do IO.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
321
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
322
        This may update a progress bar, spinner, or similar display.
323
        By default it does nothing.
324
        """
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
325
        self._progress_view.show_transport_activity(transport,
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
326
            direction, byte_count)
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
327
4906.1.1 by John Arbash Meinel
Basic implementation of logging bytes transferred when bzr exits.
328
    def log_transport_activity(self, display=False):
329
        """See UIFactory.log_transport_activity()"""
330
        log = getattr(self._progress_view, 'log_transport_activity', None)
331
        if log is not None:
332
            log(display=display)
333
4711.1.7 by Martin Pool
Add UIFactory.show_error, show_warning, show_message
334
    def show_error(self, msg):
335
        self.clear_term()
336
        self.stderr.write("bzr: error: %s\n" % msg)
337
4711.1.8 by Martin Pool
Add show_warning and show_message tests and implementations
338
    def show_message(self, msg):
339
        self.note(msg)
340
341
    def show_warning(self, msg):
342
        self.clear_term()
343
        self.stderr.write("bzr: warning: %s\n" % msg)
344
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
345
    def _progress_updated(self, task):
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
346
        """A task has been updated and wants to be displayed.
347
        """
4070.1.1 by Martin Pool
Be more robust about pb updates when none are active
348
        if not self._task_stack:
349
            warnings.warn("%r updated but no tasks are active" %
350
                (task,))
351
        elif task != self._task_stack[-1]:
4961.2.19 by Martin Pool
Suppress un-helpful warning about progress task ordering
352
            # We used to check it was the top task, but it's hard to always
353
            # get this right and it's not necessarily useful: any actual
354
            # problems will be evident in use
355
            #warnings.warn("%r is not the top progress task %r" %
356
            #     (task, self._task_stack[-1]))
357
            pass
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
358
        self._progress_view.show_progress(task)
359
3948.2.5 by Martin Pool
rename to _progress_all_finished
360
    def _progress_all_finished(self):
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
361
        self._progress_view.clear()
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
362
4634.144.8 by Martin Pool
Generalize to ui_factory.show_user_warning
363
    def show_user_warning(self, warning_id, **message_args):
4634.144.5 by Martin Pool
Cleaner presentation and tests for warn_cross_format_fetch
364
        """Show a text message to the user.
365
366
        Explicitly not for warnings about bzr apis, deprecations or internals.
367
        """
368
        # eventually trace.warning should migrate here, to avoid logging and
369
        # be easier to test; that has a lot of test fallout so for now just
370
        # new code can call this
4634.144.11 by Martin Pool
Rename squelched to suppressed
371
        if warning_id not in self.suppressed_warnings:
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
372
            warning = self.format_user_warning(warning_id, message_args)
373
            self.stderr.write(warning + '\n')
374
375
376
def pad_to_width(line, width, encoding_hint='ascii'):
377
    """Truncate or pad unicode line to width.
378
379
    This is best-effort for now, and strings containing control codes or
380
    non-ascii text may be cut and padded incorrectly.
381
    """
382
    s = line.encode(encoding_hint, 'replace')
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
383
    return (b'%-*.*s' % (width, width, s)).decode(encoding_hint)
4634.144.5 by Martin Pool
Cleaner presentation and tests for warn_cross_format_fetch
384
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
385
386
class TextProgressView(object):
387
    """Display of progress bar and other information on a tty.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
388
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
389
    This shows one line of text, including possibly a network indicator,
390
    spinner, progress bar, message, etc.
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
391
392
    One instance of this is created and held by the UI, and fed updates when a
393
    task wants to be painted.
394
395
    Transports feed data to this through the ui_factory object.
3948.2.2 by Martin Pool
Corrections to finishing progress bars
396
397
    The Progress views can comprise a tree with _parent_task pointers, but
398
    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
399
    """
400
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
401
    def __init__(self, term_file, encoding=None, errors=None):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
402
        self._term_file = term_file
6437.57.3 by Martin Packman
Make TextProgressView somewhat aware of encodings
403
        if encoding is None:
6437.57.7 by Martin Packman
Correct and test fallback to ascii logic when a stream has no encoding
404
            self._encoding = getattr(term_file, "encoding", None) or "ascii"
6437.57.3 by Martin Packman
Make TextProgressView somewhat aware of encodings
405
        else:
406
            self._encoding = encoding
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
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
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
421
        # force the progress bar to be off, as at the moment it doesn't
4880.2.1 by Martin Pool
Text progress view is now only a spinner not a bar.
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
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
427
        w = osutils.terminal_width()
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
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
6437.57.3 by Martin Packman
Make TextProgressView somewhat aware of encodings
433
    def _show_line(self, u):
5050.16.1 by Martin Pool
Clear off progress bars by painting spaces.
434
        width = self._avail_width()
435
        if width is not None:
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
436
            u = pad_to_width(u, width, encoding_hint=self._encoding)
437
        self._term_file.write('\r' + u + '\r')
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
438
439
    def clear(self):
440
        if self._have_output:
441
            self._show_line('')
442
        self._have_output = False
443
444
    def _render_bar(self):
445
        # 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.
446
        if self.enable_bar and (
447
            (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
448
            # If there's no task object, we show space for the bar anyhow.
449
            # That's because most invocations of bzr will end showing progress
450
            # at some point, though perhaps only after doing some initial IO.
451
            # It looks better to draw the progress bar initially rather than
452
            # to have what looks like an incomplete progress bar.
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
453
            spin_str =  r'/-\|'[self._spin_pos % 4]
454
            self._spin_pos += 1
455
            cols = 20
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
456
            if self._last_task is None:
457
                completion_fraction = 0
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
458
                self._fraction = 0
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
459
            else:
460
                completion_fraction = \
461
                    self._last_task._overall_completion_fraction() or 0
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
462
            if (completion_fraction < self._fraction and 'progress' in
463
                debug.debug_flags):
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
464
                debug.set_trace()
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
465
            self._fraction = completion_fraction
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
466
            markers = int(round(float(cols) * completion_fraction)) - 1
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
467
            bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
468
            return bar_str
4912.1.1 by Martin Pool
Transport activity indicator is now shown even if there's no pb
469
        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
470
            # The last task wanted just a spinner, no bar
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
471
            spin_str =  r'/-\|'[self._spin_pos % 4]
472
            self._spin_pos += 1
473
            return spin_str + ' '
474
        else:
475
            return ''
476
477
    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
478
        """Format task-specific parts of progress bar.
479
480
        :returns: (text_part, counter_part) both unicode strings.
481
        """
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
482
        if not task.show_count:
483
            s = ''
4017.1.1 by John Arbash Meinel
Get a pb.tick() to work after calling pb.update()
484
        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
485
            s = ' %d/%d' % (task.current_cnt, task.total_cnt)
486
        elif task.current_cnt is not None:
487
            s = ' %d' % (task.current_cnt)
488
        else:
489
            s = ''
490
        # compose all the parent messages
491
        t = task
492
        m = task.msg
493
        while t._parent_task:
494
            t = t._parent_task
495
            if t.msg:
496
                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
497
        return m, s
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
498
4110.2.16 by Martin Pool
Refactor TextProgressView a bit and add another test
499
    def _render_line(self):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
500
        bar_string = self._render_bar()
501
        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
502
            task_part, counter_part = self._format_task(self._last_task)
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
503
        else:
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
504
            task_part = counter_part = ''
4580.3.5 by Martin Pool
selftest sets ProgressTask.show_transport_activity off
505
        if self._last_task and not self._last_task.show_transport_activity:
506
            trans = ''
507
        else:
508
            trans = self._last_transport_msg
5339.2.3 by Martin Pool
Show the progress spinner between the transport rate and the message.
509
        # the bar separates the transport activity from the message, so even
510
        # if there's no bar or spinner, we must show something if both those
511
        # fields are present
512
        if (task_part or trans) and not bar_string:
513
            bar_string = '| '
5339.2.1 by Martin Pool
Progress bars should truncate text rather than counters so as not to give a misleading result
514
        # preferentially truncate the task message if we don't have enough
515
        # space
5339.2.3 by Martin Pool
Show the progress spinner between the transport rate and the message.
516
        avail_width = self._avail_width()
517
        if avail_width is not None:
518
            # 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
519
            current_len = len(bar_string) + len(trans) + len(task_part) + len(counter_part)
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
520
            # GZ 2017-04-22: Should measure and truncate task_part properly
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.
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
539
540
        :param task: The top task object; its parents are also included
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
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
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
633
def _get_stream_encoding(stream):
634
    encoding = config.GlobalStack().get('output_encoding')
635
    if encoding is None:
636
        encoding = getattr(stream, "encoding", None)
637
    if encoding is None:
638
        encoding = osutils.get_terminal_encoding(trace=True)
639
    return encoding
640
641
642
def _unwrap_stream(stream):
643
    inner = getattr(stream, "buffer", None)
644
    if inner is None:
645
        inner = getattr(stream, "stream", None)
646
    return inner
647
648
649
def _wrap_in_stream(stream, encoding=None, errors='replace'):
650
    if encoding is None:
651
        encoding = _get_stream_encoding(stream)
652
    encoded_stream = codecs.getreader(encoding)(stream, errors=errors)
653
    encoded_stream.encoding = encoding
654
    return encoded_stream
655
656
657
def _wrap_out_stream(stream, encoding=None, errors='replace'):
658
    if encoding is None:
659
        encoding = _get_stream_encoding(stream)
660
    encoded_stream = codecs.getwriter(encoding)(stream, errors=errors)
661
    encoded_stream.encoding = encoding
662
    return encoded_stream
663
664
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
665
class TextUIOutputStream(object):
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
666
    """Decorates stream to interact better with progress and change encoding.
667
668
    Before writing to the wrapped stream, progress is cleared. Callers must
669
    ensure bulk output is terminated with a newline so progress won't overwrite
670
    partial lines.
671
672
    Additionally, the encoding and errors behaviour of the underlying stream
673
    can be changed at this point. If errors is set to 'exact' raw bytes may be
674
    written to the underlying stream.
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
675
    """
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
676
677
    def __init__(self, ui_factory, stream, encoding=None, errors='strict'):
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
678
        self.ui_factory = ui_factory
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
679
        # GZ 2017-05-21: Clean up semantics when callers are made saner.
680
        inner = _unwrap_stream(stream)
681
        self.raw_stream = None
682
        if errors == "exact":
683
            errors = "strict"
684
            self.raw_stream = inner
685
        if inner is None:
686
            self.wrapped_stream = stream
687
            if encoding is None:
688
                encoding = _get_stream_encoding(stream)
689
        else:
690
            self.wrapped_stream = _wrap_out_stream(inner, encoding, errors)
691
            if encoding is None:
692
                encoding = self.wrapped_stream.encoding
693
        self.encoding = encoding
694
        self.errors = errors
695
696
    def _write(self, to_write):
697
        if isinstance(to_write, bytes):
698
            try:
699
                to_write = to_write.decode(self.encoding, self.errors)
700
            except UnicodeDecodeError:
701
                self.raw_stream.write(to_write)
702
                return
703
        self.wrapped_stream.write(to_write)
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
704
4792.8.7 by Martin Pool
Add TextUIOutputStream.flush
705
    def flush(self):
706
        self.ui_factory.clear_term()
707
        self.wrapped_stream.flush()
708
4792.8.1 by Martin Pool
Add TextUIOutputStream coordinated with progress view
709
    def write(self, to_write):
710
        self.ui_factory.clear_term()
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
711
        self._write(to_write)
4792.8.3 by Martin Pool
Add TextUIOutputStream.writelines
712
713
    def writelines(self, lines):
714
        self.ui_factory.clear_term()
6621.22.1 by Martin
Refactor bzrlib.ui to be based on unicode streams
715
        for line in lines:
716
            self._write(line)