/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/mutabletree.py

  • Committer: Robert Collins
  • Date: 2009-05-23 20:57:12 UTC
  • mfrom: (4371 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4441.
  • Revision ID: robertc@robertcollins.net-20090523205712-lcwbfqk6vwavinuv
Merge .dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""MutableTree object.
18
18
 
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)