~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):
2599.1.1 by Martin Pool
Don't show dots progress indicatiors in noninteractive mode
53
    """Detect if we can use pretty progress bars on the output stream f.
54
55
    If this returns true we expect that a human may be looking at that 
56
    output, and that we can repaint a line to update it.
57
    """
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
58
    isatty = getattr(f, 'isatty', None)
59
    if isatty is None:
695 by Martin Pool
- don't display progress bars on really dumb terminals
60
        return False
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
61
    if not isatty():
695 by Martin Pool
- don't display progress bars on really dumb terminals
62
        return False
63
    if os.environ.get('TERM') == 'dumb':
64
        # e.g. emacs compile window
65
        return False
66
    return True
649 by Martin Pool
- some cleanups for the progressbar method
67
68
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
69
_progress_bar_types = {}
70
649 by Martin Pool
- some cleanups for the progressbar method
71
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
72
def ProgressBar(to_file=None, **kwargs):
964 by Martin Pool
- show progress on dumb terminals by printing dots
73
    """Abstract factory"""
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
74
    if to_file is None:
75
        to_file = sys.stderr
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
76
    requested_bar_type = os.environ.get('BZR_PROGRESS_BAR')
77
    # An value of '' or not set reverts to standard processing
78
    if requested_bar_type in (None, ''):
79
        if _supports_progress(to_file):
80
            return TTYProgressBar(to_file=to_file, **kwargs)
81
        else:
2599.1.1 by Martin Pool
Don't show dots progress indicatiors in noninteractive mode
82
            return DummyProgress(to_file=to_file, **kwargs)
964 by Martin Pool
- show progress on dumb terminals by printing dots
83
    else:
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
84
        # Minor sanitation to prevent spurious errors
85
        requested_bar_type = requested_bar_type.lower().strip()
86
        # TODO: jam 20060710 Arguably we shouldn't raise an exception
87
        #       but should instead just disable progress bars if we
88
        #       don't recognize the type
89
        if requested_bar_type not in _progress_bar_types:
90
            raise errors.InvalidProgressBarType(requested_bar_type,
91
                                                _progress_bar_types.keys())
92
        return _progress_bar_types[requested_bar_type](to_file=to_file, **kwargs)
93
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
94
 
95
class ProgressBarStack(object):
96
    """A stack of progress bars."""
97
98
    def __init__(self,
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
99
                 to_file=None,
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
100
                 show_pct=False,
1551.2.33 by Aaron Bentley
Hide ETA, show spinner by default
101
                 show_spinner=True,
102
                 show_eta=False,
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
103
                 show_bar=True,
104
                 show_count=True,
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
105
                 to_messages_file=None,
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
106
                 klass=None):
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
107
        """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
108
        if to_file is None:
109
            to_file = sys.stderr
110
        if to_messages_file is None:
111
            to_messages_file = sys.stdout
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
112
        self._to_file = to_file
113
        self._show_pct = show_pct
114
        self._show_spinner = show_spinner
115
        self._show_eta = show_eta
116
        self._show_bar = show_bar
117
        self._show_count = show_count
118
        self._to_messages_file = to_messages_file
119
        self._stack = []
1843.3.5 by John Arbash Meinel
Add tests to assert we fall back to DotsProgressBar when appropriate.
120
        self._klass = klass or ProgressBar
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
121
1551.2.29 by Aaron Bentley
Got stack handling under test
122
    def top(self):
123
        if len(self._stack) != 0:
124
            return self._stack[-1]
125
        else:
126
            return None
127
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
128
    def bottom(self):
129
        if len(self._stack) != 0:
130
            return self._stack[0]
131
        else:
132
            return None
133
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
134
    def get_nested(self):
135
        """Return a nested progress bar."""
1551.2.29 by Aaron Bentley
Got stack handling under test
136
        if len(self._stack) == 0:
137
            func = self._klass
138
        else:
139
            func = self.top().child_progress
140
        new_bar = func(to_file=self._to_file,
141
                       show_pct=self._show_pct,
142
                       show_spinner=self._show_spinner,
143
                       show_eta=self._show_eta,
144
                       show_bar=self._show_bar,
145
                       show_count=self._show_count,
146
                       to_messages_file=self._to_messages_file,
147
                       _stack=self)
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
148
        self._stack.append(new_bar)
149
        return new_bar
150
151
    def return_pb(self, bar):
152
        """Return bar after its been used."""
1594.1.4 by Robert Collins
Fix identity test in ProgressBarStack.return_pb
153
        if bar is not self._stack[-1]:
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
154
            raise errors.MissingProgressBarFinish()
155
        self._stack.pop()
156
157
 
964 by Martin Pool
- show progress on dumb terminals by printing dots
158
class _BaseProgressBar(object):
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
159
964 by Martin Pool
- show progress on dumb terminals by printing dots
160
    def __init__(self,
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
161
                 to_file=None,
964 by Martin Pool
- show progress on dumb terminals by printing dots
162
                 show_pct=False,
163
                 show_spinner=False,
1793.1.1 by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second
164
                 show_eta=False,
964 by Martin Pool
- show progress on dumb terminals by printing dots
165
                 show_bar=True,
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
166
                 show_count=True,
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
167
                 to_messages_file=None,
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
168
                 _stack=None):
964 by Martin Pool
- show progress on dumb terminals by printing dots
169
        object.__init__(self)
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
170
        if to_file is None:
171
            to_file = sys.stderr
172
        if to_messages_file is None:
173
            to_messages_file = sys.stdout
964 by Martin Pool
- show progress on dumb terminals by printing dots
174
        self.to_file = to_file
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
175
        self.to_messages_file = to_messages_file
964 by Martin Pool
- show progress on dumb terminals by printing dots
176
        self.last_msg = None
177
        self.last_cnt = None
178
        self.last_total = None
179
        self.show_pct = show_pct
180
        self.show_spinner = show_spinner
181
        self.show_eta = show_eta
182
        self.show_bar = show_bar
183
        self.show_count = show_count
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
184
        self._stack = _stack
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
185
        # seed throttler
186
        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
187
        now = time.time()
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
188
        # starting now
189
        self.start_time = now
190
        # next update should not throttle
191
        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.
192
193
    def finished(self):
194
        """Return this bar to its progress stack."""
195
        self.clear()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
196
        assert self._stack is not None
1594.1.1 by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar.
197
        self._stack.return_pb(self)
1104 by Martin Pool
- Add a simple UIFactory
198
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
199
    def note(self, fmt_string, *args, **kwargs):
200
        """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
201
        self.clear()
1558.7.9 by Aaron Bentley
Bad change. (broke tests). Reverted.
202
        self.to_messages_file.write(fmt_string % args)
203
        self.to_messages_file.write('\n')
1104 by Martin Pool
- Add a simple UIFactory
204
1551.2.29 by Aaron Bentley
Got stack handling under test
205
    def child_progress(self, **kwargs):
206
        return ChildProgress(**kwargs)
207
1534.11.7 by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs.
208
1104 by Martin Pool
- Add a simple UIFactory
209
class DummyProgress(_BaseProgressBar):
210
    """Progress-bar standin that does nothing.
211
212
    This can be used as the default argument for methods that
213
    take an optional progress indicator."""
214
    def tick(self):
215
        pass
216
217
    def update(self, msg=None, current=None, total=None):
218
        pass
219
1551.2.27 by Aaron Bentley
Got propogation under test
220
    def child_update(self, message, current, total):
221
        pass
222
1104 by Martin Pool
- Add a simple UIFactory
223
    def clear(self):
224
        pass
964 by Martin Pool
- show progress on dumb terminals by printing dots
225
        
1534.5.6 by Robert Collins
split out converter logic into per-format objects.
226
    def note(self, fmt_string, *args, **kwargs):
227
        """See _BaseProgressBar.note()."""
1534.5.9 by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch.
228
1551.2.29 by Aaron Bentley
Got stack handling under test
229
    def child_progress(self, **kwargs):
230
        return DummyProgress(**kwargs)
1534.5.9 by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch.
231
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
232
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
233
_progress_bar_types['dummy'] = DummyProgress
234
_progress_bar_types['none'] = DummyProgress
235
236
964 by Martin Pool
- show progress on dumb terminals by printing dots
237
class DotsProgressBar(_BaseProgressBar):
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
238
964 by Martin Pool
- show progress on dumb terminals by printing dots
239
    def __init__(self, **kwargs):
240
        _BaseProgressBar.__init__(self, **kwargs)
241
        self.last_msg = None
242
        self.need_nl = False
243
        
244
    def tick(self):
245
        self.update()
246
        
247
    def update(self, msg=None, current_cnt=None, total_cnt=None):
248
        if msg and msg != self.last_msg:
249
            if self.need_nl:
250
                self.to_file.write('\n')
251
            self.to_file.write(msg + ': ')
252
            self.last_msg = msg
253
        self.need_nl = True
254
        self.to_file.write('.')
255
        
256
    def clear(self):
257
        if self.need_nl:
258
            self.to_file.write('\n')
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
259
        self.need_nl = False
964 by Martin Pool
- show progress on dumb terminals by printing dots
260
        
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
261
    def child_update(self, message, current, total):
262
        self.tick()
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
263
1843.3.7 by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type
264
265
_progress_bar_types['dots'] = DotsProgressBar
266
964 by Martin Pool
- show progress on dumb terminals by printing dots
267
    
268
class TTYProgressBar(_BaseProgressBar):
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
269
    """Progress bar display object.
270
271
    Several options are available to control the display.  These can
272
    be passed as parameters to the constructor or assigned at any time:
273
274
    show_pct
275
        Show percentage complete.
276
    show_spinner
277
        Show rotating baton.  This ticks over on every update even
278
        if the values don't change.
279
    show_eta
280
        Show predicted time-to-completion.
281
    show_bar
282
        Show bar graph.
283
    show_count
284
        Show numerical counts.
285
286
    The output file should be in line-buffered or unbuffered mode.
287
    """
288
    SPIN_CHARS = r'/-\|'
661 by Martin Pool
- limit rate at which progress bar is updated
289
964 by Martin Pool
- show progress on dumb terminals by printing dots
290
291
    def __init__(self, **kwargs):
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
292
        from bzrlib.osutils import terminal_width
964 by Martin Pool
- show progress on dumb terminals by printing dots
293
        _BaseProgressBar.__init__(self, **kwargs)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
294
        self.spin_pos = 0
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
295
        self.width = terminal_width()
1843.3.3 by John Arbash Meinel
Don't let the last_updates list grow without bound.
296
        self.last_updates = []
1843.3.4 by John Arbash Meinel
Remove get_eta's ability to modify last_updates.
297
        self._max_last_updates = 10
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
298
        self.child_fraction = 0
1843.3.1 by John Arbash Meinel
Don't clear anything if nothing has been written.
299
        self._have_output = False
964 by Martin Pool
- show progress on dumb terminals by printing dots
300
    
301
1793.1.1 by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second
302
    def throttle(self, old_msg):
964 by Martin Pool
- show progress on dumb terminals by printing dots
303
        """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.
304
        # 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
305
        # time.clock() is faster, but gives us CPU time, not wall-clock time
306
        now = time.time()
1793.1.1 by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second
307
        if self.start_time is not None and (now - self.start_time) < 1:
308
            return True
309
        if old_msg != self.last_msg:
310
            return False
1596.2.16 by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time.
311
        interval = now - self.last_update
312
        # if interval > 0
313
        if interval < self.MIN_PAUSE:
314
            return True
964 by Martin Pool
- show progress on dumb terminals by printing dots
315
1185.16.75 by Martin Pool
- improved eta estimation for progress bar
316
        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.
317
        # Don't let the queue grow without bound
318
        self.last_updates = self.last_updates[-self._max_last_updates:]
964 by Martin Pool
- show progress on dumb terminals by printing dots
319
        self.last_update = now
320
        return False
929 by Martin Pool
- progress bar: avoid repeatedly checking screen width
321
        
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
322
    def tick(self):
1551.2.27 by Aaron Bentley
Got propogation under test
323
        self.update(self.last_msg, self.last_cnt, self.last_total, 
324
                    self.child_fraction)
325
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
326
    def child_update(self, message, current, total):
1551.2.35 by Aaron Bentley
Fix division-by-zero
327
        if current is not None and total != 0:
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
328
            child_fraction = float(current) / total
329
            if self.last_cnt is None:
330
                pass
331
            elif self.last_cnt + child_fraction <= self.last_total:
332
                self.child_fraction = child_fraction
333
            else:
334
                mutter('not updating child fraction')
335
        if self.last_msg is None:
336
            self.last_msg = ''
1551.2.28 by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents
337
        self.tick()
338
1551.2.27 by Aaron Bentley
Got propogation under test
339
    def update(self, msg, current_cnt=None, total_cnt=None, 
340
               child_fraction=0):
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
341
        """Update and redraw progress bar."""
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
342
        if msg is None:
343
            msg = self.last_msg
344
345
        if total_cnt is None:
346
            total_cnt = self.last_total
347
1308 by Martin Pool
- make progress bar more tolerant of out-of-range values
348
        if current_cnt < 0:
349
            current_cnt = 0
350
            
351
        if current_cnt > total_cnt:
352
            total_cnt = current_cnt
1570.1.9 by Robert Collins
Do not throttle updates to progress bars that change the message.
353
        
1596.2.17 by Robert Collins
Notes on further progress tuning.
354
        ## # optional corner case optimisation 
355
        ## # currently does not seem to fire so costs more than saved.
356
        ## # trivial optimal case:
357
        ## # NB if callers are doing a clear and restore with
358
        ## # the saved values, this will prevent that:
359
        ## # in that case add a restore method that calls
360
        ## # _do_update or some such
361
        ## if (self.last_msg == msg and
362
        ##     self.last_cnt == current_cnt and
363
        ##     self.last_total == total_cnt and
364
        ##     self.child_fraction == child_fraction):
365
        ##     return
366
1570.1.9 by Robert Collins
Do not throttle updates to progress bars that change the message.
367
        old_msg = self.last_msg
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
368
        # save these for the tick() function
369
        self.last_msg = msg
370
        self.last_cnt = current_cnt
371
        self.last_total = total_cnt
1596.2.17 by Robert Collins
Notes on further progress tuning.
372
        self.child_fraction = child_fraction
373
374
        # each function call takes 20ms/4000 = 0.005 ms, 
375
        # but multiple that by 4000 calls -> starts to cost.
376
        # so anything to make this function call faster
377
        # 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
378
        if self.throttle(old_msg):
1596.2.17 by Robert Collins
Notes on further progress tuning.
379
            return
380
381
        if self.show_eta and self.start_time and self.last_total:
382
            eta = get_eta(self.start_time, self.last_cnt + self.child_fraction, 
383
                    self.last_total, last_updates = self.last_updates)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
384
            eta_str = " " + str_tdelta(eta)
385
        else:
386
            eta_str = ""
387
388
        if self.show_spinner:
389
            spin_str = self.SPIN_CHARS[self.spin_pos % 4] + ' '            
390
        else:
391
            spin_str = ''
392
393
        # always update this; it's also used for the bar
394
        self.spin_pos += 1
395
1596.2.17 by Robert Collins
Notes on further progress tuning.
396
        if self.show_pct and self.last_total and self.last_cnt:
397
            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
398
            pct_str = ' (%5.1f%%)' % pct
399
        else:
400
            pct_str = ''
401
402
        if not self.show_count:
403
            count_str = ''
1596.2.17 by Robert Collins
Notes on further progress tuning.
404
        elif self.last_cnt is None:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
405
            count_str = ''
1596.2.17 by Robert Collins
Notes on further progress tuning.
406
        elif self.last_total is None:
407
            count_str = ' %i' % (self.last_cnt)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
408
        else:
409
            # make both fields the same size
1596.2.17 by Robert Collins
Notes on further progress tuning.
410
            t = '%i' % (self.last_total)
411
            c = '%*i' % (len(t), self.last_cnt)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
412
            count_str = ' ' + c + '/' + t 
413
414
        if self.show_bar:
415
            # progress bar, if present, soaks up all remaining space
1596.2.17 by Robert Collins
Notes on further progress tuning.
416
            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
417
                   - len(eta_str) - len(count_str) - 3
418
1596.2.17 by Robert Collins
Notes on further progress tuning.
419
            if self.last_total:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
420
                # number of markers highlighted in bar
1551.2.30 by Aaron Bentley
Bugfixes to progress stuff
421
                markers = int(round(float(cols) * 
1596.2.17 by Robert Collins
Notes on further progress tuning.
422
                              (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
423
                bar_str = '[' + ('=' * markers).ljust(cols) + '] '
669 by Martin Pool
- don't show progress bar unless completion is known
424
            elif False:
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
425
                # don't know total, so can't show completion.
426
                # so just show an expanded spinning thingy
427
                m = self.spin_pos % cols
668 by Martin Pool
- fix sweeping bar progress indicator
428
                ms = (' ' * m + '*').ljust(cols)
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
429
                
430
                bar_str = '[' + ms + '] '
669 by Martin Pool
- don't show progress bar unless completion is known
431
            else:
432
                bar_str = ''
658 by Martin Pool
- clean up and add a bunch of options to the progress indicator
433
        else:
434
            bar_str = ''
435
1596.2.17 by Robert Collins
Notes on further progress tuning.
436
        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
437
        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.
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
2120.1.1 by John Arbash Meinel
Use time.time() because time.clock() is CPU time, not wall time
516
    elapsed = time.time() - 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()