← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/progress.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/progress.py
166
166
            self.ui_factory.clear_term()
167
167
 
168
168
 
169
 
# NOTE: This is also deprecated; you should provide a ProgressView instead.
170
 
class _BaseProgressBar(object):
171
 
 
172
 
    def __init__(self,
173
 
                 to_file=None,
174
 
                 show_pct=False,
175
 
                 show_spinner=False,
176
 
                 show_eta=False,
177
 
                 show_bar=True,
178
 
                 show_count=True,
179
 
                 to_messages_file=None,
180
 
                 _stack=None):
181
 
        object.__init__(self)
182
 
        if to_file is None:
183
 
            to_file = sys.stderr
184
 
        if to_messages_file is None:
185
 
            to_messages_file = sys.stdout
186
 
        self.to_file = to_file
187
 
        self.to_messages_file = to_messages_file
188
 
        self.last_msg = None
189
 
        self.last_cnt = None
190
 
        self.last_total = None
191
 
        self.show_pct = show_pct
192
 
        self.show_spinner = show_spinner
193
 
        self.show_eta = show_eta
194
 
        self.show_bar = show_bar
195
 
        self.show_count = show_count
196
 
        self._stack = _stack
197
 
        # seed throttler
198
 
        self.MIN_PAUSE = 0.1 # seconds
199
 
        now = time.time()
200
 
        # starting now
201
 
        self.start_time = now
202
 
        # next update should not throttle
203
 
        self.last_update = now - self.MIN_PAUSE - 1
204
 
 
205
 
    def finished(self):
206
 
        """Return this bar to its progress stack."""
207
 
        self.clear()
208
 
        self._stack.return_pb(self)
209
 
 
210
 
 
211
169
class DummyProgress(object):
212
170
    """Progress-bar standin that does nothing.
213
171