← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Andrew Bennetts
  • Date: 2010-10-08 08:15:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101008081514-dviqzrdfwyzsqbz2
Split NEWS into per-release doc/en/release-notes/bzr-*.txt

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
19
19
See MemoryTree for more details.
20
20
"""
21
21
 
22
 
from __future__ import absolute_import
23
22
 
24
23
import os
25
24
 
29
28
    revision as _mod_revision,
30
29
    )
31
30
from bzrlib.decorators import needs_read_lock
32
 
from bzrlib.inventory import Inventory
33
31
from bzrlib.osutils import sha_file
34
32
from bzrlib.mutabletree import needs_tree_write_lock
35
33
from bzrlib.transport.memory import MemoryTransport
36
34
 
37
35
 
38
 
class MemoryTree(mutabletree.MutableInventoryTree):
 
36
class MemoryTree(mutabletree.MutableTree):
39
37
    """A MemoryTree is a specialisation of MutableTree.
40
38
 
41
39
    It maintains nearly no state outside of read_lock and write_lock
51
49
        self._locks = 0
52
50
        self._lock_mode = None
53
51
 
54
 
    def get_config_stack(self):
55
 
        return self.branch.get_config_stack()
56
 
 
57
 
    def is_control_filename(self, filename):
58
 
        # Memory tree doesn't have any control filenames
59
 
        return False
60
 
 
61
52
    @needs_tree_write_lock
62
53
    def _add(self, files, ids, kinds):
63
54
        """See MutableTree._add."""
224
215
            self._parent_ids = []
225
216
        else:
226
217
            self._parent_ids = [self._branch_revision_id]
227
 
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
 
218
        self._inventory = self._basis_tree._inventory._get_mutable_inventory()
228
219
        self._file_transport = MemoryTransport()
229
220
        # TODO copy the revision trees content, or do it lazy, or something.
230
 
        inventory_entries = self._basis_tree.iter_entries_by_dir()
 
221
        inventory_entries = self._inventory.iter_entries()
231
222
        for path, entry in inventory_entries:
232
 
            self._inventory.add(entry.copy())
233
223
            if path == '':
234
224
                continue
235
225
            if entry.kind == 'directory':