Bazaar

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

  1. 321935-quick
  2. Merge into trunk-old
Proposed by Martin Pool
Status: Merged
Approved by: Robert Collins
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://staging/~mbp/bzr/321935-quick
Merge into: lp://staging/~bzr/bzr/trunk-old
Diff against target: 32 lines
To merge this branch: bzr merge lp://staging/~mbp/bzr/321935-quick
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+7921@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

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

Revision history for this message
Martin Pool (mbp) wrote :

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

Revision history for this message
John A Meinel (jameinel) wrote :

-----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-----

Revision history for this message
Aaron Bentley (abentley) wrote :

-----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-----

Revision history for this message
Aaron Bentley (abentley) wrote :

> > 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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2009-06-26 01:35:26 +0000
3+++ NEWS 2009-06-26 05:35:15 +0000
4@@ -29,6 +29,9 @@
5 1.16rc1 (or later) smart server work again.
6 (Andrew Bennetts, #388675)
7
8+* Avoid progress bar artifacts being left behind on the screen.
9+ (Martin Pool, #321935)
10+
11 * Better message in ``bzr split`` error suggesting a rich root format.
12 (Neil Martinsen-Burrell, #220067)
13
14
15=== modified file 'bzrlib/ui/text.py'
16--- bzrlib/ui/text.py 2009-06-23 07:05:57 +0000
17+++ bzrlib/ui/text.py 2009-06-26 05:35:15 +0000
18@@ -246,6 +246,14 @@
19 # XXX: Probably there should be a transport activity model, and that
20 # too should be seen by the progress view, rather than being poked in
21 # here.
22+ if not self._have_output:
23+ # As a workaround for <https://launchpad.net/bugs/321935> we only
24+ # show transport activity when there's already a progress bar
25+ # shown, which time the application code is expected to know to
26+ # clear off the progress bar when it's going to send some other
27+ # output. Eventually it would be nice to have that automatically
28+ # synchronized.
29+ return
30 self._total_byte_count += byte_count
31 self._bytes_since_update += byte_count
32 now = time.time()