/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/ui/text.py

Merge 2.0 into 2.1 including fixes for #262450, #373898, #498409

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/text.py
242
242
            warnings.warn("%r updated but no tasks are active" %
243
243
                (task,))
244
244
        elif task != self._task_stack[-1]:
245
 
            # We used to check it was the top task, but it's hard to always
246
 
            # get this right and it's not necessarily useful: any actual
247
 
            # problems will be evident in use
248
 
            #warnings.warn("%r is not the top progress task %r" %
249
 
            #     (task, self._task_stack[-1]))
250
 
            pass
 
245
            warnings.warn("%r is not the top progress task %r" %
 
246
                (task, self._task_stack[-1]))
251
247
        self._progress_view.show_progress(task)
252
248
 
253
249
    def _progress_all_finished(self):
437
433
        elif now >= (self._transport_update_time + 0.5):
438
434
            # guard against clock stepping backwards, and don't update too
439
435
            # often
440
 
            rate = (self._bytes_since_update
441
 
                    / (now - self._transport_update_time))
442
 
            # using base-10 units (see HACKING.txt).
443
 
            msg = ("%6dkB %5dkB/s" %
444
 
                    (self._total_byte_count / 1000, int(rate) / 1000,))
 
436
            rate = self._bytes_since_update / (now - self._transport_update_time)
 
437
            msg = ("%6dKB %5dKB/s" %
 
438
                    (self._total_byte_count>>10, int(rate)>>10,))
445
439
            self._transport_update_time = now
446
440
            self._last_repaint = now
447
441
            self._bytes_since_update = 0
457
451
                transfer_time = 0.001
458
452
            bps = self._total_byte_count / transfer_time
459
453
 
460
 
        # using base-10 units (see HACKING.txt).
461
 
        msg = ('Transferred: %.0fkB'
462
 
               ' (%.1fkB/s r:%.0fkB w:%.0fkB'
463
 
               % (self._total_byte_count / 1000.,
464
 
                  bps / 1000.,
465
 
                  self._bytes_by_direction['read'] / 1000.,
466
 
                  self._bytes_by_direction['write'] / 1000.,
 
454
        msg = ('Transferred: %.0fKiB'
 
455
               ' (%.1fK/s r:%.0fK w:%.0fK'
 
456
               % (self._total_byte_count / 1024.,
 
457
                  bps / 1024.,
 
458
                  self._bytes_by_direction['read'] / 1024.,
 
459
                  self._bytes_by_direction['write'] / 1024.,
467
460
                 ))
468
461
        if self._bytes_by_direction['unknown'] > 0:
469
 
            msg += ' u:%.0fkB)' % (
470
 
                self._bytes_by_direction['unknown'] / 1000.
 
462
            msg += ' u:%.0fK)' % (
 
463
                self._bytes_by_direction['unknown'] / 1024.
471
464
                )
472
465
        else:
473
466
            msg += ')'