bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
1 |
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
|
2052.3.1
by John Arbash Meinel
Add tests to cleanup the copyright of all source files |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
648
by Martin Pool
- import aaron's progress-indicator code |
16 |
|
649
by Martin Pool
- some cleanups for the progressbar method |
17 |
|
3006.3.3
by Robert Collins
Docstring improvement and remove TODO's from progres.py. |
18 |
"""Progress indicators.
|
19 |
||
20 |
The usual way to use this is via bzrlib.ui.ui_factory.nested_progress_bar which
|
|
21 |
will maintain a ProgressBarStack for you.
|
|
22 |
||
23 |
For direct use, the factory ProgressBar will return an auto-detected progress
|
|
24 |
bar that should match your terminal type. You can manually create a
|
|
25 |
ProgressBarStack too if you need multiple levels of cooperating progress bars.
|
|
26 |
Note that bzrlib's internal functions use the ui module, so if you are using
|
|
27 |
bzrlib it really is best to use bzrlib.ui.ui_factory.
|
|
649
by Martin Pool
- some cleanups for the progressbar method |
28 |
"""
|
29 |
||
934
by Martin Pool
todo |
30 |
|
648
by Martin Pool
- import aaron's progress-indicator code |
31 |
import sys |
660
by Martin Pool
- use plain unix time, not datetime module |
32 |
import time |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
33 |
import os |
3882.8.12
by Martin Pool
Give a warning, not an error, if a progress bar is not finished in order |
34 |
import warnings |
649
by Martin Pool
- some cleanups for the progressbar method |
35 |
|
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
36 |
|
1996.3.32
by John Arbash Meinel
from bzrlib.ui lazy import progress, and make progress import lazily |
37 |
from bzrlib import ( |
38 |
errors, |
|
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
39 |
osutils, |
40 |
trace, |
|
41 |
ui, |
|
1996.3.32
by John Arbash Meinel
from bzrlib.ui lazy import progress, and make progress import lazily |
42 |
)
|
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
43 |
from bzrlib.trace import mutter |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
44 |
|
45 |
||
649
by Martin Pool
- some cleanups for the progressbar method |
46 |
def _supports_progress(f): |
2599.1.1
by Martin Pool
Don't show dots progress indicatiors in noninteractive mode |
47 |
"""Detect if we can use pretty progress bars on the output stream f. |
48 |
||
49 |
If this returns true we expect that a human may be looking at that
|
|
50 |
output, and that we can repaint a line to update it.
|
|
51 |
"""
|
|
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
52 |
isatty = getattr(f, 'isatty', None) |
53 |
if isatty is None: |
|
695
by Martin Pool
- don't display progress bars on really dumb terminals |
54 |
return False |
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
55 |
if not isatty(): |
695
by Martin Pool
- don't display progress bars on really dumb terminals |
56 |
return False |
57 |
if os.environ.get('TERM') == 'dumb': |
|
58 |
# e.g. emacs compile window
|
|
59 |
return False |
|
60 |
return True |
|
649
by Martin Pool
- some cleanups for the progressbar method |
61 |
|
62 |
||
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
63 |
class ProgressTask(object): |
64 |
"""Model component of a progress indicator. |
|
65 |
||
66 |
Most code that needs to indicate progress should update one of these,
|
|
67 |
and it will in turn update the display, if one is present.
|
|
3882.8.5
by Martin Pool
Progress tasks can indicate what kind of display is useful |
68 |
|
69 |
Code updating the task may also set fields as hints about how to display
|
|
70 |
it: show_pct, show_spinner, show_eta, show_count, show_bar. UIs
|
|
71 |
will not necessarily respect all these fields.
|
|
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
72 |
"""
|
73 |
||
3882.8.2
by Martin Pool
ProgressTask holds a reference to the ui that displays it |
74 |
def __init__(self, parent_task=None, ui_factory=None): |
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
75 |
self._parent_task = parent_task |
76 |
self._last_update = 0 |
|
77 |
self.total_cnt = None |
|
78 |
self.current_cnt = None |
|
79 |
self.msg = '' |
|
3882.8.2
by Martin Pool
ProgressTask holds a reference to the ui that displays it |
80 |
self.ui_factory = ui_factory |
3882.8.5
by Martin Pool
Progress tasks can indicate what kind of display is useful |
81 |
self.show_pct = False |
82 |
self.show_spinner = True |
|
83 |
self.show_eta = False, |
|
84 |
self.show_count = True |
|
85 |
self.show_bar = True |
|
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
86 |
|
87 |
def update(self, msg, current_cnt=None, total_cnt=None): |
|
88 |
self.msg = msg |
|
89 |
self.current_cnt = current_cnt |
|
90 |
if total_cnt: |
|
91 |
self.total_cnt = total_cnt |
|
3882.8.2
by Martin Pool
ProgressTask holds a reference to the ui that displays it |
92 |
self.ui_factory.show_progress(self) |
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
93 |
|
3882.8.8
by Martin Pool
Progress and UI test cleanups |
94 |
def tick(self): |
95 |
self.update(self.msg) |
|
96 |
||
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
97 |
def finished(self): |
3882.8.2
by Martin Pool
ProgressTask holds a reference to the ui that displays it |
98 |
self.ui_factory.progress_finished(self) |
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
99 |
|
100 |
def make_sub_task(self): |
|
3882.8.3
by Martin Pool
Move display of transport throughput into TextProgressView |
101 |
return ProgressTask(self, self.ui_factory) |
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
102 |
|
103 |
def _overall_completion_fraction(self, child_fraction=0.0): |
|
104 |
"""Return fractional completion of this task and its parents |
|
105 |
|
|
106 |
Returns None if no completion can be computed."""
|
|
107 |
if self.total_cnt: |
|
108 |
own_fraction = (float(self.current_cnt) + child_fraction) / self.total_cnt |
|
109 |
else: |
|
110 |
own_fraction = None |
|
111 |
if self._parent_task is None: |
|
112 |
return own_fraction |
|
113 |
else: |
|
114 |
if own_fraction is None: |
|
115 |
own_fraction = 0.0 |
|
116 |
return self._parent_task._overall_completion_fraction(own_fraction) |
|
117 |
||
3882.8.4
by Martin Pool
All UI factories should support note() |
118 |
def note(self, fmt_string, *args): |
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
119 |
"""Record a note without disrupting the progress bar.""" |
120 |
# XXX: shouldn't be here; put it in mutter or the ui instead
|
|
3943.2.3
by Martin Pool
Don't do string interpolation if there are no arguments |
121 |
if args: |
122 |
self.ui_factory.note(fmt_string % args) |
|
123 |
else: |
|
124 |
self.ui_factory.note(fmt_string) |
|
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
125 |
|
126 |
def clear(self): |
|
127 |
# XXX: shouldn't be here; put it in mutter or the ui instead
|
|
3882.8.2
by Martin Pool
ProgressTask holds a reference to the ui that displays it |
128 |
self.ui_factory.clear_term() |
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
129 |
|
649
by Martin Pool
- some cleanups for the progressbar method |
130 |
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
131 |
def ProgressBar(to_file=None, **kwargs): |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
132 |
"""Abstract factory""" |
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
133 |
if to_file is None: |
134 |
to_file = sys.stderr |
|
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
135 |
requested_bar_type = os.environ.get('BZR_PROGRESS_BAR') |
136 |
# An value of '' or not set reverts to standard processing
|
|
137 |
if requested_bar_type in (None, ''): |
|
138 |
if _supports_progress(to_file): |
|
139 |
return TTYProgressBar(to_file=to_file, **kwargs) |
|
140 |
else: |
|
2599.1.1
by Martin Pool
Don't show dots progress indicatiors in noninteractive mode |
141 |
return DummyProgress(to_file=to_file, **kwargs) |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
142 |
else: |
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
143 |
# Minor sanitation to prevent spurious errors
|
144 |
requested_bar_type = requested_bar_type.lower().strip() |
|
145 |
# TODO: jam 20060710 Arguably we shouldn't raise an exception
|
|
146 |
# but should instead just disable progress bars if we
|
|
147 |
# don't recognize the type
|
|
148 |
if requested_bar_type not in _progress_bar_types: |
|
149 |
raise errors.InvalidProgressBarType(requested_bar_type, |
|
150 |
_progress_bar_types.keys()) |
|
151 |
return _progress_bar_types[requested_bar_type](to_file=to_file, **kwargs) |
|
152 |
||
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
153 |
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
154 |
class ProgressBarStack(object): |
155 |
"""A stack of progress bars.""" |
|
156 |
||
157 |
def __init__(self, |
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
158 |
to_file=None, |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
159 |
show_pct=False, |
1551.2.33
by Aaron Bentley
Hide ETA, show spinner by default |
160 |
show_spinner=True, |
161 |
show_eta=False, |
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
162 |
show_bar=True, |
163 |
show_count=True, |
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
164 |
to_messages_file=None, |
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
165 |
klass=None): |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
166 |
"""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 |
167 |
if to_file is None: |
168 |
to_file = sys.stderr |
|
169 |
if to_messages_file is None: |
|
170 |
to_messages_file = sys.stdout |
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
171 |
self._to_file = to_file |
172 |
self._show_pct = show_pct |
|
173 |
self._show_spinner = show_spinner |
|
174 |
self._show_eta = show_eta |
|
175 |
self._show_bar = show_bar |
|
176 |
self._show_count = show_count |
|
177 |
self._to_messages_file = to_messages_file |
|
178 |
self._stack = [] |
|
1843.3.5
by John Arbash Meinel
Add tests to assert we fall back to DotsProgressBar when appropriate. |
179 |
self._klass = klass or ProgressBar |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
180 |
|
1551.2.29
by Aaron Bentley
Got stack handling under test |
181 |
def top(self): |
182 |
if len(self._stack) != 0: |
|
183 |
return self._stack[-1] |
|
184 |
else: |
|
185 |
return None |
|
186 |
||
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
187 |
def bottom(self): |
188 |
if len(self._stack) != 0: |
|
189 |
return self._stack[0] |
|
190 |
else: |
|
191 |
return None |
|
192 |
||
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
193 |
def get_nested(self): |
194 |
"""Return a nested progress bar.""" |
|
1551.2.29
by Aaron Bentley
Got stack handling under test |
195 |
if len(self._stack) == 0: |
196 |
func = self._klass |
|
197 |
else: |
|
198 |
func = self.top().child_progress |
|
199 |
new_bar = func(to_file=self._to_file, |
|
200 |
show_pct=self._show_pct, |
|
201 |
show_spinner=self._show_spinner, |
|
202 |
show_eta=self._show_eta, |
|
203 |
show_bar=self._show_bar, |
|
204 |
show_count=self._show_count, |
|
205 |
to_messages_file=self._to_messages_file, |
|
206 |
_stack=self) |
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
207 |
self._stack.append(new_bar) |
208 |
return new_bar |
|
209 |
||
210 |
def return_pb(self, bar): |
|
211 |
"""Return bar after its been used.""" |
|
1594.1.4
by Robert Collins
Fix identity test in ProgressBarStack.return_pb |
212 |
if bar is not self._stack[-1]: |
3882.8.12
by Martin Pool
Give a warning, not an error, if a progress bar is not finished in order |
213 |
warnings.warn("%r is not currently active" % (bar,)) |
214 |
else: |
|
215 |
self._stack.pop() |
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
216 |
|
217 |
||
964
by Martin Pool
- show progress on dumb terminals by printing dots |
218 |
class _BaseProgressBar(object): |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
219 |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
220 |
def __init__(self, |
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
221 |
to_file=None, |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
222 |
show_pct=False, |
223 |
show_spinner=False, |
|
1793.1.1
by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second |
224 |
show_eta=False, |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
225 |
show_bar=True, |
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
226 |
show_count=True, |
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
227 |
to_messages_file=None, |
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
228 |
_stack=None): |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
229 |
object.__init__(self) |
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
230 |
if to_file is None: |
231 |
to_file = sys.stderr |
|
232 |
if to_messages_file is None: |
|
233 |
to_messages_file = sys.stdout |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
234 |
self.to_file = to_file |
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
235 |
self.to_messages_file = to_messages_file |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
236 |
self.last_msg = None |
237 |
self.last_cnt = None |
|
238 |
self.last_total = None |
|
239 |
self.show_pct = show_pct |
|
240 |
self.show_spinner = show_spinner |
|
241 |
self.show_eta = show_eta |
|
242 |
self.show_bar = show_bar |
|
243 |
self.show_count = show_count |
|
1594.1.1
by Robert Collins
Introduce new bzr progress bar api. ui_factory.nested_progress_bar. |
244 |
self._stack = _stack |
1596.2.16
by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time. |
245 |
# seed throttler
|
246 |
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 |
247 |
now = time.time() |
1596.2.16
by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time. |
248 |
# starting now
|
2745.6.52
by Andrew Bennetts
Revert bad change to bzrlib/progress.py |
249 |
self.start_time = now |
1596.2.16
by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time. |
250 |
# next update should not throttle
|
251 |
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. |
252 |
|
253 |
def finished(self): |
|
254 |
"""Return this bar to its progress stack.""" |
|
255 |
self.clear() |
|
256 |
self._stack.return_pb(self) |
|
1104
by Martin Pool
- Add a simple UIFactory |
257 |
|
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
258 |
def note(self, fmt_string, *args, **kwargs): |
259 |
"""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 |
260 |
self.clear() |
1558.7.9
by Aaron Bentley
Bad change. (broke tests). Reverted. |
261 |
self.to_messages_file.write(fmt_string % args) |
262 |
self.to_messages_file.write('\n') |
|
1104
by Martin Pool
- Add a simple UIFactory |
263 |
|
1551.2.29
by Aaron Bentley
Got stack handling under test |
264 |
def child_progress(self, **kwargs): |
265 |
return ChildProgress(**kwargs) |
|
266 |
||
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
267 |
|
1104
by Martin Pool
- Add a simple UIFactory |
268 |
class DummyProgress(_BaseProgressBar): |
269 |
"""Progress-bar standin that does nothing. |
|
270 |
||
271 |
This can be used as the default argument for methods that
|
|
272 |
take an optional progress indicator."""
|
|
3882.8.8
by Martin Pool
Progress and UI test cleanups |
273 |
|
1104
by Martin Pool
- Add a simple UIFactory |
274 |
def tick(self): |
275 |
pass
|
|
276 |
||
277 |
def update(self, msg=None, current=None, total=None): |
|
278 |
pass
|
|
279 |
||
1551.2.27
by Aaron Bentley
Got propogation under test |
280 |
def child_update(self, message, current, total): |
281 |
pass
|
|
282 |
||
1104
by Martin Pool
- Add a simple UIFactory |
283 |
def clear(self): |
284 |
pass
|
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
285 |
|
1534.5.6
by Robert Collins
split out converter logic into per-format objects. |
286 |
def note(self, fmt_string, *args, **kwargs): |
287 |
"""See _BaseProgressBar.note().""" |
|
1534.5.9
by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch. |
288 |
|
1551.2.29
by Aaron Bentley
Got stack handling under test |
289 |
def child_progress(self, **kwargs): |
290 |
return DummyProgress(**kwargs) |
|
1534.5.9
by Robert Collins
Advise users running upgrade on a checkout to also run it on the branch. |
291 |
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
292 |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
293 |
class DotsProgressBar(_BaseProgressBar): |
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
294 |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
295 |
def __init__(self, **kwargs): |
296 |
_BaseProgressBar.__init__(self, **kwargs) |
|
297 |
self.last_msg = None |
|
298 |
self.need_nl = False |
|
299 |
||
300 |
def tick(self): |
|
301 |
self.update() |
|
302 |
||
303 |
def update(self, msg=None, current_cnt=None, total_cnt=None): |
|
304 |
if msg and msg != self.last_msg: |
|
305 |
if self.need_nl: |
|
306 |
self.to_file.write('\n') |
|
307 |
self.to_file.write(msg + ': ') |
|
308 |
self.last_msg = msg |
|
309 |
self.need_nl = True |
|
310 |
self.to_file.write('.') |
|
311 |
||
312 |
def clear(self): |
|
313 |
if self.need_nl: |
|
314 |
self.to_file.write('\n') |
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
315 |
self.need_nl = False |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
316 |
|
1551.2.28
by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents |
317 |
def child_update(self, message, current, total): |
318 |
self.tick() |
|
1681.1.2
by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which |
319 |
|
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
320 |
|
321 |
||
964
by Martin Pool
- show progress on dumb terminals by printing dots |
322 |
|
323 |
class TTYProgressBar(_BaseProgressBar): |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
324 |
"""Progress bar display object. |
325 |
||
326 |
Several options are available to control the display. These can
|
|
327 |
be passed as parameters to the constructor or assigned at any time:
|
|
328 |
||
329 |
show_pct
|
|
330 |
Show percentage complete.
|
|
331 |
show_spinner
|
|
332 |
Show rotating baton. This ticks over on every update even
|
|
333 |
if the values don't change.
|
|
334 |
show_eta
|
|
335 |
Show predicted time-to-completion.
|
|
336 |
show_bar
|
|
337 |
Show bar graph.
|
|
338 |
show_count
|
|
339 |
Show numerical counts.
|
|
340 |
||
341 |
The output file should be in line-buffered or unbuffered mode.
|
|
342 |
"""
|
|
343 |
SPIN_CHARS = r'/-\|' |
|
661
by Martin Pool
- limit rate at which progress bar is updated |
344 |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
345 |
|
346 |
def __init__(self, **kwargs): |
|
1185.33.60
by Martin Pool
Use full terminal width for verbose test output. |
347 |
from bzrlib.osutils import terminal_width |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
348 |
_BaseProgressBar.__init__(self, **kwargs) |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
349 |
self.spin_pos = 0 |
1185.33.60
by Martin Pool
Use full terminal width for verbose test output. |
350 |
self.width = terminal_width() |
1843.3.3
by John Arbash Meinel
Don't let the last_updates list grow without bound. |
351 |
self.last_updates = [] |
1843.3.4
by John Arbash Meinel
Remove get_eta's ability to modify last_updates. |
352 |
self._max_last_updates = 10 |
1551.2.28
by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents |
353 |
self.child_fraction = 0 |
1843.3.1
by John Arbash Meinel
Don't clear anything if nothing has been written. |
354 |
self._have_output = False |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
355 |
|
1793.1.1
by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second |
356 |
def throttle(self, old_msg): |
964
by Martin Pool
- show progress on dumb terminals by printing dots |
357 |
"""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. |
358 |
# 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 |
359 |
# time.clock() is faster, but gives us CPU time, not wall-clock time
|
360 |
now = time.time() |
|
1793.1.1
by Aaron Bentley
Hide TTYProgressBars unless they last more than 1 second |
361 |
if self.start_time is not None and (now - self.start_time) < 1: |
362 |
return True |
|
363 |
if old_msg != self.last_msg: |
|
364 |
return False |
|
1596.2.16
by Robert Collins
Microprofiling: progress.update was costing 0.01 ms per call in time.time. |
365 |
interval = now - self.last_update |
366 |
# if interval > 0
|
|
367 |
if interval < self.MIN_PAUSE: |
|
368 |
return True |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
369 |
|
1185.16.75
by Martin Pool
- improved eta estimation for progress bar |
370 |
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. |
371 |
# Don't let the queue grow without bound
|
372 |
self.last_updates = self.last_updates[-self._max_last_updates:] |
|
964
by Martin Pool
- show progress on dumb terminals by printing dots |
373 |
self.last_update = now |
374 |
return False |
|
929
by Martin Pool
- progress bar: avoid repeatedly checking screen width |
375 |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
376 |
def tick(self): |
3006.3.2
by Robert Collins
More formatting corrections. |
377 |
self.update(self.last_msg, self.last_cnt, self.last_total, |
1551.2.27
by Aaron Bentley
Got propogation under test |
378 |
self.child_fraction) |
379 |
||
1551.2.28
by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents |
380 |
def child_update(self, message, current, total): |
1551.2.35
by Aaron Bentley
Fix division-by-zero |
381 |
if current is not None and total != 0: |
1551.2.30
by Aaron Bentley
Bugfixes to progress stuff |
382 |
child_fraction = float(current) / total |
383 |
if self.last_cnt is None: |
|
384 |
pass
|
|
385 |
elif self.last_cnt + child_fraction <= self.last_total: |
|
386 |
self.child_fraction = child_fraction |
|
387 |
if self.last_msg is None: |
|
388 |
self.last_msg = '' |
|
1551.2.28
by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents |
389 |
self.tick() |
390 |
||
3006.3.1
by Robert Collins
Minor PEP8 changes. |
391 |
def update(self, msg, current_cnt=None, total_cnt=None, |
3882.8.1
by Martin Pool
Remove experimental transport display from TTYProgressBar |
392 |
child_fraction=0): |
3882.7.6
by Martin Pool
Preliminary support for drawing network io into the progress bar |
393 |
"""Update and redraw progress bar. |
3882.8.1
by Martin Pool
Remove experimental transport display from TTYProgressBar |
394 |
"""
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
395 |
if msg is None: |
396 |
msg = self.last_msg |
|
397 |
||
398 |
if total_cnt is None: |
|
399 |
total_cnt = self.last_total |
|
400 |
||
1308
by Martin Pool
- make progress bar more tolerant of out-of-range values |
401 |
if current_cnt < 0: |
402 |
current_cnt = 0 |
|
403 |
||
404 |
if current_cnt > total_cnt: |
|
405 |
total_cnt = current_cnt |
|
1570.1.9
by Robert Collins
Do not throttle updates to progress bars that change the message. |
406 |
|
1596.2.17
by Robert Collins
Notes on further progress tuning. |
407 |
## # optional corner case optimisation
|
408 |
## # currently does not seem to fire so costs more than saved.
|
|
409 |
## # trivial optimal case:
|
|
410 |
## # NB if callers are doing a clear and restore with
|
|
411 |
## # the saved values, this will prevent that:
|
|
412 |
## # in that case add a restore method that calls
|
|
413 |
## # _do_update or some such
|
|
414 |
## if (self.last_msg == msg and
|
|
415 |
## self.last_cnt == current_cnt and
|
|
416 |
## self.last_total == total_cnt and
|
|
417 |
## self.child_fraction == child_fraction):
|
|
418 |
## return
|
|
419 |
||
3882.7.6
by Martin Pool
Preliminary support for drawing network io into the progress bar |
420 |
if msg is None: |
421 |
msg = '' |
|
422 |
||
1570.1.9
by Robert Collins
Do not throttle updates to progress bars that change the message. |
423 |
old_msg = self.last_msg |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
424 |
# save these for the tick() function
|
425 |
self.last_msg = msg |
|
426 |
self.last_cnt = current_cnt |
|
427 |
self.last_total = total_cnt |
|
1596.2.17
by Robert Collins
Notes on further progress tuning. |
428 |
self.child_fraction = child_fraction |
429 |
||
430 |
# each function call takes 20ms/4000 = 0.005 ms,
|
|
431 |
# but multiple that by 4000 calls -> starts to cost.
|
|
432 |
# so anything to make this function call faster
|
|
433 |
# 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 |
434 |
if self.throttle(old_msg): |
1596.2.17
by Robert Collins
Notes on further progress tuning. |
435 |
return
|
436 |
||
437 |
if self.show_eta and self.start_time and self.last_total: |
|
438 |
eta = get_eta(self.start_time, self.last_cnt + self.child_fraction, |
|
439 |
self.last_total, last_updates = self.last_updates) |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
440 |
eta_str = " " + str_tdelta(eta) |
441 |
else: |
|
442 |
eta_str = "" |
|
443 |
||
444 |
if self.show_spinner: |
|
445 |
spin_str = self.SPIN_CHARS[self.spin_pos % 4] + ' ' |
|
446 |
else: |
|
447 |
spin_str = '' |
|
448 |
||
449 |
# always update this; it's also used for the bar
|
|
450 |
self.spin_pos += 1 |
|
451 |
||
1596.2.17
by Robert Collins
Notes on further progress tuning. |
452 |
if self.show_pct and self.last_total and self.last_cnt: |
453 |
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 |
454 |
pct_str = ' (%5.1f%%)' % pct |
455 |
else: |
|
456 |
pct_str = '' |
|
457 |
||
458 |
if not self.show_count: |
|
459 |
count_str = '' |
|
1596.2.17
by Robert Collins
Notes on further progress tuning. |
460 |
elif self.last_cnt is None: |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
461 |
count_str = '' |
1596.2.17
by Robert Collins
Notes on further progress tuning. |
462 |
elif self.last_total is None: |
463 |
count_str = ' %i' % (self.last_cnt) |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
464 |
else: |
465 |
# make both fields the same size
|
|
1596.2.17
by Robert Collins
Notes on further progress tuning. |
466 |
t = '%i' % (self.last_total) |
467 |
c = '%*i' % (len(t), self.last_cnt) |
|
3882.7.6
by Martin Pool
Preliminary support for drawing network io into the progress bar |
468 |
count_str = ' ' + c + '/' + t |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
469 |
|
470 |
if self.show_bar: |
|
471 |
# progress bar, if present, soaks up all remaining space
|
|
1596.2.17
by Robert Collins
Notes on further progress tuning. |
472 |
cols = self.width - 1 - len(self.last_msg) - len(spin_str) - len(pct_str) \ |
3882.8.1
by Martin Pool
Remove experimental transport display from TTYProgressBar |
473 |
- len(eta_str) - len(count_str) - 3 |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
474 |
|
1596.2.17
by Robert Collins
Notes on further progress tuning. |
475 |
if self.last_total: |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
476 |
# number of markers highlighted in bar
|
1551.2.30
by Aaron Bentley
Bugfixes to progress stuff |
477 |
markers = int(round(float(cols) * |
1596.2.17
by Robert Collins
Notes on further progress tuning. |
478 |
(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 |
479 |
bar_str = '[' + ('=' * markers).ljust(cols) + '] ' |
669
by Martin Pool
- don't show progress bar unless completion is known |
480 |
elif False: |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
481 |
# don't know total, so can't show completion.
|
482 |
# so just show an expanded spinning thingy
|
|
483 |
m = self.spin_pos % cols |
|
668
by Martin Pool
- fix sweeping bar progress indicator |
484 |
ms = (' ' * m + '*').ljust(cols) |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
485 |
|
486 |
bar_str = '[' + ms + '] ' |
|
669
by Martin Pool
- don't show progress bar unless completion is known |
487 |
else: |
488 |
bar_str = '' |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
489 |
else: |
490 |
bar_str = '' |
|
491 |
||
3882.8.1
by Martin Pool
Remove experimental transport display from TTYProgressBar |
492 |
m = spin_str + bar_str + self.last_msg + count_str \ |
3882.7.6
by Martin Pool
Preliminary support for drawing network io into the progress bar |
493 |
+ pct_str + eta_str |
2095.4.4
by mbp at sourcefrog
Truncate progress bar rather than complaining if it's too long |
494 |
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. |
495 |
self._have_output = True |
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
496 |
#self.to_file.flush()
|
497 |
||
3006.3.2
by Robert Collins
More formatting corrections. |
498 |
def clear(self): |
1843.3.1
by John Arbash Meinel
Don't clear anything if nothing has been written. |
499 |
if self._have_output: |
500 |
self.to_file.write('\r%s\r' % (' ' * (self.width - 1))) |
|
501 |
self._have_output = False |
|
658
by Martin Pool
- clean up and add a bunch of options to the progress indicator |
502 |
#self.to_file.flush()
|
649
by Martin Pool
- some cleanups for the progressbar method |
503 |
|
1551.2.27
by Aaron Bentley
Got propogation under test |
504 |
|
1843.3.7
by John Arbash Meinel
new env var 'BZR_PROGRESS_BAR' to select the exact progress type |
505 |
|
506 |
||
1551.2.28
by Aaron Bentley
Ensure all ProgressBar implementations can be used as parents |
507 |
class ChildProgress(_BaseProgressBar): |
1551.2.27
by Aaron Bentley
Got propogation under test |
508 |
"""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 |
509 |
|
1551.2.29
by Aaron Bentley
Got stack handling under test |
510 |
def __init__(self, _stack, **kwargs): |
511 |
_BaseProgressBar.__init__(self, _stack=_stack, **kwargs) |
|
512 |
self.parent = _stack.top() |
|
1551.2.27
by Aaron Bentley
Got propogation under test |
513 |
self.current = None |
514 |
self.total = None |
|
515 |
self.child_fraction = 0 |
|
516 |
self.message = None |
|
517 |
||
518 |
def update(self, msg, current_cnt=None, total_cnt=None): |
|
519 |
self.current = current_cnt |
|
2592.6.11
by Robert Collins
* A progress bar has been added for knitpack -> knitpack fetching. |
520 |
if total_cnt is not None: |
521 |
self.total = total_cnt |
|
1551.2.27
by Aaron Bentley
Got propogation under test |
522 |
self.message = msg |
523 |
self.child_fraction = 0 |
|
524 |
self.tick() |
|
525 |
||
526 |
def child_update(self, message, current, total): |
|
1551.2.35
by Aaron Bentley
Fix division-by-zero |
527 |
if current is None or total == 0: |
1551.2.30
by Aaron Bentley
Bugfixes to progress stuff |
528 |
self.child_fraction = 0 |
529 |
else: |
|
530 |
self.child_fraction = float(current) / total |
|
1551.2.27
by Aaron Bentley
Got propogation under test |
531 |
self.tick() |
532 |
||
533 |
def tick(self): |
|
1551.2.30
by Aaron Bentley
Bugfixes to progress stuff |
534 |
if self.current is None: |
535 |
count = None |
|
536 |
else: |
|
537 |
count = self.current+self.child_fraction |
|
538 |
if count > self.total: |
|
1596.2.35
by Robert Collins
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine. |
539 |
if __debug__: |
540 |
mutter('clamping count of %d to %d' % (count, self.total)) |
|
1551.2.30
by Aaron Bentley
Bugfixes to progress stuff |
541 |
count = self.total |
1551.2.27
by Aaron Bentley
Got propogation under test |
542 |
self.parent.child_update(self.message, count, self.total) |
543 |
||
1551.2.29
by Aaron Bentley
Got stack handling under test |
544 |
def clear(self): |
1551.2.30
by Aaron Bentley
Bugfixes to progress stuff |
545 |
pass
|
1551.2.29
by Aaron Bentley
Got stack handling under test |
546 |
|
1558.8.6
by Aaron Bentley
Fix note implementation |
547 |
def note(self, *args, **kwargs): |
1558.8.5
by Aaron Bentley
Pass note up the stack instead of using bzrlib.ui_factory |
548 |
self.parent.note(*args, **kwargs) |
549 |
||
3146.6.1
by Aaron Bentley
InterDifferingSerializer shows a progress bar |
550 |
|
551 |
class InstrumentedProgress(TTYProgressBar): |
|
552 |
"""TTYProgress variant that tracks outcomes""" |
|
553 |
||
554 |
def __init__(self, *args, **kwargs): |
|
555 |
self.always_throttled = True |
|
556 |
self.never_throttle = False |
|
557 |
TTYProgressBar.__init__(self, *args, **kwargs) |
|
558 |
||
559 |
def throttle(self, old_message): |
|
560 |
if self.never_throttle: |
|
561 |
result = False |
|
562 |
else: |
|
563 |
result = TTYProgressBar.throttle(self, old_message) |
|
564 |
if result is False: |
|
565 |
self.always_throttled = False |
|
566 |
||
567 |
||
648
by Martin Pool
- import aaron's progress-indicator code |
568 |
def str_tdelta(delt): |
569 |
if delt is None: |
|
570 |
return "-:--:--" |
|
660
by Martin Pool
- use plain unix time, not datetime module |
571 |
delt = int(round(delt)) |
572 |
return '%d:%02d:%02d' % (delt/3600, |
|
573 |
(delt/60) % 60, |
|
574 |
delt % 60) |
|
575 |
||
576 |
||
1185.16.75
by Martin Pool
- improved eta estimation for progress bar |
577 |
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 |
578 |
if start_time is None: |
579 |
return None |
|
580 |
||
581 |
if not total: |
|
582 |
return None |
|
583 |
||
584 |
if current < enough_samples: |
|
585 |
return None |
|
586 |
||
587 |
if current > total: |
|
588 |
return None # wtf? |
|
589 |
||
2120.1.1
by John Arbash Meinel
Use time.time() because time.clock() is CPU time, not wall time |
590 |
elapsed = time.time() - start_time |
660
by Martin Pool
- use plain unix time, not datetime module |
591 |
|
592 |
if elapsed < 2.0: # not enough time to estimate |
|
593 |
return None |
|
594 |
||
595 |
total_duration = float(elapsed) * float(total) / float(current) |
|
596 |
||
1185.16.75
by Martin Pool
- improved eta estimation for progress bar |
597 |
if last_updates and len(last_updates) >= n_recent: |
598 |
avg = sum(last_updates) / float(len(last_updates)) |
|
599 |
time_left = avg * (total - current) |
|
600 |
||
601 |
old_time_left = total_duration - elapsed |
|
602 |
||
603 |
# We could return the average, or some other value here
|
|
604 |
return (time_left + old_time_left) / 2 |
|
605 |
||
660
by Martin Pool
- use plain unix time, not datetime module |
606 |
return total_duration - elapsed |
648
by Martin Pool
- import aaron's progress-indicator code |
607 |
|
649
by Martin Pool
- some cleanups for the progressbar method |
608 |
|
1551.2.32
by Aaron Bentley
Handle progress phases more nicely in merge |
609 |
class ProgressPhase(object): |
610 |
"""Update progress object with the current phase""" |
|
611 |
def __init__(self, message, total, pb): |
|
612 |
object.__init__(self) |
|
613 |
self.pb = pb |
|
614 |
self.message = message |
|
615 |
self.total = total |
|
616 |
self.cur_phase = None |
|
617 |
||
618 |
def next_phase(self): |
|
619 |
if self.cur_phase is None: |
|
620 |
self.cur_phase = 0 |
|
621 |
else: |
|
622 |
self.cur_phase += 1 |
|
623 |
self.pb.update(self.message, self.cur_phase, self.total) |
|
3882.7.7
by Martin Pool
Change progress bars to a more MVC style |
624 |
|
625 |
||
626 |
_progress_bar_types = {} |
|
627 |
_progress_bar_types['dummy'] = DummyProgress |
|
628 |
_progress_bar_types['none'] = DummyProgress |
|
629 |
_progress_bar_types['tty'] = TTYProgressBar |
|
630 |
_progress_bar_types['dots'] = DotsProgressBar |