/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-11-12 17:53:47 UTC
  • mfrom: (6813 trunk)
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171112175347-wovgaqmkbyo8fo7f
Merge trunk.

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()."""
77
85
        missing files, so is a no-op.
78
86
        """
79
87
 
80
 
    def get_file(self, file_id, path=None):
 
88
    def get_file(self, path, file_id=None):
81
89
        """See Tree.get_file."""
82
 
        if path is None:
83
 
            path = self.id2path(file_id)
84
90
        return self._file_transport.get(path)
85
91
 
86
 
    def get_file_sha1(self, file_id, path=None, stat_value=None):
 
92
    def get_file_sha1(self, path, file_id=None, stat_value=None):
87
93
        """See Tree.get_file_sha1()."""
88
 
        if path is None:
89
 
            path = self.id2path(file_id)
90
94
        stream = self._file_transport.get(path)
91
95
        return sha_file(stream)
92
96
 
99
103
            return None, False, None
100
104
        return entry.kind, entry.executable, None
101
105
 
102
 
    @needs_tree_write_lock
103
106
    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)
 
107
        with self.lock_tree_write():
 
108
            file_id = self.path2id(from_rel)
 
109
            to_dir, to_tail = os.path.split(to_rel)
 
110
            to_parent_id = self.path2id(to_dir)
 
111
            self._file_transport.move(from_rel, to_rel)
 
112
            self._inventory.rename(file_id, to_parent_id, to_tail)
109
113
 
110
114
    def path_content_summary(self, path):
111
115
        """See Tree.path_content_summary."""
133
137
            return 0
134
138
        return entry.text_size
135
139
 
136
 
    @needs_read_lock
137
140
    def get_parent_ids(self):
138
141
        """See Tree.get_parent_ids.
139
142
 
140
143
        This implementation returns the current cached value from
141
144
            self._parent_ids.
142
145
        """
143
 
        return list(self._parent_ids)
 
146
        with self.lock_read():
 
147
            return list(self._parent_ids)
144
148
 
145
149
    def has_filename(self, filename):
146
150
        """See Tree.has_filename()."""
147
151
        return self._file_transport.has(filename)
148
152
 
149
 
    def is_executable(self, file_id, path=None):
 
153
    def is_executable(self, path, file_id=None):
150
154
        return self._inventory[file_id].executable
151
155
 
152
156
    def kind(self, file_id):
160
164
        self._file_transport.mkdir(path)
161
165
        return file_id
162
166
 
163
 
    @needs_read_lock
164
167
    def last_revision(self):
165
168
        """See MutableTree.last_revision."""
166
 
        return self._branch_revision_id
 
169
        with self.lock_read():
 
170
            return self._branch_revision_id
167
171
 
168
172
    def lock_read(self):
169
173
        """Lock the memory tree for reading.
176
180
                self.branch.lock_read()
177
181
                self._lock_mode = "r"
178
182
                self._populate_from_branch()
 
183
            return lock.LogicalLockResult(self.unlock)
179
184
        except:
180
185
            self._locks -= 1
181
186
            raise
193
198
        except:
194
199
            self._locks -= 1
195
200
            raise
 
201
        return lock.LogicalLockResult(self.unlock)
196
202
 
197
203
    def lock_write(self):
198
204
        """See MutableTree.lock_write()."""
204
210
                self._populate_from_branch()
205
211
            elif self._lock_mode == "r":
206
212
                raise errors.ReadOnlyError(self)
 
213
            return lock.LogicalLockResult(self.unlock)
207
214
        except:
208
215
            self._locks -= 1
209
216
            raise
215
222
            self._parent_ids = []
216
223
        else:
217
224
            self._parent_ids = [self._branch_revision_id]
218
 
        self._inventory = self._basis_tree._inventory._get_mutable_inventory()
 
225
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
219
226
        self._file_transport = MemoryTransport()
220
227
        # TODO copy the revision trees content, or do it lazy, or something.
221
 
        inventory_entries = self._inventory.iter_entries()
 
228
        inventory_entries = self._basis_tree.iter_entries_by_dir()
222
229
        for path, entry in inventory_entries:
 
230
            self._inventory.add(entry.copy())
223
231
            if path == '':
224
232
                continue
225
233
            if entry.kind == 'directory':
226
234
                self._file_transport.mkdir(path)
227
235
            elif entry.kind == 'file':
228
236
                self._file_transport.put_file(path,
229
 
                    self._basis_tree.get_file(entry.file_id))
 
237
                    self._basis_tree.get_file(path, entry.file_id))
230
238
            else:
231
239
                raise NotImplementedError(self._populate_from_branch)
232
240
 
252
260
        else:
253
261
            self._locks -= 1
254
262
 
255
 
    @needs_tree_write_lock
256
263
    def unversion(self, file_ids):
257
264
        """Remove the file ids in file_ids from the current versioned set.
258
265
 
262
269
        :param file_ids: The file ids to stop versioning.
263
270
        :raises: NoSuchId if any fileid is not currently versioned.
264
271
        """
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)
 
272
        with self.lock_tree_write():
 
273
            # XXX: This should be in mutabletree, but the inventory-save action
 
274
            # is not relevant to memory tree. Until that is done in unlock by
 
275
            # working tree, we cannot share the implementation.
 
276
            for file_id in file_ids:
 
277
                if self._inventory.has_id(file_id):
 
278
                    self._inventory.remove_recursive_id(file_id)
 
279
                else:
 
280
                    raise errors.NoSuchId(self, file_id)
273
281
 
274
282
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
275
283
        """See MutableTree.set_parent_trees()."""
283
291
            self._branch_revision_id = revision_ids[0]
284
292
        self._allow_leftmost_as_ghost = allow_leftmost_as_ghost
285
293
        self._set_basis()
286
 
    
 
294
 
287
295
    def _set_basis(self):
288
296
        try:
289
297
            self._basis_tree = self.branch.repository.revision_tree(