Rev 4913: Switch to KiB/K for each value. Don't display if there are no bytes. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-dbytes

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-dbytes

------------------------------------------------------------
revno: 4913
revision-id: john at arbash-meinel.com-20100104202347-ie7sj0wqz0mygmrn
parent: john at arbash-meinel.com-20091218175958-zu3jl2505jf93i0f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-dbytes
timestamp: Mon 2010-01-04 14:23:47 -0600
message:
  Switch to KiB/K for each value. Don't display if there are no bytes.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_uifactory/__init__.py'
--- a/bzrlib/tests/per_uifactory/__init__.py	2009-12-18 17:58:10 +0000
+++ b/bzrlib/tests/per_uifactory/__init__.py	2010-01-04 20:23:47 +0000
@@ -96,6 +96,12 @@
         self.factory.log_transport_activity(display=True)
         self._check_log_transport_activity_display()
 
+    def test_no_transport_activity(self):
+        # No activity to report
+        t = transport.get_transport('memory:///')
+        self.factory.log_transport_activity(display=True)
+        self._check_log_transport_activity_display_no_bytes()
+
 
 class TestTextUIFactory(tests.TestCase, UIFactoryTestMixin):
 
@@ -135,6 +141,11 @@
         # Without a TTY, we shouldn't display anything
         self.assertEqual('', self.stderr.getvalue())
 
+    def _check_log_transport_activity_display_no_bytes(self):
+        self.assertEqual('', self.stdout.getvalue())
+        # Without a TTY, we shouldn't display anything
+        self.assertEqual('', self.stderr.getvalue())
+
 
 class TestTTYTextUIFactory(TestTextUIFactory):
 
@@ -168,8 +179,13 @@
         self.assertEqual('', self.stdout.getvalue())
         # Displaying the result should write to the progress stream
         self.assertContainsRe(self.stderr.getvalue(),
-            r'Transferred: 0\.007MiB'
-            r' \(\d+\.\dKiB/s r:0\.002MiB w:0\.001MiB u:0\.004MiB\)')
+            r'Transferred: 7KiB'
+            r' \(\d+\.\dK/s r:2K w:1K u:4K\)')
+
+    def _check_log_transport_activity_display_no_bytes(self):
+        self.assertEqual('', self.stdout.getvalue())
+        # Without actual bytes transferred, we should report nothing
+        self.assertEqual('', self.stderr.getvalue())
 
 
 class TestSilentUIFactory(tests.TestCase, UIFactoryTestMixin):
@@ -198,6 +214,9 @@
     def _check_log_transport_activity_display(self):
         pass
 
+    def _check_log_transport_activity_display_no_bytes(self):
+        pass
+
 
 class TestCannedInputUIFactory(tests.TestCase, UIFactoryTestMixin):
     # discards output, reads input from variables
@@ -223,3 +242,6 @@
 
     def _check_log_transport_activity_display(self):
         pass
+
+    def _check_log_transport_activity_display_no_bytes(self):
+        pass

=== modified file 'bzrlib/ui/text.py'
--- a/bzrlib/ui/text.py	2009-12-18 17:58:10 +0000
+++ b/bzrlib/ui/text.py	2010-01-04 20:23:47 +0000
@@ -428,16 +428,16 @@
                 transfer_time = 0.001
             bps = self._total_byte_count / transfer_time
 
-        msg = ('Transferred: %.3fMiB'
-               ' (%.1fKiB/s r:%.3fMiB w:%.3fMiB'
-               % (self._total_byte_count / 1024. / 1024.,
+        msg = ('Transferred: %.0fKiB'
+               ' (%.1fK/s r:%.0fK w:%.0fK'
+               % (self._total_byte_count / 1024.,
                   bps / 1024.,
-                  self._bytes_by_direction['read'] / 1024. / 1024.,
-                  self._bytes_by_direction['write'] / 1024. / 1024.,
+                  self._bytes_by_direction['read'] / 1024.,
+                  self._bytes_by_direction['write'] / 1024.,
                  ))
         if self._bytes_by_direction['unknown'] > 0:
-            msg += ' u:%.3fMiB)' % (
-                self._bytes_by_direction['unknown'] / 1024. / 1024.
+            msg += ' u:%.0fK)' % (
+                self._bytes_by_direction['unknown'] / 1024.
                 )
         else:
             msg += ')'
@@ -446,7 +446,7 @@
     def log_transport_activity(self, display=False):
         msg = self._format_bytes_by_direction()
         trace.mutter(msg)
-        if display:
+        if display and self._total_byte_count > 0:
             self.clear()
             self._term_file.write(msg + '\n')