/brz/remove-bazaar

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