Rev 4480: (mbp) remove transport protocol and direction from progress bars in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4480 [merge]
revision-id: pqm at pqm.ubuntu.com-20090626023505-qxubv38s4gmcsp3a
parent: pqm at pqm.ubuntu.com-20090625225119-6utuistk3u69r92w
parent: mbp at sourcefrog.net-20090626013526-r4ey711ukegccth6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-06-26 03:35:05 +0100
message:
  (mbp) remove transport protocol and direction from progress bars
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
=== modified file 'NEWS'
--- a/NEWS	2009-06-25 17:36:29 +0000
+++ b/NEWS	2009-06-26 01:35:26 +0000
@@ -65,6 +65,8 @@
 * Unshelve works correctly when multiple zero-length files are present on
   the shelf. (Aaron Bentley, #363444)
 
+* Progress bars no longer show the network transport scheme or direction.
+  (Martin Pool)
 
 Internals
 *********

=== modified file 'bzrlib/ui/text.py'
--- a/bzrlib/ui/text.py	2009-06-17 05:03:18 +0000
+++ b/bzrlib/ui/text.py	2009-06-23 07:05:57 +0000
@@ -138,6 +138,7 @@
         # true when there's output on the screen we may need to clear
         self._have_output = False
         # XXX: We could listen for SIGWINCH and update the terminal width...
+        # https://launchpad.net/bugs/316357
         self._width = osutils.terminal_width()
         self._last_transport_msg = ''
         self._spin_pos = 0
@@ -254,19 +255,10 @@
             # guard against clock stepping backwards, and don't update too
             # often
             rate = self._bytes_since_update / (now - self._transport_update_time)
-            scheme = getattr(transport, '_scheme', None) or repr(transport)
-            if direction == 'read':
-                dir_char = '>'
-            elif direction == 'write':
-                dir_char = '<'
-            else:
-                dir_char = ' '
-            msg = ("%.7s %s %6dKB %5dKB/s" %
-                    (scheme, dir_char, self._total_byte_count>>10, int(rate)>>10,))
+            msg = ("%6dKB %5dKB/s" %
+                    (self._total_byte_count>>10, int(rate)>>10,))
             self._transport_update_time = now
             self._last_repaint = now
             self._bytes_since_update = 0
             self._last_transport_msg = msg
             self._repaint()
-
-