/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 object_store.py

Fix compatibility with bzr 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
object_store.py
442
442
                yield self.mapping.BZR_FILE_IDS_FILE, b, None
443
443
        yield "", root_tree, root_ie
444
444
        if not lossy:
445
 
            if getattr(StrictTestament3, "from_revision_tree", None):
446
 
                testament3 = StrictTestament3(rev, tree)
447
 
            else: # bzr < 2.4
448
 
                testament3 = StrictTestament3(rev, tree.inventory)
 
445
            testament3 = StrictTestament3(rev, tree)
449
446
            verifiers = { "testament3-sha1": testament3.as_sha1() }
450
447
        else:
451
448
            verifiers = {}
470
467
        # FIXME JRV 2011-12-15: Shouldn't we try both values for lossy ?
471
468
        for path, obj, ie in self._revision_to_objects(rev, tree, lossy=(not self.mapping.roundtripping)):
472
469
            if isinstance(obj, Commit):
473
 
                if getattr(StrictTestament3, "from_revision_tree", None):
474
 
                    testament3 = StrictTestament3(rev, tree)
475
 
                else: # bzr < 2.4
476
 
                    testament3 = StrictTestament3(rev, tree.inventory)
 
470
                testament3 = StrictTestament3(rev, tree)
477
471
                ie = { "testament3-sha1": testament3.as_sha1() }
478
472
            updater.add_object(obj, ie, path)
479
473
        commit_obj = updater.finish()