← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 01:01:04 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124010104-43ugdvy70ucp34ln
Lots of test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1339
1339
        # being created.
1340
1340
        self._inventory = None
1341
1341
        # generate a delta,
1342
 
        delta = inv._make_delta(self.inventory)
 
1342
        delta = inv._make_delta(self.root_inventory)
1343
1343
        # and apply it.
1344
1344
        self.apply_inventory_delta(delta)
1345
1345
        if had_inventory:
1928
1928
        """Return the revision id for this tree."""
1929
1929
        return self._revision_id
1930
1930
 
1931
 
    def _get_inventory(self):
 
1931
    def _get_root_inventory(self):
1932
1932
        if self._inventory is not None:
1933
1933
            return self._inventory
1934
1934
        self._must_be_locked()
1935
1935
        self._generate_inventory()
1936
1936
        return self._inventory
1937
1937
 
 
1938
    root_inventory = property(_get_root_inventory,
 
1939
                         doc="Inventory of this Tree")
 
1940
 
 
1941
    @deprecated_method(deprecated_in((2, 5, 0)))
 
1942
    def _get_inventory(self):
 
1943
        return self.root_inventory
 
1944
 
1938
1945
    inventory = property(_get_inventory,
1939
1946
                         doc="Inventory of this Tree")
1940
1947