← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

Merge direct pack access branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
28
28
    revision as _mod_revision,
29
29
    )
30
30
from bzrlib.decorators import needs_read_lock
31
 
from bzrlib.inventory import Inventory
32
31
from bzrlib.osutils import sha_file
33
32
from bzrlib.mutabletree import needs_tree_write_lock
34
33
from bzrlib.transport.memory import MemoryTransport
35
34
 
36
35
 
37
 
class MemoryTree(mutabletree.MutableInventoryTree):
 
36
class MemoryTree(mutabletree.MutableTree):
38
37
    """A MemoryTree is a specialisation of MutableTree.
39
38
 
40
39
    It maintains nearly no state outside of read_lock and write_lock
220
219
            self._parent_ids = []
221
220
        else:
222
221
            self._parent_ids = [self._branch_revision_id]
223
 
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
 
222
        self._inventory = self._basis_tree._inventory._get_mutable_inventory()
224
223
        self._file_transport = MemoryTransport()
225
224
        # TODO copy the revision trees content, or do it lazy, or something.
226
 
        inventory_entries = self._basis_tree.iter_entries_by_dir()
 
225
        inventory_entries = self._inventory.iter_entries()
227
226
        for path, entry in inventory_entries:
228
 
            self._inventory.add(entry.copy())
229
227
            if path == '':
230
228
                continue
231
229
            if entry.kind == 'directory':