Merge lp://qastaging/~jelmer/bzr-cvsps-import/deprecated into lp://qastaging/bzr-cvsps-import

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 73
Merged at revision: 70
Proposed branch: lp://qastaging/~jelmer/bzr-cvsps-import/deprecated
Merge into: lp://qastaging/bzr-cvsps-import
Diff against target: 174 lines (+27/-37)
2 files modified
cvsps/importer.py (+3/-13)
test_cvsps_import.py (+24/-24)
To merge this branch: bzr merge lp://qastaging/~jelmer/bzr-cvsps-import/deprecated
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) Approve
Review via email: mp+92016@code.qastaging.launchpad.net

Description of the change

Avoid some methods deprecated in newer versions of bzr:

 * TestCase.failUnlessExists
 * TestCase.failIfExists
 * Branch.revision_history
 * Inventory.__contains__

Call Branch.get_commit_builder() directly rather than going through Repository.get_commit_builder. The API of the latter has changed slightly so it no longer takes a config but rather a config stack object. Branch.get_config_stack() should be sufficiently quick these days; I don't think a slight performance regression with newer versions of bzr-cvsps-import against older versions of bzr should be an issue.

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

I'm going to optimistically merge this, as it's breaking newer versions of bzr and the changes are really trivial.
Post-review comments welcome.

review: Approve

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

to all changes:
to status/vote changes: