Rev 4484: (mbp) reduce transport activity droppings in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4484 [merge]
revision-id: pqm at pqm.ubuntu.com-20090626063938-onqktvtp61z5o8ge
parent: pqm at pqm.ubuntu.com-20090626054258-g2uqv0u7c1nwfhe9
parent: mbp at sourcefrog.net-20090626032957-oe91zyznb3aztquu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-06-26 07:39:38 +0100
message:
  (mbp) reduce transport activity droppings
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
=== modified file 'NEWS'
--- a/NEWS	2009-06-26 05:42:58 +0000
+++ b/NEWS	2009-06-26 06:39:38 +0000
@@ -38,6 +38,9 @@
   1.16rc1 (or later) smart server work again.
   (Andrew Bennetts, #388675)
 
+* Avoid progress bar artifacts being left behind on the screen.
+  (Martin Pool, #321935)
+
 * Better message in ``bzr split`` error suggesting a rich root format.
   (Neil Martinsen-Burrell, #220067)
 

=== modified file 'bzrlib/ui/text.py'
--- a/bzrlib/ui/text.py	2009-06-23 07:05:57 +0000
+++ b/bzrlib/ui/text.py	2009-06-26 03:29:57 +0000
@@ -246,6 +246,14 @@
         # XXX: Probably there should be a transport activity model, and that
         # too should be seen by the progress view, rather than being poked in
         # here.
+        if not self._have_output:
+            # As a workaround for <https://launchpad.net/bugs/321935> we only
+            # show transport activity when there's already a progress bar
+            # shown, which time the application code is expected to know to
+            # clear off the progress bar when it's going to send some other
+            # output.  Eventually it would be nice to have that automatically
+            # synchronized.
+            return
         self._total_byte_count += byte_count
         self._bytes_since_update += byte_count
         now = time.time()