/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 00:16:15 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124001615-ru3uwevs9d48kxcn
Add root_inventory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
68
68
    realpath,
69
69
    safe_unicode,
70
70
    )
 
71
from bzrlib.symbol_versioning import (
 
72
    deprecated_in,
 
73
    deprecated_method,
 
74
    )
71
75
from bzrlib.transport.local import LocalTransport
72
76
from bzrlib.tree import (
73
77
    InterTree,
415
419
                return link_or_sha1
416
420
        return None
417
421
 
418
 
    def _get_inventory(self):
 
422
    def _get_root_inventory(self):
419
423
        """Get the inventory for the tree. This is only valid within a lock."""
420
424
        if 'evil' in debug.debug_flags:
421
425
            trace.mutter_callsite(2,
426
430
        self._generate_inventory()
427
431
        return self._inventory
428
432
 
 
433
    @deprecated_method(deprecated_in((2, 5, 0)))
 
434
    def _get_inventory(self):
 
435
        return self.root_inventory
 
436
 
429
437
    inventory = property(_get_inventory,
430
438
                         doc="Inventory of this Tree")
431
439
 
 
440
    root_inventory = property(_get_root_inventory,
 
441
        "Root inventory of this tree")
 
442
 
432
443
    @needs_read_lock
433
444
    def get_parent_ids(self):
434
445
        """See Tree.get_parent_ids.
1150
1161
                # _make_delta if we can't get the RevisionTree
1151
1162
                pass
1152
1163
            else:
1153
 
                delta = rev_tree.inventory._make_delta(basis_tree.inventory)
 
1164
                delta = rev_tree.root_inventory._make_delta(
 
1165
                    basis_tree.root_inventory)
1154
1166
                dirstate.update_basis_by_delta(delta, rev_id)
1155
1167
                updated = True
1156
1168
        if not updated: