← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

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