Merge lp:~mbp/bzr/321935-quick into lp:~bzr/bzr/trunk-old

[Martin Pool]

[Martin Pool (mbp)]

An easy simple fix for this bug. Thanks for insisting on doing it the easy way, lifeless!

[Martin Pool (mbp)]

Note that the other activity changes re scheme and direction are lp:mad incorrectly including my previous merge to trunk

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> Note that the other activity changes re scheme and direction are lp:mad incorrectly including my previous merge to trunk

Mutually Assured Destruction?

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkpES9wACgkQJdeBCYSNAAM7CACgkPfQOrxoahB8wpkxxNfzdlzj
i+wAoKryhS4iobMCbj35sJDpdKswTl7V
=5WWv
-----END PGP SIGNATURE-----

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> Note that the other activity changes re scheme and direction are lp:mad incorrectly including my previous merge to trunk

lp:mad generates "diff against target", a merge --dry-run diff, and
updates it whenever source or target changes.

The review diff, which in this case includes your previous merge, is a
"diff -r ancestor:" diff, and is never updated.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkpETA8ACgkQ0F+nu1YWqI1qPgCfUzL8CbGyFIoKD5gZw4RoC81/
psgAnjqEJ9P2OI0o1aVbS7CIuFkqQsOQ
=6Hxa
-----END PGP SIGNATURE-----

[Aaron Bentley (abentley)]

> > Note that the other activity changes re scheme and direction are lp:mad
> incorrectly including my previous merge to trunk
>
> Mutually Assured Destruction?

Merge Analysis Daemon.

=== modified file 'NEWS'
--- NEWS	2009-06-26 01:35:26 +0000
+++ NEWS	2009-06-26 05:35:15 +0000
@@ -29,6 +29,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'
--- bzrlib/ui/text.py	2009-06-23 07:05:57 +0000
+++ bzrlib/ui/text.py	2009-06-26 05:35:15 +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()