/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

  • Committer: Max Bowsher
  • Date: 2010-10-14 21:34:47 UTC
  • mto: (4797.76.2 2.1)
  • mto: This revision was merged to the branch mainline in revision 5524.
  • Revision ID: maxb@f2s.com-20101014213447-ii2if26gljdaq1n3
Fix skip criteria for bzrlib.tests.test_setup - it was testing whether setup.py existed in one location, then trying to execute setup.py in a different location.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/text.py
37
37
 
38
38
""")
39
39
 
40
 
from bzrlib.osutils import watch_sigwinch
41
 
 
42
40
from bzrlib.ui import (
43
41
    UIFactory,
44
42
    NullProgressView,
62
60
        self.stderr = stderr
63
61
        # paints progress, network activity, etc
64
62
        self._progress_view = self.make_progress_view()
65
 
        # hook up the signals to watch for terminal size changes
66
 
        watch_sigwinch()
67
63
 
68
64
    def be_quiet(self, state):
69
65
        if state and not self._quiet:
242
238
            warnings.warn("%r updated but no tasks are active" %
243
239
                (task,))
244
240
        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
 
241
            warnings.warn("%r is not the top progress task %r" %
 
242
                (task, self._task_stack[-1]))
251
243
        self._progress_view.show_progress(task)
252
244
 
253
245
    def _progress_all_finished(self):
437
429
        elif now >= (self._transport_update_time + 0.5):
438
430
            # guard against clock stepping backwards, and don't update too
439
431
            # 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,))
 
432
            rate = self._bytes_since_update / (now - self._transport_update_time)
 
433
            msg = ("%6dKB %5dKB/s" %
 
434
                    (self._total_byte_count>>10, int(rate)>>10,))
445
435
            self._transport_update_time = now
446
436
            self._last_repaint = now
447
437
            self._bytes_since_update = 0
457
447
                transfer_time = 0.001
458
448
            bps = self._total_byte_count / transfer_time
459
449
 
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.,
 
450
        msg = ('Transferred: %.0fKiB'
 
451
               ' (%.1fK/s r:%.0fK w:%.0fK'
 
452
               % (self._total_byte_count / 1024.,
 
453
                  bps / 1024.,
 
454
                  self._bytes_by_direction['read'] / 1024.,
 
455
                  self._bytes_by_direction['write'] / 1024.,
467
456
                 ))
468
457
        if self._bytes_by_direction['unknown'] > 0:
469
 
            msg += ' u:%.0fkB)' % (
470
 
                self._bytes_by_direction['unknown'] / 1000.
 
458
            msg += ' u:%.0fK)' % (
 
459
                self._bytes_by_direction['unknown'] / 1024.
471
460
                )
472
461
        else:
473
462
            msg += ')'