← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.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/bundle/bundle_data.py
687
687
        if new_path not in self.patches:
688
688
            # If the entry does not have a patch, then the
689
689
            # contents must be the same as in the base_tree
690
 
            ie = self.base_tree.inventory[file_id]
 
690
            ie = self.base_tree.root_inventory[file_id]
691
691
            if ie.text_size is None:
692
692
                return ie.text_size, ie.text_sha1
693
693
            return int(ie.text_size), ie.text_sha1
701
701
        This need to be called before ever accessing self.inventory
702
702
        """
703
703
        from os.path import dirname, basename
704
 
        base_inv = self.base_tree.inventory
 
704
        base_inv = self.base_tree.root_inventory
705
705
        inv = Inventory(None, self.revision_id)
706
706
 
707
707
        def add_entry(file_id):
748
748
    # at that instant
749
749
    inventory = property(_get_inventory)
750
750
 
 
751
    root_inventory = property(_get_inventory)
 
752
 
751
753
    def __iter__(self):
752
754
        for path, entry in self.inventory.iter_entries():
753
755
            yield entry.file_id