← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/vf_repository.py

  • Committer: Patch Queue Manager
  • Date: 2012-01-27 14:28:32 UTC
  • mfrom: (6445.2.6 avoid-inventory)
  • Revision ID: pqm@pqm.ubuntu.com-20120127142832-qcv2y1c3i0mbt9bl
(jelmer) Avoid the use of inventories in a few more places. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/vf_repository.py
604
604
                        _mod_revision.NULL_REVISION))
605
605
        # The basis inventory from a repository 
606
606
        if revtrees:
607
 
            basis_inv = revtrees[0].inventory
 
607
            basis_tree = revtrees[0]
608
608
        else:
609
 
            basis_inv = self.repository.revision_tree(
610
 
                _mod_revision.NULL_REVISION).inventory
 
609
            basis_tree = self.repository.revision_tree(
 
610
                _mod_revision.NULL_REVISION)
 
611
        basis_inv = basis_tree.inventory
611
612
        if len(self.parents) > 0:
612
613
            if basis_revision_id != self.parents[0] and not ghost_basis:
613
614
                raise Exception(
2839
2840
            parents_parents = [key[-1] for key in parents_parents_keys]
2840
2841
            basis_id = _mod_revision.NULL_REVISION
2841
2842
            basis_tree = self.source.revision_tree(basis_id)
2842
 
            delta = parent_tree.inventory._make_delta(basis_tree.inventory)
 
2843
            delta = parent_tree.inventory._make_delta(
 
2844
                basis_tree.inventory)
2843
2845
            self.target.add_inventory_by_delta(
2844
2846
                basis_id, delta, current_revision_id, parents_parents)
2845
2847
            cache[current_revision_id] = parent_tree