~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
182
        now = time.clock()
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.
300
        # but every single update to the pb invokes it.
301
        # so we use time.clock which takes 20/4000 ms = 0.005ms
302
        # on the downside, time.clock() appears to have approximately
303
        # 10ms granularity, so we treat a zero-time change as 'throttled.'
304
        now = time.clock()
1793.1.1 by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second
305
        if self.start_time is not None and (now - self.start_time) < 1:
306
            return True
307
        if old_msg != self.last_msg:
308
            return False
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
309
        interval = now - self.last_update
310
        # if interval > 0
311
        if interval < self.MIN_PAUSE:
312
            return True
964 by Martin Pool
- show progress on dumb terminals by printing dots
313
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
314
        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.
315
        # Don't let the queue grow without bound
316
        self.last_updates = self.last_updates[-self._max_last_updates:]
964 by Martin Pool
- show progress on dumb terminals by printing dots
317
        self.last_update = now
318
        return False
929 by Martin Pool
- progress bar: avoid repeatedly checking screen width
319
        
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
320
    def tick(self):
1551.2.27 by Aaron Bentley
Got propogation under test
321
        self.update(self.last_msg, self.last_cnt, self.last_total, 
322
                    self.child_fraction)
323
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
324
    def child_update(self, message, current, total):
1551.2.35 by Aaron Bentley
Fix division-by-zero
325
        if current is not None and total != 0:
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
326
            child_fraction = float(current) / total
327
            if self.last_cnt is None:
328
                pass
329
            elif self.last_cnt + child_fraction <= self.last_total:
330
                self.child_fraction = child_fraction
331
            else:
332
                mutter('not updating child fraction')
333
        if self.last_msg is None:
334
            self.last_msg = ''
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
335
        self.tick()
336
1551.2.27 by Aaron Bentley
Got propogation under test
337
    def update(self, msg, current_cnt=None, total_cnt=None, 
338
               child_fraction=0):
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
339
        """Update and redraw progress bar."""
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
340
        if msg is None:
341
            msg = self.last_msg
342
343
        if total_cnt is None:
344
            total_cnt = self.last_total
345
1308 by Martin Pool
- make progress bar more tolerant of out-of-range values
346
        if current_cnt < 0:
347
            current_cnt = 0
348
            
349
        if current_cnt > total_cnt:
350
            total_cnt = current_cnt
1570.1.9 by Robert Collins
Do not throttle updates to progress bars that change the message.
351
        
1596.2.17 by Robert Collins
Notes on further progress tuning.
352
        ## # optional corner case optimisation 
353
        ## # currently does not seem to fire so costs more than saved.
354
        ## # trivial optimal case:
355
        ## # NB if callers are doing a clear and restore with
356
        ## # the saved values, this will prevent that:
357
        ## # in that case add a restore method that calls
358
        ## # _do_update or some such
359
        ## if (self.last_msg == msg and
360
        ##     self.last_cnt == current_cnt and
361
        ##     self.last_total == total_cnt and
362
        ##     self.child_fraction == child_fraction):
363
        ##     return
364
1570.1.9 by Robert Collins
Do not throttle updates to progress bars that change the message.
365
        old_msg = self.last_msg
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
366
        # save these for the tick() function
367
        self.last_msg = msg
368
        self.last_cnt = current_cnt
369
        self.last_total = total_cnt
1596.2.17 by Robert Collins
Notes on further progress tuning.
370
        self.child_fraction = child_fraction
371
372
        # each function call takes 20ms/4000 = 0.005 ms, 
373
        # but multiple that by 4000 calls -> starts to cost.
374
        # so anything to make this function call faster
375
        # 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
376
        if self.throttle(old_msg):
1596.2.17 by Robert Collins
Notes on further progress tuning.
377
            return
378
379
        if self.show_eta and self.start_time and self.last_total:
380
            eta = get_eta(self.start_time, self.last_cnt + self.child_fraction, 
381
                    self.last_total, last_updates = self.last_updates)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
382
            eta_str = " " + str_tdelta(eta)
383
        else:
384
            eta_str = ""
385
386
        if self.show_spinner:
387
            spin_str = self.SPIN_CHARS[self.spin_pos % 4] + ' '            
388
        else:
389
            spin_str = ''
390
391
        # always update this; it's also used for the bar
392
        self.spin_pos += 1
393
1596.2.17 by Robert Collins
Notes on further progress tuning.
394
        if self.show_pct and self.last_total and self.last_cnt:
395
            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
396
            pct_str = ' (%5.1f%%)' % pct
397
        else:
398
            pct_str = ''
399
400
        if not self.show_count:
401
            count_str = ''
1596.2.17 by Robert Collins
Notes on further progress tuning.
402
        elif self.last_cnt is None:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
403
            count_str = ''
1596.2.17 by Robert Collins
Notes on further progress tuning.
404
        elif self.last_total is None:
405
            count_str = ' %i' % (self.last_cnt)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
406
        else:
407
            # make both fields the same size
1596.2.17 by Robert Collins
Notes on further progress tuning.
408
            t = '%i' % (self.last_total)
409
            c = '%*i' % (len(t), self.last_cnt)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
410
            count_str = ' ' + c + '/' + t 
411
412
        if self.show_bar:
413
            # progress bar, if present, soaks up all remaining space
1596.2.17 by Robert Collins
Notes on further progress tuning.
414
            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
415
                   - len(eta_str) - len(count_str) - 3
416
1596.2.17 by Robert Collins
Notes on further progress tuning.
417
            if self.last_total:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
418
                # number of markers highlighted in bar
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
419
                markers = int(round(float(cols) * 
1596.2.17 by Robert Collins
Notes on further progress tuning.
420
                              (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
421
                bar_str = '[' + ('=' * markers).ljust(cols) + '] '
669 by Martin Pool
- don't show progress bar unless completion is known
422
            elif False:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
423
                # don't know total, so can't show completion.
424
                # so just show an expanded spinning thingy
425
                m = self.spin_pos % cols
668 by Martin Pool
- fix sweeping bar progress indicator
426
                ms = (' ' * m + '*').ljust(cols)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
427
                
428
                bar_str = '[' + ms + '] '
669 by Martin Pool
- don't show progress bar unless completion is known
429
            else:
430
                bar_str = ''
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
431
        else:
432
            bar_str = ''
433
1596.2.17 by Robert Collins
Notes on further progress tuning.
434
        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
435
929 by Martin Pool
- progress bar: avoid repeatedly checking screen width
436
        assert len(m) < self.width
437
        self.to_file.write('\r' + m.ljust(self.width - 1))
1843.3.1 by John Arbash Meinel
Don't clear anything if nothing has been written.
438
        self._have_output = True
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
439
        #self.to_file.flush()
440
            
964 by Martin Pool
- show progress on dumb terminals by printing dots
441
    def clear(self):        
1843.3.1 by John Arbash Meinel
Don't clear anything if nothing has been written.
442
        if self._have_output:
443
            self.to_file.write('\r%s\r' % (' ' * (self.width - 1)))
444
        self._have_output = False
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
445
        #self.to_file.flush()        
649 by Martin Pool
- some cleanups for the progressbar method
446
1551.2.27 by Aaron Bentley
Got propogation under test
447
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
448
_progress_bar_types['tty'] = TTYProgressBar
449
450
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
451
class ChildProgress(_BaseProgressBar):
1551.2.27 by Aaron Bentley
Got propogation under test
452
    """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
453
1551.2.29 by Aaron Bentley
Got stack handling under test
454
    def __init__(self, _stack, **kwargs):
455
        _BaseProgressBar.__init__(self, _stack=_stack, **kwargs)
456
        self.parent = _stack.top()
1551.2.27 by Aaron Bentley
Got propogation under test
457
        self.current = None
458
        self.total = None
459
        self.child_fraction = 0
460
        self.message = None
461
462
    def update(self, msg, current_cnt=None, total_cnt=None):
463
        self.current = current_cnt
464
        self.total = total_cnt
465
        self.message = msg
466
        self.child_fraction = 0
467
        self.tick()
468
469
    def child_update(self, message, current, total):
1551.2.35 by Aaron Bentley
Fix division-by-zero
470
        if current is None or total == 0:
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
471
            self.child_fraction = 0
472
        else:
473
            self.child_fraction = float(current) / total
1551.2.27 by Aaron Bentley
Got propogation under test
474
        self.tick()
475
476
    def tick(self):
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
477
        if self.current is None:
478
            count = None
479
        else:
480
            count = self.current+self.child_fraction
481
            if count > self.total:
1596.2.35 by Robert Collins
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine.
482
                if __debug__:
483
                    mutter('clamping count of %d to %d' % (count, self.total))
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
484
                count = self.total
1551.2.27 by Aaron Bentley
Got propogation under test
485
        self.parent.child_update(self.message, count, self.total)
486
1551.2.29 by Aaron Bentley
Got stack handling under test
487
    def clear(self):
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
488
        pass
1551.2.29 by Aaron Bentley
Got stack handling under test
489
1558.8.6 by Aaron Bentley
Fix note implementation
490
    def note(self, *args, **kwargs):
1558.8.5 by Aaron Bentley
Pass note up the stack instead of using bzrlib.ui_factory
491
        self.parent.note(*args, **kwargs)
492
1551.2.27 by Aaron Bentley
Got propogation under test
493
 
648 by Martin Pool
- import aaron's progress-indicator code
494
def str_tdelta(delt):
495
    if delt is None:
496
        return "-:--:--"
660 by Martin Pool
- use plain unix time, not datetime module
497
    delt = int(round(delt))
498
    return '%d:%02d:%02d' % (delt/3600,
499
                             (delt/60) % 60,
500
                             delt % 60)
501
502
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
503
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
504
    if start_time is None:
505
        return None
506
507
    if not total:
508
        return None
509
510
    if current < enough_samples:
511
        return None
512
513
    if current > total:
514
        return None                     # wtf?
515
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
516
    elapsed = time.clock() - start_time
660 by Martin Pool
- use plain unix time, not datetime module
517
518
    if elapsed < 2.0:                   # not enough time to estimate
519
        return None
520
    
521
    total_duration = float(elapsed) * float(total) / float(current)
522
523
    assert total_duration >= elapsed
524
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
525
    if last_updates and len(last_updates) >= n_recent:
526
        avg = sum(last_updates) / float(len(last_updates))
527
        time_left = avg * (total - current)
528
529
        old_time_left = total_duration - elapsed
530
531
        # We could return the average, or some other value here
532
        return (time_left + old_time_left) / 2
533
660 by Martin Pool
- use plain unix time, not datetime module
534
    return total_duration - elapsed
648 by Martin Pool
- import aaron's progress-indicator code
535
649 by Martin Pool
- some cleanups for the progressbar method
536
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
537
class ProgressPhase(object):
538
    """Update progress object with the current phase"""
539
    def __init__(self, message, total, pb):
540
        object.__init__(self)
541
        self.pb = pb
542
        self.message = message
543
        self.total = total
544
        self.cur_phase = None
545
546
    def next_phase(self):
547
        if self.cur_phase is None:
548
            self.cur_phase = 0
549
        else:
550
            self.cur_phase += 1
551
        assert self.cur_phase < self.total 
552
        self.pb.update(self.message, self.cur_phase, self.total)
553
554
648 by Martin Pool
- import aaron's progress-indicator code
555
def run_tests():
556
    import doctest
557
    result = doctest.testmod()
558
    if result[1] > 0:
559
        if result[0] == 0:
560
            print "All tests passed"
561
    else:
562
        print "No tests to run"
649 by Martin Pool
- some cleanups for the progressbar method
563
564
565
def demo():
964 by Martin Pool
- show progress on dumb terminals by printing dots
566
    sleep = time.sleep
567
    
568
    print 'dumb-terminal test:'
569
    pb = DotsProgressBar()
570
    for i in range(100):
571
        pb.update('Leoparden', i, 99)
572
        sleep(0.1)
573
    sleep(1.5)
574
    pb.clear()
575
    sleep(1.5)
576
    
577
    print 'smart-terminal test:'
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
578
    pb = ProgressBar(show_pct=True, show_bar=True, show_spinner=False)
649 by Martin Pool
- some cleanups for the progressbar method
579
    for i in range(100):
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
580
        pb.update('Elephanten', i, 99)
581
        sleep(0.1)
582
    sleep(2)
583
    pb.clear()
584
    sleep(1)
964 by Martin Pool
- show progress on dumb terminals by printing dots
585
649 by Martin Pool
- some cleanups for the progressbar method
586
    print 'done!'
587
648 by Martin Pool
- import aaron's progress-indicator code
588
if __name__ == "__main__":
649 by Martin Pool
- some cleanups for the progressbar method
589
    demo()