← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Jelmer Vernooij
  • Date: 2009-04-06 02:54:14 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4255.
  • Revision ID: jelmer@samba.org-20090406025414-65tpjwcmjp5wa5oj
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
552
552
        # WorkingTree classes for optimised versions for specific format trees.
553
553
        basis = self.basis_tree()
554
554
        basis.lock_read()
555
 
        inventory = basis.inventory
 
555
        # TODO: Consider re-evaluating the need for this with CHKInventory
 
556
        # we don't strictly need to mutate an inventory for this
 
557
        # it only makes sense when apply_delta is cheaper than get_inventory()
 
558
        inventory = basis.inventory._get_mutable_inventory()
556
559
        basis.unlock()
557
560
        inventory.apply_delta(delta)
558
561
        rev_tree = RevisionTree(self.branch.repository, inventory, new_revid)