/brz/remove-bazaar

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