← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.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/tree.py
768
768
            yield cur_path
769
769
        # all done.
770
770
 
 
771
    @deprecated_method(deprecated_in((2, 5, 0)))
771
772
    def _get_inventory(self):
772
773
        return self._inventory
773
774
 
774
775
    inventory = property(_get_inventory,
775
776
                         doc="Inventory of this Tree")
776
777
 
 
778
    def _get_root_inventory(self):
 
779
        return self._inventory
 
780
 
 
781
    root_inventory = property(_get_root_inventory,
 
782
        doc="Root inventory of this tree")
 
783
 
777
784
    def _unpack_file_id(self, file_id):
778
785
        """Find the inventory and inventory file id for a tree file id.
779
786
 
784
791
            if len(file_id) != 1:
785
792
                raise ValueError("nested trees not yet supported: %r" % file_id)
786
793
            file_id = file_id[0]
787
 
        return self.inventory, file_id
 
794
        return self.root_inventory, file_id
788
795
 
789
796
    @needs_read_lock
790
797
    def path2id(self, path):
797
804
        :param path: Path to look up
798
805
        :return: tuple with inventory and inventory file id
799
806
        """
800
 
        return self.inventory, self.inventory.path2id(path)
 
807
        # FIXME: Support nested trees
 
808
        return self.root_inventory, self.root_inventory.path2id(path)
801
809
 
802
810
    def id2path(self, file_id):
803
811
        """Return the path for a file id.
852
860
            inventory_file_ids = []
853
861
            for tree_file_id in specific_file_ids:
854
862
                inventory, inv_file_id = self._unpack_file_id(tree_file_id)
855
 
                if not inventory is self.inventory: # for now
 
863
                if not inventory is self.root_inventory: # for now
856
864
                    raise AssertionError("%r != %r" % (
857
 
                        inventory, self.inventory))
 
865
                        inventory, self.root_inventory))
858
866
                inventory_file_ids.append(inv_file_id)
859
 
        return self.inventory.iter_entries_by_dir(
 
867
        # FIXME: Handle nested trees
 
868
        return self.root_inventory.iter_entries_by_dir(
860
869
            specific_file_ids=inventory_file_ids, yield_parents=yield_parents)
861
870
 
862
871
    @deprecated_method(deprecated_in((2, 5, 0)))
1022
1031
            if (self.source.get_symlink_target(file_id) !=
1023
1032
                self.target.get_symlink_target(file_id)):
1024
1033
                changed_content = True
1025
 
            # XXX: Yes, the indentation below is wrong. But fixing it broke
1026
 
            # test_merge.TestMergerEntriesLCAOnDisk.
1027
 
            # test_nested_tree_subtree_renamed_and_modified. We'll wait for
1028
 
            # the fix from bzr.dev -- vila 2009026
1029
 
            elif source_kind == 'tree-reference':
1030
 
                if (self.source.get_reference_revision(file_id, source_path)
1031
 
                    != self.target.get_reference_revision(file_id, target_path)):
 
1034
        elif source_kind == 'tree-reference':
 
1035
            if (self.source.get_reference_revision(file_id, source_path)
 
1036
                != self.target.get_reference_revision(file_id, target_path)):
1032
1037
                    changed_content = True
1033
1038
        parent = (source_parent, target_parent)
1034
1039
        name = (source_name, target_name)
1249
1254
        :param file_id: The file_id to lookup.
1250
1255
        """
1251
1256
        try:
1252
 
            inventory = tree.inventory
 
1257
            inventory = tree.root_inventory
1253
1258
        except NotImplementedError:
1254
1259
            # No inventory available.
1255
1260
            try:
1480
1485
            return (None, None)
1481
1486
        else:
1482
1487
            self._out_of_order_processed.add(file_id)
1483
 
            cur_ie = other_tree.inventory[file_id]
 
1488
            cur_ie = other_tree.root_inventory[file_id]
1484
1489
            return (cur_path, cur_ie)
1485
1490
 
1486
1491
    def iter_all(self):