~bzr-pqm/bzr/bzr.dev

3948.2.2 by Martin Pool
Corrections to finishing progress bars
1
# Copyright (C) 2005, 2008, 2009 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
4566.1.1 by John Arbash Meinel
Fix a fairly critical bug where TextUIFactory.get_non_echoed_password was failing.
21
import getpass
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
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
24
import time
3948.2.2 by Martin Pool
Corrections to finishing progress bars
25
import warnings
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(), """
29
from bzrlib import (
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
30
    debug,
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
31
    progress,
2294.4.1 by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests.
32
    osutils,
3882.8.8 by Martin Pool
Progress and UI test cleanups
33
    symbol_versioning,
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
34
    )
3882.8.8 by Martin Pool
Progress and UI test cleanups
35
1996.3.27 by John Arbash Meinel
lazy import getpass in bzrlib.ui.text
36
""")
37
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
38
from bzrlib.ui import (
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
39
    UIFactory,
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
40
    NullProgressView,
41
    )
1687.1.4 by Robert Collins
Add bzrlib.ui.ui_factory.get_boolean().
42
43
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
44
class TextUIFactory(UIFactory):
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
45
    """A UI factory for Text user interefaces."""
46
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
47
    def __init__(self,
3882.8.11 by Martin Pool
Choose the UIFactory class depending on the terminal capabilities
48
                 stdin=None,
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
49
                 stdout=None,
50
                 stderr=None):
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
51
        """Create a TextUIFactory.
52
4463.1.1 by Martin Pool
Update docstrings for recent progress changes
53
        :param bar_type: The type of progress bar to create.  Deprecated
54
            and ignored; a TextProgressView is always used.
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
55
        """
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
56
        super(TextUIFactory, self).__init__()
4449.3.28 by Martin Pool
todo
57
        # TODO: there's no good reason not to pass all three streams, maybe we
58
        # should deprecate the default values...
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
59
        self.stdin = stdin
60
        self.stdout = stdout
61
        self.stderr = stderr
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
62
        # paints progress, network activity, etc
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
63
        self._progress_view = self.make_progress_view()
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
64
        
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
65
    def clear_term(self):
66
        """Prepare the terminal for output.
67
68
        This will, clear any progress bars, and leave the cursor at the
69
        leftmost position."""
3882.7.6 by Martin Pool
Preliminary support for drawing network io into the progress bar
70
        # XXX: If this is preparing to write to stdout, but that's for example
71
        # directed into a file rather than to the terminal, and the progress
72
        # bar _is_ going to the terminal, we shouldn't need
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
73
        # 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
74
        self._progress_view.clear()
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
75
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
76
    def get_boolean(self, prompt):
77
        while True:
78
            self.prompt(prompt + "? [y/n]: ")
4449.3.37 by Martin Pool
TextUIFactory should cope with EOF when in get_boolean
79
            line = self.stdin.readline().lower()
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
80
            if line in ('y\n', 'yes\n'):
81
                return True
4449.3.37 by Martin Pool
TextUIFactory should cope with EOF when in get_boolean
82
            elif line in ('n\n', 'no\n'):
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
83
                return False
4449.3.37 by Martin Pool
TextUIFactory should cope with EOF when in get_boolean
84
            elif line in ('', None):
85
                # end-of-file; possibly should raise an error here instead
86
                return None
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
87
88
    def get_non_echoed_password(self):
89
        isatty = getattr(self.stdin, 'isatty', None)
90
        if isatty is not None and isatty():
91
            # getpass() ensure the password is not echoed and other
92
            # cross-platform niceties
93
            password = getpass.getpass('')
94
        else:
95
            # echo doesn't make sense without a terminal
96
            password = self.stdin.readline()
97
            if not password:
98
                password = None
99
            elif password[-1] == '\n':
100
                password = password[:-1]
101
        return password
102
103
    def get_password(self, prompt='', **kwargs):
104
        """Prompt the user for a password.
105
106
        :param prompt: The prompt to present the user
107
        :param kwargs: Arguments which will be expanded into the prompt.
108
                       This lets front ends display different things if
109
                       they so choose.
110
        :return: The password string, return None if the user
111
                 canceled the request.
112
        """
113
        prompt += ': '
114
        self.prompt(prompt, **kwargs)
115
        # There's currently no way to say 'i decline to enter a password'
116
        # as opposed to 'my password is empty' -- does it matter?
117
        return self.get_non_echoed_password()
118
119
    def get_username(self, prompt, **kwargs):
120
        """Prompt the user for a username.
121
122
        :param prompt: The prompt to present the user
123
        :param kwargs: Arguments which will be expanded into the prompt.
124
                       This lets front ends display different things if
125
                       they so choose.
126
        :return: The username string, return None if the user
127
                 canceled the request.
128
        """
129
        prompt += ': '
130
        self.prompt(prompt, **kwargs)
131
        username = self.stdin.readline()
132
        if not username:
133
            username = None
134
        elif username[-1] == '\n':
135
            username = username[:-1]
136
        return username
137
4449.3.15 by Martin Pool
Move NullProgressView and make_progress_view up to UIFactory base class
138
    def make_progress_view(self):
139
        """Construct and return a new ProgressView subclass for this UI.
140
        """
141
        # if the user specifically requests either text or no progress bars,
142
        # always do that.  otherwise, guess based on $TERM and tty presence.
143
        if os.environ.get('BZR_PROGRESS_BAR') == 'text':
144
            return TextProgressView(self.stderr)
145
        elif os.environ.get('BZR_PROGRESS_BAR') == 'none':
146
            return NullProgressView()
147
        elif progress._supports_progress(self.stderr):
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
148
            return TextProgressView(self.stderr)
149
        else:
150
            return NullProgressView()
151
3882.8.4 by Martin Pool
All UI factories should support note()
152
    def note(self, msg):
153
        """Write an already-formatted message, clearing the progress bar if necessary."""
154
        self.clear_term()
155
        self.stdout.write(msg + '\n')
156
4449.3.18 by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name
157
    def prompt(self, prompt, **kwargs):
158
        """Emit prompt on the CLI.
159
        
160
        :param kwargs: Dictionary of arguments to insert into the prompt,
161
            to allow UIs to reformat the prompt.
162
        """
163
        if kwargs:
164
            # See <https://launchpad.net/bugs/365891>
165
            prompt = prompt % kwargs
166
        prompt = prompt.encode(osutils.get_terminal_encoding(), 'replace')
167
        self.clear_term()
168
        self.stderr.write(prompt)
169
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
170
    def report_transport_activity(self, transport, byte_count, direction):
171
        """Called by transports as they do IO.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
172
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
173
        This may update a progress bar, spinner, or similar display.
174
        By default it does nothing.
175
        """
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
176
        self._progress_view.show_transport_activity(transport,
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
177
            direction, byte_count)
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
178
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
179
    def _progress_updated(self, task):
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
180
        """A task has been updated and wants to be displayed.
181
        """
4070.1.1 by Martin Pool
Be more robust about pb updates when none are active
182
        if not self._task_stack:
183
            warnings.warn("%r updated but no tasks are active" %
184
                (task,))
185
        elif task != self._task_stack[-1]:
3948.2.2 by Martin Pool
Corrections to finishing progress bars
186
            warnings.warn("%r is not the top progress task %r" %
187
                (task, self._task_stack[-1]))
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
188
        self._progress_view.show_progress(task)
189
3948.2.5 by Martin Pool
rename to _progress_all_finished
190
    def _progress_all_finished(self):
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
191
        self._progress_view.clear()
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
192
193
194
class TextProgressView(object):
195
    """Display of progress bar and other information on a tty.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
196
197
    This shows one line of text, including possibly a network indicator, spinner,
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
198
    progress bar, message, etc.
199
200
    One instance of this is created and held by the UI, and fed updates when a
201
    task wants to be painted.
202
203
    Transports feed data to this through the ui_factory object.
3948.2.2 by Martin Pool
Corrections to finishing progress bars
204
205
    The Progress views can comprise a tree with _parent_task pointers, but
206
    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
207
    """
208
209
    def __init__(self, term_file):
210
        self._term_file = term_file
211
        # true when there's output on the screen we may need to clear
212
        self._have_output = False
213
        # XXX: We could listen for SIGWINCH and update the terminal width...
4470.3.1 by Martin Pool
Progress bars no longer show transport scheme or direction
214
        # https://launchpad.net/bugs/316357
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
215
        self._width = osutils.terminal_width()
216
        self._last_transport_msg = ''
217
        self._spin_pos = 0
218
        # time we last repainted the screen
219
        self._last_repaint = 0
220
        # time we last got information about transport activity
221
        self._transport_update_time = 0
222
        self._last_task = None
223
        self._total_byte_count = 0
224
        self._bytes_since_update = 0
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
225
        self._fraction = 0
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
226
227
    def _show_line(self, s):
4580.3.1 by Martin Pool
ProgressTasks can specify an update latency
228
        # sys.stderr.write("progress %r\n" % s)
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
229
        n = self._width - 1
230
        self._term_file.write('\r%-*.*s\r' % (n, n, s))
231
232
    def clear(self):
233
        if self._have_output:
234
            self._show_line('')
235
        self._have_output = False
236
237
    def _render_bar(self):
238
        # return a string for the progress bar itself
4103.3.3 by Martin Pool
Show the progress bar part when showing activity by default
239
        if (self._last_task is None) or self._last_task.show_bar:
240
            # If there's no task object, we show space for the bar anyhow.
241
            # That's because most invocations of bzr will end showing progress
242
            # at some point, though perhaps only after doing some initial IO.
243
            # It looks better to draw the progress bar initially rather than
244
            # to have what looks like an incomplete progress bar.
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
245
            spin_str =  r'/-\|'[self._spin_pos % 4]
246
            self._spin_pos += 1
247
            cols = 20
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
248
            if self._last_task is None:
249
                completion_fraction = 0
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
250
                self._fraction = 0
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
251
            else:
252
                completion_fraction = \
253
                    self._last_task._overall_completion_fraction() or 0
4332.3.18 by Robert Collins
Add -Dprogress to assist in debugging progress bar jumping.
254
            if (completion_fraction < self._fraction and 'progress' in
255
                debug.debug_flags):
256
                import pdb;pdb.set_trace()
257
            self._fraction = completion_fraction
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
258
            markers = int(round(float(cols) * completion_fraction)) - 1
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
259
            bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
260
            return bar_str
4103.3.3 by Martin Pool
Show the progress bar part when showing activity by default
261
        elif self._last_task.show_spinner:
262
            # The last task wanted just a spinner, no bar
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
263
            spin_str =  r'/-\|'[self._spin_pos % 4]
264
            self._spin_pos += 1
265
            return spin_str + ' '
266
        else:
267
            return ''
268
269
    def _format_task(self, task):
270
        if not task.show_count:
271
            s = ''
4017.1.1 by John Arbash Meinel
Get a pb.tick() to work after calling pb.update()
272
        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
273
            s = ' %d/%d' % (task.current_cnt, task.total_cnt)
274
        elif task.current_cnt is not None:
275
            s = ' %d' % (task.current_cnt)
276
        else:
277
            s = ''
278
        # compose all the parent messages
279
        t = task
280
        m = task.msg
281
        while t._parent_task:
282
            t = t._parent_task
283
            if t.msg:
284
                m = t.msg + ':' + m
285
        return m + s
286
4110.2.16 by Martin Pool
Refactor TextProgressView a bit and add another test
287
    def _render_line(self):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
288
        bar_string = self._render_bar()
289
        if self._last_task:
290
            task_msg = self._format_task(self._last_task)
291
        else:
292
            task_msg = ''
4580.3.5 by Martin Pool
selftest sets ProgressTask.show_transport_activity off
293
        if self._last_task and not self._last_task.show_transport_activity:
294
            trans = ''
295
        else:
296
            trans = self._last_transport_msg
297
            if trans:
298
                trans += ' | '
4110.2.16 by Martin Pool
Refactor TextProgressView a bit and add another test
299
        return (bar_string + trans + task_msg)
300
301
    def _repaint(self):
302
        s = self._render_line()
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
303
        self._show_line(s)
304
        self._have_output = True
305
306
    def show_progress(self, task):
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
307
        """Called by the task object when it has changed.
308
        
309
        :param task: The top task object; its parents are also included 
310
            by following links.
311
        """
4110.2.18 by Martin Pool
Progress bars always repaint when task structure is changed
312
        must_update = task is not self._last_task
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
313
        self._last_task = task
314
        now = time.time()
4580.3.1 by Martin Pool
ProgressTasks can specify an update latency
315
        if (not must_update) and (now < self._last_repaint + task.update_latency):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
316
            return
4110.2.15 by Martin Pool
Fix bug in showing task progress and add a test
317
        if now > self._transport_update_time + 10:
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
318
            # no recent activity; expire it
319
            self._last_transport_msg = ''
320
        self._last_repaint = now
321
        self._repaint()
322
4449.2.1 by Martin Pool
TextUIFactory now respects BZR_PROGRESS_BAR again
323
    def show_transport_activity(self, transport, direction, byte_count):
4110.2.19 by Martin Pool
Transport activity now shows scheme and direction
324
        """Called by transports via the ui_factory, as they do IO.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
325
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
326
        This may update a progress bar, spinner, or similar display.
327
        By default it does nothing.
328
        """
329
        # XXX: Probably there should be a transport activity model, and that
330
        # too should be seen by the progress view, rather than being poked in
331
        # here.
4480.1.1 by Martin Pool
(mbp) only show transport activity when progress is already visible
332
        if not self._have_output:
333
            # As a workaround for <https://launchpad.net/bugs/321935> we only
334
            # show transport activity when there's already a progress bar
335
            # shown, which time the application code is expected to know to
336
            # clear off the progress bar when it's going to send some other
337
            # output.  Eventually it would be nice to have that automatically
338
            # synchronized.
339
            return
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
340
        self._total_byte_count += byte_count
341
        self._bytes_since_update += byte_count
342
        now = time.time()
4580.3.4 by Martin Pool
Don't show transport activity until 2kB has gone past
343
        if self._total_byte_count < 2000:
344
            # a little resistance at first, so it doesn't stay stuck at 0
345
            # while connecting...
346
            return
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
347
        if self._transport_update_time is None:
348
            self._transport_update_time = now
4043.1.1 by John Arbash Meinel
Increase the debounce time for 'transport activity' to 0.5s
349
        elif now >= (self._transport_update_time + 0.5):
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
350
            # guard against clock stepping backwards, and don't update too
351
            # often
352
            rate = self._bytes_since_update / (now - self._transport_update_time)
4470.3.1 by Martin Pool
Progress bars no longer show transport scheme or direction
353
            msg = ("%6dKB %5dKB/s" %
354
                    (self._total_byte_count>>10, int(rate)>>10,))
3882.8.9 by Martin Pool
Move TextProgressView to ui.text
355
            self._transport_update_time = now
356
            self._last_repaint = now
357
            self._bytes_since_update = 0
358
            self._last_transport_msg = msg
359
            self._repaint()