bzr-builddeb

Merge lp://staging/~jameinel/bzr-builddeb/no_revision_history into lp://staging/bzr-builddeb

  1. no_revision_history
  2. Merge into trunk
Proposed by John A Meinel
Status: Merged
Merged at revision: 640
Proposed branch: lp://staging/~jameinel/bzr-builddeb/no_revision_history
Merge into: lp://staging/bzr-builddeb
Diff against target: 382 lines (+87/-73)
3 files modified
tests/blackbox/test_import_dsc.py (+2/-2)
tests/test_import_dsc.py (+81/-67)
tests/test_merge_package.py (+4/-4)
To merge this branch: bzr merge lp://staging/~jameinel/bzr-builddeb/no_revision_history
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+81149@code.staging.launchpad.net

Commit message

Don't use Branch.revision_history() in the test suite. It is deprecated in bzr-2.5

Description of the change

This fixes bug #885690. We deprecated 'Branch.revision_history' in bzr-2.5 and that causes *lots* of test stipple for bzr-builddeb.

I tried to fix as many of them as possible to use branch.last_revision/last_revision_info/revno, as most of them just needed the tip, or were asserting the length of the history, etc.

For some of them, I did go ahead and use the test_fetch approach, copying the 'revision_history(branch)' helper and translating the calls as appropriate.

This should be mostly mechanical, but you may want to read some of it closely to make sure I didn't change the meaning of any tests.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

I also had a branch which fixed some of these but that I hadn't proposed for merging yet...

Anyway, yours is more thorough so let's merge that.

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

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

On 11/03/2011 03:25 PM, Jelmer Vernooij wrote:
> Review: Approve
>
> I also had a branch which fixed some of these but that I hadn't
> proposed for merging yet...
>
> Anyway, yours is more thorough so let's merge that.

I can't commit directly. Can you land it?

John
=:->

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

iEYEARECAAYFAk6ysTcACgkQJdeBCYSNAAPQ+gCfaNz8bYQS5XyGTp/Wc+Hvxh9p
nQ0AoLwqGqttkV08vx+Yx2NK6Sf6kCs3
=vVoL
-----END PGP SIGNATURE-----

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.

Subscribers

People subscribed via source and target branches