~bzr-pqm/bzr/bzr.dev

649 by Martin Pool
- some cleanups for the progressbar method
1
# Copyright (C) 2005 Aaron Bentley <aaron.bentley@utoronto.ca>
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
2
# Copyright (C) 2005, 2006 Canonical <canonical.com>
648 by Martin Pool
- import aaron's progress-indicator code
3
#
4
#    This program is free software; you can redistribute it and/or modify
5
#    it under the terms of the GNU General Public License as published by
6
#    the Free Software Foundation; either version 2 of the License, or
7
#    (at your option) any later version.
8
#
9
#    This program is distributed in the hope that it will be useful,
10
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
11
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
#    GNU General Public License for more details.
13
#
14
#    You should have received a copy of the GNU General Public License
15
#    along with this program; if not, write to the Free Software
16
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
649 by Martin Pool
- some cleanups for the progressbar method
18
889 by Martin Pool
- show progress bar during inventory conversion to weave, and make profiling optional
19
"""Simple text-mode progress indicator.
649 by Martin Pool
- some cleanups for the progressbar method
20
21
To display an indicator, create a ProgressBar object.  Call it,
22
passing Progress objects indicating the current state.  When done,
23
call clear().
24
25
Progress is suppressed when output is not sent to a terminal, so as
26
not to clutter log files.
27
"""
28
652 by Martin Pool
doc
29
# TODO: should be a global option e.g. --silent that disables progress
30
# indicators, preferably without needing to adjust all code that
31
# potentially calls them.
32
962 by Martin Pool
todo
33
# TODO: If not on a tty perhaps just print '......' for the benefit of IDEs, etc
655 by Martin Pool
- better calculation of progress bar position
34
934 by Martin Pool
todo
35
# TODO: Optionally show elapsed time instead/as well as ETA; nicer
36
# when the rate is unpredictable
37
649 by Martin Pool
- some cleanups for the progressbar method
38
648 by Martin Pool
- import aaron's progress-indicator code
39
import sys
660 by Martin Pool
- use plain unix time, not datetime module
40
import time
964 by Martin Pool
- show progress on dumb terminals by printing dots
41
import os
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
42
from collections import deque
648 by Martin Pool
- import aaron's progress-indicator code
43
649 by Martin Pool
- some cleanups for the progressbar method
44
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
45
import bzrlib.errors as errors
1558.7.9 by Aaron Bentley
Bad change. (broke tests). Reverted.
46
from bzrlib.trace import mutter 
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
47
48
649 by Martin Pool
- some cleanups for the progressbar method
49
def _supports_progress(f):
695 by Martin Pool
- don't display progress bars on really dumb terminals
50
    if not hasattr(f, 'isatty'):
51
        return False
52
    if not f.isatty():
53
        return False
54
    if os.environ.get('TERM') == 'dumb':
55
        # e.g. emacs compile window
56
        return False
57
    return True
649 by Martin Pool
- some cleanups for the progressbar method
58
59
60
964 by Martin Pool
- show progress on dumb terminals by printing dots
61
def ProgressBar(to_file=sys.stderr, **kwargs):
62
    """Abstract factory"""
63
    if _supports_progress(to_file):
64
        return TTYProgressBar(to_file=to_file, **kwargs)
65
    else:
66
        return DotsProgressBar(to_file=to_file, **kwargs)
67
    
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
68
 
69
class ProgressBarStack(object):
70
    """A stack of progress bars."""
71
72
    def __init__(self,
73
                 to_file=sys.stderr,
74
                 show_pct=False,
1551.2.33 by Aaron Bentley
Hide ETA, show spinner by default
75
                 show_spinner=True,
76
                 show_eta=False,
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
77
                 show_bar=True,
78
                 show_count=True,
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
79
                 to_messages_file=sys.stdout,
80
                 klass=None):
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
81
        """Setup the stack with the parameters the progress bars should have."""
82
        self._to_file = to_file
83
        self._show_pct = show_pct
84
        self._show_spinner = show_spinner
85
        self._show_eta = show_eta
86
        self._show_bar = show_bar
87
        self._show_count = show_count
88
        self._to_messages_file = to_messages_file
89
        self._stack = []
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
90
        self._klass = klass or TTYProgressBar
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
91
1551.2.29 by Aaron Bentley
Got stack handling under test
92
    def top(self):
93
        if len(self._stack) != 0:
94
            return self._stack[-1]
95
        else:
96
            return None
97
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
98
    def bottom(self):
99
        if len(self._stack) != 0:
100
            return self._stack[0]
101
        else:
102
            return None
103
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
104
    def get_nested(self):
105
        """Return a nested progress bar."""
1551.2.29 by Aaron Bentley
Got stack handling under test
106
        if len(self._stack) == 0:
107
            func = self._klass
108
        else:
109
            func = self.top().child_progress
110
        new_bar = func(to_file=self._to_file,
111
                       show_pct=self._show_pct,
112
                       show_spinner=self._show_spinner,
113
                       show_eta=self._show_eta,
114
                       show_bar=self._show_bar,
115
                       show_count=self._show_count,
116
                       to_messages_file=self._to_messages_file,
117
                       _stack=self)
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
118
        self._stack.append(new_bar)
119
        return new_bar
120
121
    def return_pb(self, bar):
122
        """Return bar after its been used."""
1594.1.4 by Robert Collins
Fix identity test in ProgressBarStack.return_pb
123
        if bar is not self._stack[-1]:
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
124
            raise errors.MissingProgressBarFinish()
125
        self._stack.pop()
126
127
 
964 by Martin Pool
- show progress on dumb terminals by printing dots
128
class _BaseProgressBar(object):
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
129
964 by Martin Pool
- show progress on dumb terminals by printing dots
130
    def __init__(self,
131
                 to_file=sys.stderr,
132
                 show_pct=False,
133
                 show_spinner=False,
134
                 show_eta=True,
135
                 show_bar=True,
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
136
                 show_count=True,
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
137
                 to_messages_file=sys.stdout,
138
                 _stack=None):
964 by Martin Pool
- show progress on dumb terminals by printing dots
139
        object.__init__(self)
140
        self.to_file = to_file
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
141
        self.to_messages_file = to_messages_file
964 by Martin Pool
- show progress on dumb terminals by printing dots
142
        self.last_msg = None
143
        self.last_cnt = None
144
        self.last_total = None
145
        self.show_pct = show_pct
146
        self.show_spinner = show_spinner
147
        self.show_eta = show_eta
148
        self.show_bar = show_bar
149
        self.show_count = show_count
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
150
        self._stack = _stack
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
151
        # seed throttler
152
        self.MIN_PAUSE = 0.1 # seconds
153
        now = time.clock()
154
        # starting now
155
        self.start_time = now
156
        # next update should not throttle
157
        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.
158
159
    def finished(self):
160
        """Return this bar to its progress stack."""
161
        self.clear()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
162
        assert self._stack is not None
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
163
        self._stack.return_pb(self)
1104 by Martin Pool
- Add a simple UIFactory
164
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
165
    def note(self, fmt_string, *args, **kwargs):
166
        """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
167
        self.clear()
1558.7.9 by Aaron Bentley
Bad change. (broke tests). Reverted.
168
        self.to_messages_file.write(fmt_string % args)
169
        self.to_messages_file.write('\n')
1104 by Martin Pool
- Add a simple UIFactory
170
1551.2.29 by Aaron Bentley
Got stack handling under test
171
    def child_progress(self, **kwargs):
172
        return ChildProgress(**kwargs)
173
1104 by Martin Pool
- Add a simple UIFactory
174
175
class DummyProgress(_BaseProgressBar):
176
    """Progress-bar standin that does nothing.
177
178
    This can be used as the default argument for methods that
179
    take an optional progress indicator."""
180
    def tick(self):
181
        pass
182
183
    def update(self, msg=None, current=None, total=None):
184
        pass
185
1551.2.27 by Aaron Bentley
Got propogation under test
186
    def child_update(self, message, current, total):
187
        pass
188
1104 by Martin Pool
- Add a simple UIFactory
189
    def clear(self):
190
        pass
964 by Martin Pool
- show progress on dumb terminals by printing dots
191
        
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
192
    def note(self, fmt_string, *args, **kwargs):
193
        """See _BaseProgressBar.note()."""
1534.5.9 by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch.
194
1551.2.29 by Aaron Bentley
Got stack handling under test
195
    def child_progress(self, **kwargs):
196
        return DummyProgress(**kwargs)
1534.5.9 by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch.
197
964 by Martin Pool
- show progress on dumb terminals by printing dots
198
class DotsProgressBar(_BaseProgressBar):
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
199
964 by Martin Pool
- show progress on dumb terminals by printing dots
200
    def __init__(self, **kwargs):
201
        _BaseProgressBar.__init__(self, **kwargs)
202
        self.last_msg = None
203
        self.need_nl = False
204
        
205
    def tick(self):
206
        self.update()
207
        
208
    def update(self, msg=None, current_cnt=None, total_cnt=None):
209
        if msg and msg != self.last_msg:
210
            if self.need_nl:
211
                self.to_file.write('\n')
212
            
213
            self.to_file.write(msg + ': ')
214
            self.last_msg = msg
215
        self.need_nl = True
216
        self.to_file.write('.')
217
        
218
    def clear(self):
219
        if self.need_nl:
220
            self.to_file.write('\n')
221
        
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
222
    def child_update(self, message, current, total):
223
        self.tick()
964 by Martin Pool
- show progress on dumb terminals by printing dots
224
    
225
class TTYProgressBar(_BaseProgressBar):
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
226
    """Progress bar display object.
227
228
    Several options are available to control the display.  These can
229
    be passed as parameters to the constructor or assigned at any time:
230
231
    show_pct
232
        Show percentage complete.
233
    show_spinner
234
        Show rotating baton.  This ticks over on every update even
235
        if the values don't change.
236
    show_eta
237
        Show predicted time-to-completion.
238
    show_bar
239
        Show bar graph.
240
    show_count
241
        Show numerical counts.
242
243
    The output file should be in line-buffered or unbuffered mode.
244
    """
245
    SPIN_CHARS = r'/-\|'
661 by Martin Pool
- limit rate at which progress bar is updated
246
964 by Martin Pool
- show progress on dumb terminals by printing dots
247
248
    def __init__(self, **kwargs):
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
249
        from bzrlib.osutils import terminal_width
964 by Martin Pool
- show progress on dumb terminals by printing dots
250
        _BaseProgressBar.__init__(self, **kwargs)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
251
        self.spin_pos = 0
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
252
        self.width = terminal_width()
964 by Martin Pool
- show progress on dumb terminals by printing dots
253
        self.start_time = None
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
254
        self.last_updates = deque()
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
255
        self.child_fraction = 0
964 by Martin Pool
- show progress on dumb terminals by printing dots
256
    
257
258
    def throttle(self):
259
        """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.
260
        # time.time consistently takes 40/4000 ms = 0.01 ms.
261
        # but every single update to the pb invokes it.
262
        # so we use time.clock which takes 20/4000 ms = 0.005ms
263
        # on the downside, time.clock() appears to have approximately
264
        # 10ms granularity, so we treat a zero-time change as 'throttled.'
265
        
266
        now = time.clock()
267
        interval = now - self.last_update
268
        # if interval > 0
269
        if interval < self.MIN_PAUSE:
270
            return True
964 by Martin Pool
- show progress on dumb terminals by printing dots
271
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
272
        self.last_updates.append(now - self.last_update)
964 by Martin Pool
- show progress on dumb terminals by printing dots
273
        self.last_update = now
274
        return False
929 by Martin Pool
- progress bar: avoid repeatedly checking screen width
275
        
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
276
277
    def tick(self):
1551.2.27 by Aaron Bentley
Got propogation under test
278
        self.update(self.last_msg, self.last_cnt, self.last_total, 
279
                    self.child_fraction)
280
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
281
    def child_update(self, message, current, total):
1551.2.35 by Aaron Bentley
Fix division-by-zero
282
        if current is not None and total != 0:
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
283
            child_fraction = float(current) / total
284
            if self.last_cnt is None:
285
                pass
286
            elif self.last_cnt + child_fraction <= self.last_total:
287
                self.child_fraction = child_fraction
288
            else:
289
                mutter('not updating child fraction')
290
        if self.last_msg is None:
291
            self.last_msg = ''
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
292
        self.tick()
293
294
1551.2.27 by Aaron Bentley
Got propogation under test
295
    def update(self, msg, current_cnt=None, total_cnt=None, 
296
               child_fraction=0):
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
297
        """Update and redraw progress bar."""
298
1308 by Martin Pool
- make progress bar more tolerant of out-of-range values
299
        if current_cnt < 0:
300
            current_cnt = 0
301
            
302
        if current_cnt > total_cnt:
303
            total_cnt = current_cnt
1570.1.9 by Robert Collins
Do not throttle updates to progress bars that change the message.
304
        
1596.2.17 by Robert Collins
Notes on further progress tuning.
305
        ## # optional corner case optimisation 
306
        ## # currently does not seem to fire so costs more than saved.
307
        ## # trivial optimal case:
308
        ## # NB if callers are doing a clear and restore with
309
        ## # the saved values, this will prevent that:
310
        ## # in that case add a restore method that calls
311
        ## # _do_update or some such
312
        ## if (self.last_msg == msg and
313
        ##     self.last_cnt == current_cnt and
314
        ##     self.last_total == total_cnt and
315
        ##     self.child_fraction == child_fraction):
316
        ##     return
317
1570.1.9 by Robert Collins
Do not throttle updates to progress bars that change the message.
318
        old_msg = self.last_msg
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
319
        # save these for the tick() function
320
        self.last_msg = msg
321
        self.last_cnt = current_cnt
322
        self.last_total = total_cnt
1596.2.17 by Robert Collins
Notes on further progress tuning.
323
        self.child_fraction = child_fraction
324
325
        # each function call takes 20ms/4000 = 0.005 ms, 
326
        # but multiple that by 4000 calls -> starts to cost.
327
        # so anything to make this function call faster
328
        # will improve base 'diff' time by up to 0.1 seconds.
1570.1.9 by Robert Collins
Do not throttle updates to progress bars that change the message.
329
        if old_msg == self.last_msg and self.throttle():
1596.2.17 by Robert Collins
Notes on further progress tuning.
330
            return
331
332
        if self.show_eta and self.start_time and self.last_total:
333
            eta = get_eta(self.start_time, self.last_cnt + self.child_fraction, 
334
                    self.last_total, last_updates = self.last_updates)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
335
            eta_str = " " + str_tdelta(eta)
336
        else:
337
            eta_str = ""
338
339
        if self.show_spinner:
340
            spin_str = self.SPIN_CHARS[self.spin_pos % 4] + ' '            
341
        else:
342
            spin_str = ''
343
344
        # always update this; it's also used for the bar
345
        self.spin_pos += 1
346
1596.2.17 by Robert Collins
Notes on further progress tuning.
347
        if self.show_pct and self.last_total and self.last_cnt:
348
            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
349
            pct_str = ' (%5.1f%%)' % pct
350
        else:
351
            pct_str = ''
352
353
        if not self.show_count:
354
            count_str = ''
1596.2.17 by Robert Collins
Notes on further progress tuning.
355
        elif self.last_cnt is None:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
356
            count_str = ''
1596.2.17 by Robert Collins
Notes on further progress tuning.
357
        elif self.last_total is None:
358
            count_str = ' %i' % (self.last_cnt)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
359
        else:
360
            # make both fields the same size
1596.2.17 by Robert Collins
Notes on further progress tuning.
361
            t = '%i' % (self.last_total)
362
            c = '%*i' % (len(t), self.last_cnt)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
363
            count_str = ' ' + c + '/' + t 
364
365
        if self.show_bar:
366
            # progress bar, if present, soaks up all remaining space
1596.2.17 by Robert Collins
Notes on further progress tuning.
367
            cols = self.width - 1 - len(self.last_msg) - len(spin_str) - len(pct_str) \
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
368
                   - len(eta_str) - len(count_str) - 3
369
1596.2.17 by Robert Collins
Notes on further progress tuning.
370
            if self.last_total:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
371
                # number of markers highlighted in bar
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
372
                markers = int(round(float(cols) * 
1596.2.17 by Robert Collins
Notes on further progress tuning.
373
                              (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
374
                bar_str = '[' + ('=' * markers).ljust(cols) + '] '
669 by Martin Pool
- don't show progress bar unless completion is known
375
            elif False:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
376
                # don't know total, so can't show completion.
377
                # so just show an expanded spinning thingy
378
                m = self.spin_pos % cols
668 by Martin Pool
- fix sweeping bar progress indicator
379
                ms = (' ' * m + '*').ljust(cols)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
380
                
381
                bar_str = '[' + ms + '] '
669 by Martin Pool
- don't show progress bar unless completion is known
382
            else:
383
                bar_str = ''
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
384
        else:
385
            bar_str = ''
386
1596.2.17 by Robert Collins
Notes on further progress tuning.
387
        m = spin_str + bar_str + self.last_msg + count_str + pct_str + eta_str
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
388
929 by Martin Pool
- progress bar: avoid repeatedly checking screen width
389
        assert len(m) < self.width
390
        self.to_file.write('\r' + m.ljust(self.width - 1))
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
391
        #self.to_file.flush()
392
            
964 by Martin Pool
- show progress on dumb terminals by printing dots
393
    def clear(self):        
929 by Martin Pool
- progress bar: avoid repeatedly checking screen width
394
        self.to_file.write('\r%s\r' % (' ' * (self.width - 1)))
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
395
        #self.to_file.flush()        
649 by Martin Pool
- some cleanups for the progressbar method
396
1551.2.27 by Aaron Bentley
Got propogation under test
397
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
398
class ChildProgress(_BaseProgressBar):
1551.2.27 by Aaron Bentley
Got propogation under test
399
    """A progress indicator that pushes its data to the parent"""
1551.2.29 by Aaron Bentley
Got stack handling under test
400
    def __init__(self, _stack, **kwargs):
401
        _BaseProgressBar.__init__(self, _stack=_stack, **kwargs)
402
        self.parent = _stack.top()
1551.2.27 by Aaron Bentley
Got propogation under test
403
        self.current = None
404
        self.total = None
405
        self.child_fraction = 0
406
        self.message = None
407
408
    def update(self, msg, current_cnt=None, total_cnt=None):
409
        self.current = current_cnt
410
        self.total = total_cnt
411
        self.message = msg
412
        self.child_fraction = 0
413
        self.tick()
414
415
    def child_update(self, message, current, total):
1551.2.35 by Aaron Bentley
Fix division-by-zero
416
        if current is None or total == 0:
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
417
            self.child_fraction = 0
418
        else:
419
            self.child_fraction = float(current) / total
1551.2.27 by Aaron Bentley
Got propogation under test
420
        self.tick()
421
422
    def tick(self):
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
423
        if self.current is None:
424
            count = None
425
        else:
426
            count = self.current+self.child_fraction
427
            if count > self.total:
1596.2.35 by Robert Collins
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine.
428
                if __debug__:
429
                    mutter('clamping count of %d to %d' % (count, self.total))
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
430
                count = self.total
1551.2.27 by Aaron Bentley
Got propogation under test
431
        self.parent.child_update(self.message, count, self.total)
432
1551.2.29 by Aaron Bentley
Got stack handling under test
433
    def clear(self):
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
434
        pass
1551.2.29 by Aaron Bentley
Got stack handling under test
435
1558.8.6 by Aaron Bentley
Fix note implementation
436
    def note(self, *args, **kwargs):
1558.8.5 by Aaron Bentley
Pass note up the stack instead of using bzrlib.ui_factory
437
        self.parent.note(*args, **kwargs)
438
1551.2.27 by Aaron Bentley
Got propogation under test
439
 
648 by Martin Pool
- import aaron's progress-indicator code
440
def str_tdelta(delt):
441
    if delt is None:
442
        return "-:--:--"
660 by Martin Pool
- use plain unix time, not datetime module
443
    delt = int(round(delt))
444
    return '%d:%02d:%02d' % (delt/3600,
445
                             (delt/60) % 60,
446
                             delt % 60)
447
448
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
449
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
450
    if start_time is None:
451
        return None
452
453
    if not total:
454
        return None
455
456
    if current < enough_samples:
457
        return None
458
459
    if current > total:
460
        return None                     # wtf?
461
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
462
    elapsed = time.clock() - start_time
660 by Martin Pool
- use plain unix time, not datetime module
463
464
    if elapsed < 2.0:                   # not enough time to estimate
465
        return None
466
    
467
    total_duration = float(elapsed) * float(total) / float(current)
468
469
    assert total_duration >= elapsed
470
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
471
    if last_updates and len(last_updates) >= n_recent:
472
        while len(last_updates) > n_recent:
473
            last_updates.popleft()
474
        avg = sum(last_updates) / float(len(last_updates))
475
        time_left = avg * (total - current)
476
477
        old_time_left = total_duration - elapsed
478
479
        # We could return the average, or some other value here
480
        return (time_left + old_time_left) / 2
481
660 by Martin Pool
- use plain unix time, not datetime module
482
    return total_duration - elapsed
648 by Martin Pool
- import aaron's progress-indicator code
483
649 by Martin Pool
- some cleanups for the progressbar method
484
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
485
class ProgressPhase(object):
486
    """Update progress object with the current phase"""
487
    def __init__(self, message, total, pb):
488
        object.__init__(self)
489
        self.pb = pb
490
        self.message = message
491
        self.total = total
492
        self.cur_phase = None
493
494
    def next_phase(self):
495
        if self.cur_phase is None:
496
            self.cur_phase = 0
497
        else:
498
            self.cur_phase += 1
499
        assert self.cur_phase < self.total 
500
        self.pb.update(self.message, self.cur_phase, self.total)
501
502
648 by Martin Pool
- import aaron's progress-indicator code
503
def run_tests():
504
    import doctest
505
    result = doctest.testmod()
506
    if result[1] > 0:
507
        if result[0] == 0:
508
            print "All tests passed"
509
    else:
510
        print "No tests to run"
649 by Martin Pool
- some cleanups for the progressbar method
511
512
513
def demo():
964 by Martin Pool
- show progress on dumb terminals by printing dots
514
    sleep = time.sleep
515
    
516
    print 'dumb-terminal test:'
517
    pb = DotsProgressBar()
518
    for i in range(100):
519
        pb.update('Leoparden', i, 99)
520
        sleep(0.1)
521
    sleep(1.5)
522
    pb.clear()
523
    sleep(1.5)
524
    
525
    print 'smart-terminal test:'
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
526
    pb = ProgressBar(show_pct=True, show_bar=True, show_spinner=False)
649 by Martin Pool
- some cleanups for the progressbar method
527
    for i in range(100):
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
528
        pb.update('Elephanten', i, 99)
529
        sleep(0.1)
530
    sleep(2)
531
    pb.clear()
532
    sleep(1)
964 by Martin Pool
- show progress on dumb terminals by printing dots
533
649 by Martin Pool
- some cleanups for the progressbar method
534
    print 'done!'
535
648 by Martin Pool
- import aaron's progress-indicator code
536
if __name__ == "__main__":
649 by Martin Pool
- some cleanups for the progressbar method
537
    demo()