/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to fetch.py

Fix compatibility with bzr 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch.py
57
57
from bzrlib.revision import (
58
58
    NULL_REVISION,
59
59
    )
60
 
try:
61
 
    from bzrlib.revisiontree import InventoryRevisionTree
62
 
except ImportError: # bzr < 2.4
63
 
    from bzrlib.revisiontree import RevisionTree as InventoryRevisionTree
 
60
from bzrlib.revisiontree import InventoryRevisionTree
64
61
from bzrlib.testament import (
65
62
    StrictTestament3,
66
63
    )
420
417
    ret_tree = InventoryRevisionTree(repo, inv, rev.revision_id)
421
418
    # Check verifiers
422
419
    if verifiers and roundtrip_revid is not None:
423
 
        if getattr(StrictTestament3, "from_revision_tree", None):
424
 
            testament = StrictTestament3(rev, ret_tree)
425
 
        else: # bzr < 2.4
426
 
            testament = StrictTestament3(rev, inv)
 
420
        testament = StrictTestament3(rev, ret_tree)
427
421
        calculated_verifiers = { "testament3-sha1": testament.as_sha1() }
428
422
        if calculated_verifiers != verifiers:
429
423
            trace.mutter("Testament SHA1 %r for %r did not match %r.",