/brz/remove-bazaar

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