/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/progress.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-08 14:55:19 UTC
  • mfrom: (3530 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3532.
  • Revision ID: john@arbash-meinel.com-20080708145519-paqg4kjwbpgs2xmq
Merge bzr.dev 3530

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/progress.py
189
189
    def finished(self):
190
190
        """Return this bar to its progress stack."""
191
191
        self.clear()
192
 
        assert self._stack is not None
193
192
        self._stack.return_pb(self)
194
193
 
195
194
    def note(self, fmt_string, *args, **kwargs):
325
324
                pass
326
325
            elif self.last_cnt + child_fraction <= self.last_total:
327
326
                self.child_fraction = child_fraction
328
 
            else:
329
 
                mutter('not updating child fraction')
330
327
        if self.last_msg is None:
331
328
            self.last_msg = ''
332
329
        self.tick()
533
530
    
534
531
    total_duration = float(elapsed) * float(total) / float(current)
535
532
 
536
 
    assert total_duration >= elapsed
537
 
 
538
533
    if last_updates and len(last_updates) >= n_recent:
539
534
        avg = sum(last_updates) / float(len(last_updates))
540
535
        time_left = avg * (total - current)
561
556
            self.cur_phase = 0
562
557
        else:
563
558
            self.cur_phase += 1
564
 
        assert self.cur_phase < self.total
565
559
        self.pb.update(self.message, self.cur_phase, self.total)