← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/v08.py

Merge bzr.dev, update to use new hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v08.py
263
263
 
264
264
        def do_diff(file_id, old_path, new_path, action, force_binary):
265
265
            def tree_lines(tree, require_text=False):
266
 
                if file_id in tree:
 
266
                if tree.has_id(file_id):
267
267
                    tree_file = tree.get_file(file_id)
268
268
                    if require_text is True:
269
269
                        tree_file = text_file(tree_file)
553
553
        testament = StrictTestament.from_revision(repository, revision_id)
554
554
        return testament.as_sha1()
555
555
 
556
 
    def _testament_sha1(self, revision, inventory):
557
 
        return StrictTestament(revision, inventory).as_sha1()
 
556
    def _testament_sha1(self, revision, tree):
 
557
        return StrictTestament(revision, tree).as_sha1()