~abentley/bzr/bzr-1.14

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-07 22:23:23 UTC
  • mfrom: (4246.1.3 bzr.1.14)
  • Revision ID: pqm@pqm.ubuntu.com-20090407222323-wj7suiz9p413eflm
(tanner) land brisbane-core in safest possible way (Vincent Ladeuil,
        Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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)