← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Patch Queue Manager
  • Date: 2012-03-16 14:15:06 UTC
  • mfrom: (6503.3.1 typo-fix)
  • Revision ID: pqm@pqm.ubuntu.com-20120316141506-30gdc3wkbgmwkdus
(jelmer) Fix a typo: extention -> extension. (Jelmer Vernooij)

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
22
23
 
23
24
import os
24
25
 
25
26
from bzrlib import (
26
27
    errors,
27
28
    mutabletree,
28
 
    osutils,
29
29
    revision as _mod_revision,
30
30
    )
31
 
from bzrlib.decorators import needs_read_lock, needs_write_lock
 
31
from bzrlib.decorators import needs_read_lock
 
32
from bzrlib.inventory import Inventory
32
33
from bzrlib.osutils import sha_file
33
34
from bzrlib.mutabletree import needs_tree_write_lock
34
35
from bzrlib.transport.memory import MemoryTransport
35
36
 
36
37
 
37
 
class MemoryTree(mutabletree.MutableTree):
 
38
class MemoryTree(mutabletree.MutableInventoryTree):
38
39
    """A MemoryTree is a specialisation of MutableTree.
39
40
 
40
41
    It maintains nearly no state outside of read_lock and write_lock
50
51
        self._locks = 0
51
52
        self._lock_mode = None
52
53
 
 
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
 
53
61
    @needs_tree_write_lock
54
62
    def _add(self, files, ids, kinds):
55
63
        """See MutableTree._add."""
216
224
            self._parent_ids = []
217
225
        else:
218
226
            self._parent_ids = [self._branch_revision_id]
219
 
        self._inventory = self._basis_tree._inventory._get_mutable_inventory()
 
227
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
220
228
        self._file_transport = MemoryTransport()
221
229
        # TODO copy the revision trees content, or do it lazy, or something.
222
 
        inventory_entries = self._inventory.iter_entries()
 
230
        inventory_entries = self._basis_tree.iter_entries_by_dir()
223
231
        for path, entry in inventory_entries:
 
232
            self._inventory.add(entry.copy())
224
233
            if path == '':
225
234
                continue
226
235
            if entry.kind == 'directory':