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