← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-07 00:57:24 UTC
  • mfrom: (6405.2.18 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20120207005724-xvfawh5exf1ohusu
(jelmer) Rename Tree.inventory to Tree.root_inventory. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
940
940
        result = []
941
941
        walker = _mod_tree.MultiWalker(self.other_tree, self._lca_trees)
942
942
 
943
 
        base_inventory = self.base_tree.inventory
944
 
        this_inventory = self.this_tree.inventory
 
943
        base_inventory = self.base_tree.root_inventory
 
944
        this_inventory = self.this_tree.root_inventory
945
945
        for path, file_id, other_ie, lca_values in walker.iter_all():
946
946
            # Is this modified at all from any of the other trees?
947
947
            if other_ie is None:
1261
1261
    def merge_names(self, file_id):
1262
1262
        def get_entry(tree):
1263
1263
            if tree.has_id(file_id):
1264
 
                return tree.inventory[file_id]
 
1264
                return tree.root_inventory[file_id]
1265
1265
            else:
1266
1266
                return None
1267
1267
        this_entry = get_entry(self.this_tree)
1940
1940
 
1941
1941
    def _entries_to_incorporate(self):
1942
1942
        """Yields pairs of (inventory_entry, new_parent)."""
1943
 
        other_inv = self.other_tree.inventory
 
1943
        other_inv = self.other_tree.root_inventory
1944
1944
        subdir_id = other_inv.path2id(self._source_subpath)
1945
1945
        if subdir_id is None:
1946
1946
            # XXX: The error would be clearer if it gave the URL of the source