Rev 4917: (mbp) show transport activity even when there's no pb in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4917 [merge]
revision-id: pqm at pqm.ubuntu.com-20091222051149-713jby9bi05y05gr
parent: pqm at pqm.ubuntu.com-20091221215837-thx3t4d1icq41ybx
parent: mbp at sourcefrog.net-20091222040736-079e2r91hea7a40l
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-12-22 05:11:49 +0000
message:
  (mbp) show transport activity even when there's no pb
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/help_topics/en/debug-flags.txt debugflags.txt-20090312050229-rdspqbqq4fzbjtpe-1
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
=== modified file 'NEWS'
--- a/NEWS	2009-12-21 17:25:06 +0000
+++ b/NEWS	2009-12-22 05:11:49 +0000
@@ -39,6 +39,10 @@
 Improvements
 ************
 
+* Transport network activity indicator is shown more of the time when
+  Bazaar is doing network IO.
+  (Martin Pool)
+
 Documentation
 *************
 

=== modified file 'bzrlib/help_topics/en/debug-flags.txt'
--- a/bzrlib/help_topics/en/debug-flags.txt	2009-12-11 21:57:03 +0000
+++ b/bzrlib/help_topics/en/debug-flags.txt	2009-12-22 04:07:36 +0000
@@ -26,6 +26,7 @@
 -Dprogress        Trace progress bar operations.
 -Dmerge           Emit information for debugging merges.
 -Dno_apport       Don't use apport to report crashes.
+-Dno_activity 	  Don't show transport activity indicator in progress bar.
 -Dpack            Emit information about pack operations.
 -Drelock          Emit a message every time a branch or repository object is
                   unlocked then relocked the same way.

=== modified file 'bzrlib/ui/text.py'
--- a/bzrlib/ui/text.py	2009-12-16 10:54:55 +0000
+++ b/bzrlib/ui/text.py	2009-12-22 04:07:36 +0000
@@ -301,7 +301,7 @@
             markers = int(round(float(cols) * completion_fraction)) - 1
             bar_str = '[' + ('#' * markers + spin_str).ljust(cols) + '] '
             return bar_str
-        elif self._last_task.show_spinner:
+        elif (self._last_task is None) or self._last_task.show_spinner:
             # The last task wanted just a spinner, no bar
             spin_str =  r'/-\|'[self._spin_pos % 4]
             self._spin_pos += 1
@@ -372,13 +372,11 @@
         # 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.
+        if 'no_activity' in debug.debug_flags:
+            # Can be used as a workaround if
+            # <https://launchpad.net/bugs/321935> reappears and transport
+            # activity is cluttering other output.  However, thanks to
+            # TextUIOutputStream this shouldn't be a problem any more.
             return
         self._total_byte_count += byte_count
         self._bytes_since_update += byte_count