~bzr-pqm/bzr/bzr.dev

3948.2.1 by Martin Pool
Add ProgressTask repr
1
# Copyright (C) 2005, 2006, 2008, 2009 Canonical Ltd
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
2
#
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.
7
#
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.
12
#
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
648 by Martin Pool
- import aaron's progress-indicator code
16
649 by Martin Pool
- some cleanups for the progressbar method
17
3006.3.3 by Robert Collins
Docstring improvement and remove TODO's from progres.py.
18
"""Progress indicators.
19
20
The usual way to use this is via bzrlib.ui.ui_factory.nested_progress_bar which
3948.2.4 by Martin Pool
Remove some obsolete progress docstring
21
will manage a conceptual stack of nested activities.
649 by Martin Pool
- some cleanups for the progressbar method
22
"""
23
934 by Martin Pool
todo
24
648 by Martin Pool
- import aaron's progress-indicator code
25
import sys
660 by Martin Pool
- use plain unix time, not datetime module
26
import time
964 by Martin Pool
- show progress on dumb terminals by printing dots
27
import os
3882.8.12 by Martin Pool
Give a warning, not an error, if a progress bar is not finished in order
28
import warnings
649 by Martin Pool
- some cleanups for the progressbar method
29
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
30
1996.3.32 by John Arbash Meinel
from bzrlib.ui lazy import progress, and make progress import lazily
31
from bzrlib import (
32
    errors,
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
33
    osutils,
34
    trace,
35
    ui,
1996.3.32 by John Arbash Meinel
from bzrlib.ui lazy import progress, and make progress import lazily
36
    )
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
37
from bzrlib.trace import mutter
3948.2.6 by Martin Pool
ProgressBarStack is deprecated
38
from bzrlib.symbol_versioning import (
39
    deprecated_in,
40
    deprecated_method,
41
    )
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
42
43
649 by Martin Pool
- some cleanups for the progressbar method
44
def _supports_progress(f):
2599.1.1 by Martin Pool
Don't show dots progress indicatiors in noninteractive mode
45
    """Detect if we can use pretty progress bars on the output stream f.
46
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
47
    If this returns true we expect that a human may be looking at that
2599.1.1 by Martin Pool
Don't show dots progress indicatiors in noninteractive mode
48
    output, and that we can repaint a line to update it.
49
    """
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
50
    isatty = getattr(f, 'isatty', None)
51
    if isatty is None:
695 by Martin Pool
- don't display progress bars on really dumb terminals
52
        return False
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
53
    if not isatty():
695 by Martin Pool
- don't display progress bars on really dumb terminals
54
        return False
55
    if os.environ.get('TERM') == 'dumb':
56
        # e.g. emacs compile window
57
        return False
58
    return True
649 by Martin Pool
- some cleanups for the progressbar method
59
60
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
61
class ProgressTask(object):
62
    """Model component of a progress indicator.
63
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
64
    Most code that needs to indicate progress should update one of these,
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
65
    and it will in turn update the display, if one is present.
3882.8.5 by Martin Pool
Progress tasks can indicate what kind of display is useful
66
67
    Code updating the task may also set fields as hints about how to display
68
    it: show_pct, show_spinner, show_eta, show_count, show_bar.  UIs
69
    will not necessarily respect all these fields.
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
70
    """
71
3882.8.2 by Martin Pool
ProgressTask holds a reference to the ui that displays it
72
    def __init__(self, parent_task=None, ui_factory=None):
4110.2.13 by Martin Pool
doc
73
        """Construct a new progress task.
74
75
        Normally you should not call this directly but rather through
76
        `ui_factory.nested_progress_bar`.
77
        """
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
78
        self._parent_task = parent_task
79
        self._last_update = 0
80
        self.total_cnt = None
81
        self.current_cnt = None
82
        self.msg = ''
3882.8.2 by Martin Pool
ProgressTask holds a reference to the ui that displays it
83
        self.ui_factory = ui_factory
3882.8.5 by Martin Pool
Progress tasks can indicate what kind of display is useful
84
        self.show_pct = False
85
        self.show_spinner = True
86
        self.show_eta = False,
87
        self.show_count = True
88
        self.show_bar = True
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
89
3948.2.1 by Martin Pool
Add ProgressTask repr
90
    def __repr__(self):
91
        return '%s(%r/%r, msg=%r)' % (
92
            self.__class__.__name__,
93
            self.current_cnt,
94
            self.total_cnt,
95
            self.msg)
96
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
97
    def update(self, msg, current_cnt=None, total_cnt=None):
98
        self.msg = msg
99
        self.current_cnt = current_cnt
100
        if total_cnt:
101
            self.total_cnt = total_cnt
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
102
        self.ui_factory._progress_updated(self)
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
103
3882.8.8 by Martin Pool
Progress and UI test cleanups
104
    def tick(self):
105
        self.update(self.msg)
106
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
107
    def finished(self):
3948.2.3 by Martin Pool
Make the interface from ProgressTask to ui more private
108
        self.ui_factory._progress_finished(self)
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
109
110
    def make_sub_task(self):
3882.8.3 by Martin Pool
Move display of transport throughput into TextProgressView
111
        return ProgressTask(self, self.ui_factory)
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
112
113
    def _overall_completion_fraction(self, child_fraction=0.0):
114
        """Return fractional completion of this task and its parents
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
115
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
116
        Returns None if no completion can be computed."""
4017.1.1 by John Arbash Meinel
Get a pb.tick() to work after calling pb.update()
117
        if self.current_cnt is not None and self.total_cnt:
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
118
            own_fraction = (float(self.current_cnt) + child_fraction) / self.total_cnt
119
        else:
4110.2.17 by Martin Pool
If one ProgressTask has no count, it passes through that of its child
120
            # if this task has no estimation, it just passes on directly
121
            # whatever the child has measured...
122
            own_fraction = child_fraction
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
123
        if self._parent_task is None:
124
            return own_fraction
125
        else:
126
            if own_fraction is None:
127
                own_fraction = 0.0
128
            return self._parent_task._overall_completion_fraction(own_fraction)
129
3882.8.4 by Martin Pool
All UI factories should support note()
130
    def note(self, fmt_string, *args):
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
131
        """Record a note without disrupting the progress bar."""
132
        # XXX: shouldn't be here; put it in mutter or the ui instead
3943.2.3 by Martin Pool
Don't do string interpolation if there are no arguments
133
        if args:
134
            self.ui_factory.note(fmt_string % args)
135
        else:
136
            self.ui_factory.note(fmt_string)
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
137
138
    def clear(self):
139
        # XXX: shouldn't be here; put it in mutter or the ui instead
3882.8.2 by Martin Pool
ProgressTask holds a reference to the ui that displays it
140
        self.ui_factory.clear_term()
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
141
649 by Martin Pool
- some cleanups for the progressbar method
142
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
143
def ProgressBar(to_file=None, **kwargs):
964 by Martin Pool
- show progress on dumb terminals by printing dots
144
    """Abstract factory"""
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
145
    if to_file is None:
146
        to_file = sys.stderr
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
147
    requested_bar_type = os.environ.get('BZR_PROGRESS_BAR')
148
    # An value of '' or not set reverts to standard processing
149
    if requested_bar_type in (None, ''):
150
        if _supports_progress(to_file):
151
            return TTYProgressBar(to_file=to_file, **kwargs)
152
        else:
2599.1.1 by Martin Pool
Don't show dots progress indicatiors in noninteractive mode
153
            return DummyProgress(to_file=to_file, **kwargs)
964 by Martin Pool
- show progress on dumb terminals by printing dots
154
    else:
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
155
        # Minor sanitation to prevent spurious errors
156
        requested_bar_type = requested_bar_type.lower().strip()
157
        # TODO: jam 20060710 Arguably we shouldn't raise an exception
158
        #       but should instead just disable progress bars if we
159
        #       don't recognize the type
160
        if requested_bar_type not in _progress_bar_types:
161
            raise errors.InvalidProgressBarType(requested_bar_type,
162
                                                _progress_bar_types.keys())
163
        return _progress_bar_types[requested_bar_type](to_file=to_file, **kwargs)
164
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
165
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
166
class ProgressBarStack(object):
3948.2.6 by Martin Pool
ProgressBarStack is deprecated
167
    """A stack of progress bars.
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
168
3948.2.6 by Martin Pool
ProgressBarStack is deprecated
169
    This class is deprecated: instead, ask the ui factory for a new progress
170
    task and finish it when it's done.
171
    """
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
172
3948.2.6 by Martin Pool
ProgressBarStack is deprecated
173
    @deprecated_method(deprecated_in((1, 12, 0)))
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
174
    def __init__(self,
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
175
                 to_file=None,
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
176
                 show_pct=False,
1551.2.33 by Aaron Bentley
Hide ETA, show spinner by default
177
                 show_spinner=True,
178
                 show_eta=False,
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
179
                 show_bar=True,
180
                 show_count=True,
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
181
                 to_messages_file=None,
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
182
                 klass=None):
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
183
        """Setup the stack with the parameters the progress bars should have."""
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
184
        if to_file is None:
185
            to_file = sys.stderr
186
        if to_messages_file is None:
187
            to_messages_file = sys.stdout
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
188
        self._to_file = to_file
189
        self._show_pct = show_pct
190
        self._show_spinner = show_spinner
191
        self._show_eta = show_eta
192
        self._show_bar = show_bar
193
        self._show_count = show_count
194
        self._to_messages_file = to_messages_file
195
        self._stack = []
1843.3.5 by John Arbash Meinel
Add tests to assert we fall back to DotsProgressBar when appropriate.
196
        self._klass = klass or ProgressBar
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
197
1551.2.29 by Aaron Bentley
Got stack handling under test
198
    def top(self):
199
        if len(self._stack) != 0:
200
            return self._stack[-1]
201
        else:
202
            return None
203
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
204
    def bottom(self):
205
        if len(self._stack) != 0:
206
            return self._stack[0]
207
        else:
208
            return None
209
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
210
    def get_nested(self):
211
        """Return a nested progress bar."""
1551.2.29 by Aaron Bentley
Got stack handling under test
212
        if len(self._stack) == 0:
213
            func = self._klass
214
        else:
215
            func = self.top().child_progress
216
        new_bar = func(to_file=self._to_file,
217
                       show_pct=self._show_pct,
218
                       show_spinner=self._show_spinner,
219
                       show_eta=self._show_eta,
220
                       show_bar=self._show_bar,
221
                       show_count=self._show_count,
222
                       to_messages_file=self._to_messages_file,
223
                       _stack=self)
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
224
        self._stack.append(new_bar)
225
        return new_bar
226
227
    def return_pb(self, bar):
228
        """Return bar after its been used."""
1594.1.4 by Robert Collins
Fix identity test in ProgressBarStack.return_pb
229
        if bar is not self._stack[-1]:
3882.8.12 by Martin Pool
Give a warning, not an error, if a progress bar is not finished in order
230
            warnings.warn("%r is not currently active" % (bar,))
231
        else:
232
            self._stack.pop()
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
233
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
234
964 by Martin Pool
- show progress on dumb terminals by printing dots
235
class _BaseProgressBar(object):
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
236
964 by Martin Pool
- show progress on dumb terminals by printing dots
237
    def __init__(self,
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
238
                 to_file=None,
964 by Martin Pool
- show progress on dumb terminals by printing dots
239
                 show_pct=False,
240
                 show_spinner=False,
1793.1.1 by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second
241
                 show_eta=False,
964 by Martin Pool
- show progress on dumb terminals by printing dots
242
                 show_bar=True,
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
243
                 show_count=True,
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
244
                 to_messages_file=None,
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
245
                 _stack=None):
964 by Martin Pool
- show progress on dumb terminals by printing dots
246
        object.__init__(self)
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
247
        if to_file is None:
248
            to_file = sys.stderr
249
        if to_messages_file is None:
250
            to_messages_file = sys.stdout
964 by Martin Pool
- show progress on dumb terminals by printing dots
251
        self.to_file = to_file
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
252
        self.to_messages_file = to_messages_file
964 by Martin Pool
- show progress on dumb terminals by printing dots
253
        self.last_msg = None
254
        self.last_cnt = None
255
        self.last_total = None
256
        self.show_pct = show_pct
257
        self.show_spinner = show_spinner
258
        self.show_eta = show_eta
259
        self.show_bar = show_bar
260
        self.show_count = show_count
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
261
        self._stack = _stack
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
262
        # seed throttler
263
        self.MIN_PAUSE = 0.1 # seconds
2120.1.1 by John Arbash Meinel
Use time.time() because time.clock() is CPU time, not wall time
264
        now = time.time()
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
265
        # starting now
2745.6.52 by Andrew Bennetts
Revert bad change to bzrlib/progress.py
266
        self.start_time = now
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
267
        # next update should not throttle
268
        self.last_update = now - self.MIN_PAUSE - 1
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
269
270
    def finished(self):
271
        """Return this bar to its progress stack."""
272
        self.clear()
273
        self._stack.return_pb(self)
1104 by Martin Pool
- Add a simple UIFactory
274
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
275
    def note(self, fmt_string, *args, **kwargs):
276
        """Record a note without disrupting the progress bar."""
1558.8.5 by Aaron Bentley
Pass note up the stack instead of using bzrlib.ui_factory
277
        self.clear()
1558.7.9 by Aaron Bentley
Bad change. (broke tests). Reverted.
278
        self.to_messages_file.write(fmt_string % args)
279
        self.to_messages_file.write('\n')
1104 by Martin Pool
- Add a simple UIFactory
280
1551.2.29 by Aaron Bentley
Got stack handling under test
281
    def child_progress(self, **kwargs):
282
        return ChildProgress(**kwargs)
283
1534.11.7 by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs.
284
1104 by Martin Pool
- Add a simple UIFactory
285
class DummyProgress(_BaseProgressBar):
286
    """Progress-bar standin that does nothing.
287
288
    This can be used as the default argument for methods that
289
    take an optional progress indicator."""
3882.8.8 by Martin Pool
Progress and UI test cleanups
290
1104 by Martin Pool
- Add a simple UIFactory
291
    def tick(self):
292
        pass
293
294
    def update(self, msg=None, current=None, total=None):
295
        pass
296
1551.2.27 by Aaron Bentley
Got propogation under test
297
    def child_update(self, message, current, total):
298
        pass
299
1104 by Martin Pool
- Add a simple UIFactory
300
    def clear(self):
301
        pass
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
302
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
303
    def note(self, fmt_string, *args, **kwargs):
304
        """See _BaseProgressBar.note()."""
1534.5.9 by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch.
305
1551.2.29 by Aaron Bentley
Got stack handling under test
306
    def child_progress(self, **kwargs):
307
        return DummyProgress(**kwargs)
1534.5.9 by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch.
308
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
309
964 by Martin Pool
- show progress on dumb terminals by printing dots
310
class DotsProgressBar(_BaseProgressBar):
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
311
964 by Martin Pool
- show progress on dumb terminals by printing dots
312
    def __init__(self, **kwargs):
313
        _BaseProgressBar.__init__(self, **kwargs)
314
        self.last_msg = None
315
        self.need_nl = False
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
316
964 by Martin Pool
- show progress on dumb terminals by printing dots
317
    def tick(self):
318
        self.update()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
319
964 by Martin Pool
- show progress on dumb terminals by printing dots
320
    def update(self, msg=None, current_cnt=None, total_cnt=None):
321
        if msg and msg != self.last_msg:
322
            if self.need_nl:
323
                self.to_file.write('\n')
324
            self.to_file.write(msg + ': ')
325
            self.last_msg = msg
326
        self.need_nl = True
327
        self.to_file.write('.')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
328
964 by Martin Pool
- show progress on dumb terminals by printing dots
329
    def clear(self):
330
        if self.need_nl:
331
            self.to_file.write('\n')
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
332
        self.need_nl = False
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
333
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
334
    def child_update(self, message, current, total):
335
        self.tick()
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
336
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
337
338
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
339
964 by Martin Pool
- show progress on dumb terminals by printing dots
340
class TTYProgressBar(_BaseProgressBar):
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
341
    """Progress bar display object.
342
343
    Several options are available to control the display.  These can
344
    be passed as parameters to the constructor or assigned at any time:
345
346
    show_pct
347
        Show percentage complete.
348
    show_spinner
349
        Show rotating baton.  This ticks over on every update even
350
        if the values don't change.
351
    show_eta
352
        Show predicted time-to-completion.
353
    show_bar
354
        Show bar graph.
355
    show_count
356
        Show numerical counts.
357
358
    The output file should be in line-buffered or unbuffered mode.
359
    """
360
    SPIN_CHARS = r'/-\|'
661 by Martin Pool
- limit rate at which progress bar is updated
361
964 by Martin Pool
- show progress on dumb terminals by printing dots
362
363
    def __init__(self, **kwargs):
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
364
        from bzrlib.osutils import terminal_width
964 by Martin Pool
- show progress on dumb terminals by printing dots
365
        _BaseProgressBar.__init__(self, **kwargs)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
366
        self.spin_pos = 0
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
367
        self.width = terminal_width()
1843.3.3 by John Arbash Meinel
Don't let the last_updates list grow without bound.
368
        self.last_updates = []
1843.3.4 by John Arbash Meinel
Remove get_eta's ability to modify last_updates.
369
        self._max_last_updates = 10
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
370
        self.child_fraction = 0
1843.3.1 by John Arbash Meinel
Don't clear anything if nothing has been written.
371
        self._have_output = False
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
372
1793.1.1 by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second
373
    def throttle(self, old_msg):
964 by Martin Pool
- show progress on dumb terminals by printing dots
374
        """Return True if the bar was updated too recently"""
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
375
        # time.time consistently takes 40/4000 ms = 0.01 ms.
2120.1.1 by John Arbash Meinel
Use time.time() because time.clock() is CPU time, not wall time
376
        # time.clock() is faster, but gives us CPU time, not wall-clock time
377
        now = time.time()
1793.1.1 by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second
378
        if self.start_time is not None and (now - self.start_time) < 1:
379
            return True
380
        if old_msg != self.last_msg:
381
            return False
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
382
        interval = now - self.last_update
383
        # if interval > 0
384
        if interval < self.MIN_PAUSE:
385
            return True
964 by Martin Pool
- show progress on dumb terminals by printing dots
386
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
387
        self.last_updates.append(now - self.last_update)
1843.3.3 by John Arbash Meinel
Don't let the last_updates list grow without bound.
388
        # Don't let the queue grow without bound
389
        self.last_updates = self.last_updates[-self._max_last_updates:]
964 by Martin Pool
- show progress on dumb terminals by printing dots
390
        self.last_update = now
391
        return False
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
392
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
393
    def tick(self):
3006.3.2 by Robert Collins
More formatting corrections.
394
        self.update(self.last_msg, self.last_cnt, self.last_total,
1551.2.27 by Aaron Bentley
Got propogation under test
395
                    self.child_fraction)
396
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
397
    def child_update(self, message, current, total):
1551.2.35 by Aaron Bentley
Fix division-by-zero
398
        if current is not None and total != 0:
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
399
            child_fraction = float(current) / total
400
            if self.last_cnt is None:
401
                pass
402
            elif self.last_cnt + child_fraction <= self.last_total:
403
                self.child_fraction = child_fraction
404
        if self.last_msg is None:
405
            self.last_msg = ''
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
406
        self.tick()
407
3006.3.1 by Robert Collins
Minor PEP8 changes.
408
    def update(self, msg, current_cnt=None, total_cnt=None,
3882.8.1 by Martin Pool
Remove experimental transport display from TTYProgressBar
409
            child_fraction=0):
3882.7.6 by Martin Pool
Preliminary support for drawing network io into the progress bar
410
        """Update and redraw progress bar.
3882.8.1 by Martin Pool
Remove experimental transport display from TTYProgressBar
411
        """
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
412
        if msg is None:
413
            msg = self.last_msg
414
415
        if total_cnt is None:
416
            total_cnt = self.last_total
417
1308 by Martin Pool
- make progress bar more tolerant of out-of-range values
418
        if current_cnt < 0:
419
            current_cnt = 0
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
420
1308 by Martin Pool
- make progress bar more tolerant of out-of-range values
421
        if current_cnt > total_cnt:
422
            total_cnt = current_cnt
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
423
424
        ## # optional corner case optimisation
1596.2.17 by Robert Collins
Notes on further progress tuning.
425
        ## # currently does not seem to fire so costs more than saved.
426
        ## # trivial optimal case:
427
        ## # NB if callers are doing a clear and restore with
428
        ## # the saved values, this will prevent that:
429
        ## # in that case add a restore method that calls
430
        ## # _do_update or some such
431
        ## if (self.last_msg == msg and
432
        ##     self.last_cnt == current_cnt and
433
        ##     self.last_total == total_cnt and
434
        ##     self.child_fraction == child_fraction):
435
        ##     return
436
3882.7.6 by Martin Pool
Preliminary support for drawing network io into the progress bar
437
        if msg is None:
438
            msg = ''
439
1570.1.9 by Robert Collins
Do not throttle updates to progress bars that change the message.
440
        old_msg = self.last_msg
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
441
        # save these for the tick() function
442
        self.last_msg = msg
443
        self.last_cnt = current_cnt
444
        self.last_total = total_cnt
1596.2.17 by Robert Collins
Notes on further progress tuning.
445
        self.child_fraction = child_fraction
446
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
447
        # each function call takes 20ms/4000 = 0.005 ms,
1596.2.17 by Robert Collins
Notes on further progress tuning.
448
        # but multiple that by 4000 calls -> starts to cost.
449
        # so anything to make this function call faster
450
        # will improve base 'diff' time by up to 0.1 seconds.
1793.1.1 by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second
451
        if self.throttle(old_msg):
1596.2.17 by Robert Collins
Notes on further progress tuning.
452
            return
453
454
        if self.show_eta and self.start_time and self.last_total:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
455
            eta = get_eta(self.start_time, self.last_cnt + self.child_fraction,
1596.2.17 by Robert Collins
Notes on further progress tuning.
456
                    self.last_total, last_updates = self.last_updates)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
457
            eta_str = " " + str_tdelta(eta)
458
        else:
459
            eta_str = ""
460
461
        if self.show_spinner:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
462
            spin_str = self.SPIN_CHARS[self.spin_pos % 4] + ' '
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
463
        else:
464
            spin_str = ''
465
466
        # always update this; it's also used for the bar
467
        self.spin_pos += 1
468
1596.2.17 by Robert Collins
Notes on further progress tuning.
469
        if self.show_pct and self.last_total and self.last_cnt:
470
            pct = 100.0 * ((self.last_cnt + self.child_fraction) / self.last_total)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
471
            pct_str = ' (%5.1f%%)' % pct
472
        else:
473
            pct_str = ''
474
475
        if not self.show_count:
476
            count_str = ''
1596.2.17 by Robert Collins
Notes on further progress tuning.
477
        elif self.last_cnt is None:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
478
            count_str = ''
1596.2.17 by Robert Collins
Notes on further progress tuning.
479
        elif self.last_total is None:
480
            count_str = ' %i' % (self.last_cnt)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
481
        else:
482
            # make both fields the same size
1596.2.17 by Robert Collins
Notes on further progress tuning.
483
            t = '%i' % (self.last_total)
484
            c = '%*i' % (len(t), self.last_cnt)
3882.7.6 by Martin Pool
Preliminary support for drawing network io into the progress bar
485
            count_str = ' ' + c + '/' + t
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
486
487
        if self.show_bar:
488
            # progress bar, if present, soaks up all remaining space
1596.2.17 by Robert Collins
Notes on further progress tuning.
489
            cols = self.width - 1 - len(self.last_msg) - len(spin_str) - len(pct_str) \
3882.8.1 by Martin Pool
Remove experimental transport display from TTYProgressBar
490
                   - len(eta_str) - len(count_str) - 3
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
491
1596.2.17 by Robert Collins
Notes on further progress tuning.
492
            if self.last_total:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
493
                # number of markers highlighted in bar
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
494
                markers = int(round(float(cols) *
1596.2.17 by Robert Collins
Notes on further progress tuning.
495
                              (self.last_cnt + self.child_fraction) / self.last_total))
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
496
                bar_str = '[' + ('=' * markers).ljust(cols) + '] '
669 by Martin Pool
- don't show progress bar unless completion is known
497
            elif False:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
498
                # don't know total, so can't show completion.
499
                # so just show an expanded spinning thingy
500
                m = self.spin_pos % cols
668 by Martin Pool
- fix sweeping bar progress indicator
501
                ms = (' ' * m + '*').ljust(cols)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
502
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
503
                bar_str = '[' + ms + '] '
669 by Martin Pool
- don't show progress bar unless completion is known
504
            else:
505
                bar_str = ''
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
506
        else:
507
            bar_str = ''
508
3882.8.1 by Martin Pool
Remove experimental transport display from TTYProgressBar
509
        m = spin_str + bar_str + self.last_msg + count_str \
3882.7.6 by Martin Pool
Preliminary support for drawing network io into the progress bar
510
            + pct_str + eta_str
2095.4.4 by mbp at sourcefrog
Truncate progress bar rather than complaining if it's too long
511
        self.to_file.write('\r%-*.*s' % (self.width - 1, self.width - 1, m))
1843.3.1 by John Arbash Meinel
Don't clear anything if nothing has been written.
512
        self._have_output = True
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
513
        #self.to_file.flush()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
514
3006.3.2 by Robert Collins
More formatting corrections.
515
    def clear(self):
1843.3.1 by John Arbash Meinel
Don't clear anything if nothing has been written.
516
        if self._have_output:
517
            self.to_file.write('\r%s\r' % (' ' * (self.width - 1)))
518
        self._have_output = False
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
519
        #self.to_file.flush()
649 by Martin Pool
- some cleanups for the progressbar method
520
1551.2.27 by Aaron Bentley
Got propogation under test
521
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
522
523
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
524
class ChildProgress(_BaseProgressBar):
1551.2.27 by Aaron Bentley
Got propogation under test
525
    """A progress indicator that pushes its data to the parent"""
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
526
1551.2.29 by Aaron Bentley
Got stack handling under test
527
    def __init__(self, _stack, **kwargs):
528
        _BaseProgressBar.__init__(self, _stack=_stack, **kwargs)
529
        self.parent = _stack.top()
1551.2.27 by Aaron Bentley
Got propogation under test
530
        self.current = None
531
        self.total = None
532
        self.child_fraction = 0
533
        self.message = None
534
535
    def update(self, msg, current_cnt=None, total_cnt=None):
536
        self.current = current_cnt
2592.6.11 by Robert Collins
* A progress bar has been added for knitpack -> knitpack fetching.
537
        if total_cnt is not None:
538
            self.total = total_cnt
1551.2.27 by Aaron Bentley
Got propogation under test
539
        self.message = msg
540
        self.child_fraction = 0
541
        self.tick()
542
543
    def child_update(self, message, current, total):
1551.2.35 by Aaron Bentley
Fix division-by-zero
544
        if current is None or total == 0:
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
545
            self.child_fraction = 0
546
        else:
547
            self.child_fraction = float(current) / total
1551.2.27 by Aaron Bentley
Got propogation under test
548
        self.tick()
549
550
    def tick(self):
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
551
        if self.current is None:
552
            count = None
553
        else:
554
            count = self.current+self.child_fraction
555
            if count > self.total:
1596.2.35 by Robert Collins
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine.
556
                if __debug__:
557
                    mutter('clamping count of %d to %d' % (count, self.total))
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
558
                count = self.total
1551.2.27 by Aaron Bentley
Got propogation under test
559
        self.parent.child_update(self.message, count, self.total)
560
1551.2.29 by Aaron Bentley
Got stack handling under test
561
    def clear(self):
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
562
        pass
1551.2.29 by Aaron Bentley
Got stack handling under test
563
1558.8.6 by Aaron Bentley
Fix note implementation
564
    def note(self, *args, **kwargs):
1558.8.5 by Aaron Bentley
Pass note up the stack instead of using bzrlib.ui_factory
565
        self.parent.note(*args, **kwargs)
566
3146.6.1 by Aaron Bentley
InterDifferingSerializer shows a progress bar
567
568
class InstrumentedProgress(TTYProgressBar):
569
    """TTYProgress variant that tracks outcomes"""
570
571
    def __init__(self, *args, **kwargs):
572
        self.always_throttled = True
573
        self.never_throttle = False
574
        TTYProgressBar.__init__(self, *args, **kwargs)
575
576
    def throttle(self, old_message):
577
        if self.never_throttle:
578
            result =  False
579
        else:
580
            result = TTYProgressBar.throttle(self, old_message)
581
        if result is False:
582
            self.always_throttled = False
583
584
648 by Martin Pool
- import aaron's progress-indicator code
585
def str_tdelta(delt):
586
    if delt is None:
587
        return "-:--:--"
660 by Martin Pool
- use plain unix time, not datetime module
588
    delt = int(round(delt))
589
    return '%d:%02d:%02d' % (delt/3600,
590
                             (delt/60) % 60,
591
                             delt % 60)
592
593
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
594
def get_eta(start_time, current, total, enough_samples=3, last_updates=None, n_recent=10):
660 by Martin Pool
- use plain unix time, not datetime module
595
    if start_time is None:
596
        return None
597
598
    if not total:
599
        return None
600
601
    if current < enough_samples:
602
        return None
603
604
    if current > total:
605
        return None                     # wtf?
606
2120.1.1 by John Arbash Meinel
Use time.time() because time.clock() is CPU time, not wall time
607
    elapsed = time.time() - start_time
660 by Martin Pool
- use plain unix time, not datetime module
608
609
    if elapsed < 2.0:                   # not enough time to estimate
610
        return None
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
611
660 by Martin Pool
- use plain unix time, not datetime module
612
    total_duration = float(elapsed) * float(total) / float(current)
613
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
614
    if last_updates and len(last_updates) >= n_recent:
615
        avg = sum(last_updates) / float(len(last_updates))
616
        time_left = avg * (total - current)
617
618
        old_time_left = total_duration - elapsed
619
620
        # We could return the average, or some other value here
621
        return (time_left + old_time_left) / 2
622
660 by Martin Pool
- use plain unix time, not datetime module
623
    return total_duration - elapsed
648 by Martin Pool
- import aaron's progress-indicator code
624
649 by Martin Pool
- some cleanups for the progressbar method
625
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
626
class ProgressPhase(object):
627
    """Update progress object with the current phase"""
628
    def __init__(self, message, total, pb):
629
        object.__init__(self)
630
        self.pb = pb
631
        self.message = message
632
        self.total = total
633
        self.cur_phase = None
634
635
    def next_phase(self):
636
        if self.cur_phase is None:
637
            self.cur_phase = 0
638
        else:
639
            self.cur_phase += 1
640
        self.pb.update(self.message, self.cur_phase, self.total)
3882.7.7 by Martin Pool
Change progress bars to a more MVC style
641
642
643
_progress_bar_types = {}
644
_progress_bar_types['dummy'] = DummyProgress
645
_progress_bar_types['none'] = DummyProgress
646
_progress_bar_types['tty'] = TTYProgressBar
647
_progress_bar_types['dots'] = DotsProgressBar