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

  • Committer: Vincent Ladeuil
  • Date: 2012-01-18 14:09:19 UTC
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120118140919-rlvdrhpc0nq1lbwi
Change set/remove to require a lock for the branch config files.

This means that tests (or any plugin for that matter) do not requires an
explicit lock on the branch anymore to change a single option. This also
means the optimisation becomes "opt-in" and as such won't be as
spectacular as it may be and/or harder to get right (nothing fails
anymore).

This reduces the diff by ~300 lines.

Code/tests that were updating more than one config option is still taking
a lock to at least avoid some IOs and demonstrate the benefits through
the decreased number of hpss calls.

The duplication between BranchStack and BranchOnlyStack will be removed
once the same sharing is in place for local config files, at which point
the Stack class itself may be able to host the changes.

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 is_control_filename(self, filename):
 
55
        # Memory tree doesn't have any control filenames
 
56
        return False
 
57
 
52
58
    @needs_tree_write_lock
53
59
    def _add(self, files, ids, kinds):
54
60
        """See MutableTree._add."""
215
221
            self._parent_ids = []
216
222
        else:
217
223
            self._parent_ids = [self._branch_revision_id]
218
 
        self._inventory = self._basis_tree._inventory._get_mutable_inventory()
 
224
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
219
225
        self._file_transport = MemoryTransport()
220
226
        # TODO copy the revision trees content, or do it lazy, or something.
221
 
        inventory_entries = self._inventory.iter_entries()
 
227
        inventory_entries = self._basis_tree.iter_entries_by_dir()
222
228
        for path, entry in inventory_entries:
 
229
            self._inventory.add(entry.copy())
223
230
            if path == '':
224
231
                continue
225
232
            if entry.kind == 'directory':