Merge lp://staging/~mbp/bzr/progress into lp://staging/bzr

Proposed by Martin Pool
Status: Rejected
Rejected by: Martin Pool
Proposed branch: lp://staging/~mbp/bzr/progress
Merge into: lp://staging/bzr
Diff against target: 559 lines (+184/-100)
10 files modified
NEWS (+22/-0)
bzrlib/branch.py (+4/-0)
bzrlib/errors.py (+16/-8)
bzrlib/help_topics/en/patterns.txt (+14/-4)
bzrlib/progress.py (+0/-22)
bzrlib/tests/blackbox/test_commit.py (+16/-0)
bzrlib/tests/test_errors.py (+34/-1)
bzrlib/tests/test_progress.py (+37/-4)
bzrlib/tests/test_ui.py (+4/-48)
bzrlib/ui/text.py (+37/-13)
To merge this branch: bzr merge lp://staging/~mbp/bzr/progress
Reviewer Review Type Date Requested Status
John A Meinel Needs Fixing
bzr-core Pending
Review via email: mp+29605@code.staging.launchpad.net

Commit message

Truncate progress messages rather than counters

Description of the change

* Truncate the description rather than the counter, so that you don't get misleading numbers.

* Put the spinner (or bar) between the transport activity and the current progress task, so we don't have two '|' on the line, one of them apparently stuck.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

sent to pqm by email

Revision history for this message
John A Meinel (jameinel) wrote :
Download full text (3.4 KiB)

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

Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/progress into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #388266 many uses of DummyProgress are unnecessary
> https://bugs.launchpad.net/bugs/388266
>
>
> * Truncate the description rather than the counter, so that you don't get misleading numbers.
>
> * Put the spinner (or bar) between the transport activity and the current progress task, so we don't have two '|' on the line, one of them apparently stuck.
>

Failing in PQM with:

> ======================================================================
> FAIL: bzrlib.tests.test_ui.TestTextUIFactory.test_progress_note_clears
> ----------------------------------------------------------------------
> _StringException: Text attachment: log
> ------------
> 4446.457 Deprecated method called
> Called from:
> File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/tests/test_ui.py", line 138, in test_progress_n
> ote_clears
> pb.note, 't')
> File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/tests/__init__.py", line 1389, in applyDeprecat
> ed
> call_warnings, result = self._capture_deprecation_warnings(a_callable,
> File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/tests/__init__.py", line 1357, in _capture_depr
> ecation_warnings
> result = a_callable(*args, **kwargs)
> File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/symbol_versioning.py", line 132, in decorated_m
> ethod
> trace.mutter_callsite(4, "Deprecated method called")
> ------------
> Text attachment: traceback
> ------------
> Traceback (most recent call last):
> File "/usr/lib/python2.4/site-packages/testtools/runtest.py", line 128, in _run_user
> return fn(*args)
> File "/usr/lib/python2.4/site-packages/testtools/testcase.py", line 368, in _run_test_method
> testMethod()
> File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/tests/test_ui.py", line 144, in test_progress_n
> ote_clears
> self.assertContainsRe(stderr.getvalue(), r'\r {10,}\r$')
> AssertionError: pattern "\r {10,}\r$" not found in
> """\
> """ 1/1
>
> ------------
>
>
> ======================================================================
> FAIL: bzrlib.tests.test_ui.TestTextUIFactory.test_text_factory_prompts_and_clears
> ----------------------------------------------------------------------
> _StringException: Text attachment: log
> ------------
>
> ------------
> Text attachment: traceback
> ------------
> Traceback (most recent call last):
> File "/usr/lib/python2.4/site-packages/testtools/runtest.py", line 128, in _run_user
> return fn(*args)
> File "/usr/lib/python2.4/site-packages/testtools/testcase.py", line 368, in _run_test_method
> testMethod()
> File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/tests/test_ui.py", line 208, in test_text_facto
> ry_prompts_and_clears
> "foo *\r\r *\r*")
> *" not found in pattern "foo *
> """\
> what do you want? [y/n]: what do you want? [y/n]: """
>
> ------------
>
>
> ----------------------------------------------------------------------
> Ran 45 tests in 6.348s
>
> FAILED (failures=2)

John
=:->

-----BEGIN P...

Read more...

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

Failing in PQM as sent.

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

thanks for submitting it, I'll look into those failures

--
Martin

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

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

Martin Pool wrote:
> thanks for submitting it, I'll look into those failures
>

Yeah, I was trying to get it into 2.2b4, since it is sort of an api
change (at least a visual one to the user). It is probably ok to land
between 2.2b4 and 2.2rc1, but I had hoped to not have to think about
that. :)

Speaking of which MergeIntoMerger... should that be pushed back to 2.3?

John
=:->

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

iEYEARECAAYFAkw5ifAACgkQJdeBCYSNAANHgwCgkEu4oRPpIMpf/sW4yjP+8lPx
e6oAnjwZjH63WvldPJKvpVU646KJC7LP
=CMbD
-----END PGP SIGNATURE-----

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

On 11 July 2010 11:10, John A Meinel <email address hidden> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Martin Pool wrote:
>> thanks for submitting it, I'll look into those failures
>>
>
> Yeah, I was trying to get it into 2.2b4, since it is sort of an api
> change (at least a visual one to the user). It is probably ok to land
> between 2.2b4 and 2.2rc1, but I had hoped to not have to think about
> that. :)

I think fairly small cosmetic ui changes are ok, certainly before the
2.2.0 release.

> Speaking of which MergeIntoMerger... should that be pushed back to 2.3?

From my memory of the type of changes, it seems like it may break some
plugins. Perhaps if we test the likely suspects and find that it
doesn't...

--
Martin

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

Unmerged revisions

5809. By Martin Pool

Just testing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.