← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/vf_repository.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 03:04:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124030458-aj2syolemmi6knri
Fix more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/vf_repository.py
2795
2795
        """
2796
2796
        deltas = []
2797
2797
        # Generate deltas against each tree, to find the shortest.
 
2798
        # FIXME: Support nested trees
2798
2799
        texts_possibly_new_in_tree = set()
2799
2800
        for basis_id, basis_tree in possible_trees:
2800
 
            delta = tree.inventory._make_delta(basis_tree.inventory)
 
2801
            delta = tree.root_inventory._make_delta(basis_tree.root_inventory)
2801
2802
            for old_path, new_path, file_id, new_entry in delta:
2802
2803
                if new_path is None:
2803
2804
                    # This file_id isn't present in the new rev, so we don't
2840
2841
            parents_parents = [key[-1] for key in parents_parents_keys]
2841
2842
            basis_id = _mod_revision.NULL_REVISION
2842
2843
            basis_tree = self.source.revision_tree(basis_id)
2843
 
            delta = parent_tree.inventory._make_delta(basis_tree.inventory)
 
2844
            delta = parent_tree.root_inventory._make_delta(
 
2845
                basis_tree.root_inventory)
2844
2846
            self.target.add_inventory_by_delta(
2845
2847
                basis_id, delta, current_revision_id, parents_parents)
2846
2848
            cache[current_revision_id] = parent_tree
3143
3145
            parent_trees[p_id] = repository.revision_tree(
3144
3146
                                     _mod_revision.NULL_REVISION)
3145
3147
 
3146
 
    inv = revision_tree.inventory
 
3148
    # FIXME: Support nested trees
 
3149
    inv = revision_tree.root_inventory
3147
3150
    entries = inv.iter_entries()
3148
3151
    # backwards compatibility hack: skip the root id.
3149
3152
    if not repository.supports_rich_root():