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

  • Committer: Jelmer Vernooij
  • Date: 2017-09-06 04:15:55 UTC
  • mfrom: (6754.8.21 lock-context-2)
  • Revision ID: jelmer@jelmer.uk-20170906041555-jtr5qxli38167gc6
Merge lp:~jelmer/brz/lock-context-2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/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
 
from bzrlib import (
 
26
from . import (
26
27
    errors,
27
 
    mutabletree,
 
28
    lock,
28
29
    revision as _mod_revision,
29
30
    )
30
 
from bzrlib.decorators import needs_read_lock
31
 
from bzrlib.osutils import sha_file
32
 
from bzrlib.mutabletree import needs_tree_write_lock
33
 
from bzrlib.transport.memory import MemoryTransport
34
 
 
35
 
 
36
 
class MemoryTree(mutabletree.MutableTree):
 
31
from .bzr.inventory import Inventory
 
32
from .bzr.inventorytree import MutableInventoryTree
 
33
from .osutils import sha_file
 
34
from .transport.memory import MemoryTransport
 
35
 
 
36
 
 
37
class MemoryTree(MutableInventoryTree):
37
38
    """A MemoryTree is a specialisation of MutableTree.
38
39
 
39
40
    It maintains nearly no state outside of read_lock and write_lock
44
45
    def __init__(self, branch, revision_id):
45
46
        """Construct a MemoryTree for branch using revision_id."""
46
47
        self.branch = branch
47
 
        self.bzrdir = branch.bzrdir
 
48
        self.controldir = branch.controldir
48
49
        self._branch_revision_id = revision_id
49
50
        self._locks = 0
50
51
        self._lock_mode = None
51
52
 
52
 
    @needs_tree_write_lock
 
53
    def get_config_stack(self):
 
54
        return self.branch.get_config_stack()
 
55
 
 
56
    def is_control_filename(self, filename):
 
57
        # Memory tree doesn't have any control filenames
 
58
        return False
 
59
 
53
60
    def _add(self, files, ids, kinds):
54
61
        """See MutableTree._add."""
55
 
        for f, file_id, kind in zip(files, ids, kinds):
56
 
            if kind is None:
57
 
                kind = 'file'
58
 
            if file_id is None:
59
 
                self._inventory.add_path(f, kind=kind)
60
 
            else:
61
 
                self._inventory.add_path(f, kind=kind, file_id=file_id)
 
62
        with self.lock_tree_write():
 
63
            for f, file_id, kind in zip(files, ids, kinds):
 
64
                if kind is None:
 
65
                    kind = 'file'
 
66
                if file_id is None:
 
67
                    self._inventory.add_path(f, kind=kind)
 
68
                else:
 
69
                    self._inventory.add_path(f, kind=kind, file_id=file_id)
62
70
 
63
71
    def basis_tree(self):
64
72
        """See Tree.basis_tree()."""
99
107
            return None, False, None
100
108
        return entry.kind, entry.executable, None
101
109
 
102
 
    @needs_tree_write_lock
103
110
    def rename_one(self, from_rel, to_rel):
104
 
        file_id = self.path2id(from_rel)
105
 
        to_dir, to_tail = os.path.split(to_rel)
106
 
        to_parent_id = self.path2id(to_dir)
107
 
        self._file_transport.move(from_rel, to_rel)
108
 
        self._inventory.rename(file_id, to_parent_id, to_tail)
 
111
        with self.lock_tree_write():
 
112
            file_id = self.path2id(from_rel)
 
113
            to_dir, to_tail = os.path.split(to_rel)
 
114
            to_parent_id = self.path2id(to_dir)
 
115
            self._file_transport.move(from_rel, to_rel)
 
116
            self._inventory.rename(file_id, to_parent_id, to_tail)
109
117
 
110
118
    def path_content_summary(self, path):
111
119
        """See Tree.path_content_summary."""
133
141
            return 0
134
142
        return entry.text_size
135
143
 
136
 
    @needs_read_lock
137
144
    def get_parent_ids(self):
138
145
        """See Tree.get_parent_ids.
139
146
 
140
147
        This implementation returns the current cached value from
141
148
            self._parent_ids.
142
149
        """
143
 
        return list(self._parent_ids)
 
150
        with self.lock_read():
 
151
            return list(self._parent_ids)
144
152
 
145
153
    def has_filename(self, filename):
146
154
        """See Tree.has_filename()."""
160
168
        self._file_transport.mkdir(path)
161
169
        return file_id
162
170
 
163
 
    @needs_read_lock
164
171
    def last_revision(self):
165
172
        """See MutableTree.last_revision."""
166
 
        return self._branch_revision_id
 
173
        with self.lock_read():
 
174
            return self._branch_revision_id
167
175
 
168
176
    def lock_read(self):
169
177
        """Lock the memory tree for reading.
176
184
                self.branch.lock_read()
177
185
                self._lock_mode = "r"
178
186
                self._populate_from_branch()
 
187
            return lock.LogicalLockResult(self.unlock)
179
188
        except:
180
189
            self._locks -= 1
181
190
            raise
193
202
        except:
194
203
            self._locks -= 1
195
204
            raise
 
205
        return lock.LogicalLockResult(self.unlock)
196
206
 
197
207
    def lock_write(self):
198
208
        """See MutableTree.lock_write()."""
204
214
                self._populate_from_branch()
205
215
            elif self._lock_mode == "r":
206
216
                raise errors.ReadOnlyError(self)
 
217
            return lock.LogicalLockResult(self.unlock)
207
218
        except:
208
219
            self._locks -= 1
209
220
            raise
215
226
            self._parent_ids = []
216
227
        else:
217
228
            self._parent_ids = [self._branch_revision_id]
218
 
        self._inventory = self._basis_tree._inventory._get_mutable_inventory()
 
229
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
219
230
        self._file_transport = MemoryTransport()
220
231
        # TODO copy the revision trees content, or do it lazy, or something.
221
 
        inventory_entries = self._inventory.iter_entries()
 
232
        inventory_entries = self._basis_tree.iter_entries_by_dir()
222
233
        for path, entry in inventory_entries:
 
234
            self._inventory.add(entry.copy())
223
235
            if path == '':
224
236
                continue
225
237
            if entry.kind == 'directory':
252
264
        else:
253
265
            self._locks -= 1
254
266
 
255
 
    @needs_tree_write_lock
256
267
    def unversion(self, file_ids):
257
268
        """Remove the file ids in file_ids from the current versioned set.
258
269
 
262
273
        :param file_ids: The file ids to stop versioning.
263
274
        :raises: NoSuchId if any fileid is not currently versioned.
264
275
        """
265
 
        # XXX: This should be in mutabletree, but the inventory-save action
266
 
        # is not relevant to memory tree. Until that is done in unlock by
267
 
        # working tree, we cannot share the implementation.
268
 
        for file_id in file_ids:
269
 
            if self._inventory.has_id(file_id):
270
 
                self._inventory.remove_recursive_id(file_id)
271
 
            else:
272
 
                raise errors.NoSuchId(self, file_id)
 
276
        with self.lock_tree_write():
 
277
            # XXX: This should be in mutabletree, but the inventory-save action
 
278
            # is not relevant to memory tree. Until that is done in unlock by
 
279
            # working tree, we cannot share the implementation.
 
280
            for file_id in file_ids:
 
281
                if self._inventory.has_id(file_id):
 
282
                    self._inventory.remove_recursive_id(file_id)
 
283
                else:
 
284
                    raise errors.NoSuchId(self, file_id)
273
285
 
274
286
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
275
287
        """See MutableTree.set_parent_trees()."""
283
295
            self._branch_revision_id = revision_ids[0]
284
296
        self._allow_leftmost_as_ghost = allow_leftmost_as_ghost
285
297
        self._set_basis()
286
 
    
 
298
 
287
299
    def _set_basis(self):
288
300
        try:
289
301
            self._basis_tree = self.branch.repository.revision_tree(