/brz/remove-bazaar

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