/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: 2019-02-04 01:01:24 UTC
  • mto: This revision was merged to the branch mainline in revision 7268.
  • Revision ID: jelmer@jelmer.uk-20190204010124-ni0i4qc6f5tnbvux
Fix source tests.

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):
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, 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."""
112
116
        id = self.path2id(path)
113
117
        if id is None:
114
118
            return 'missing', None, None, None
115
 
        kind = self.kind(id)
 
119
        kind = self.kind(path, id)
116
120
        if kind == 'file':
117
121
            bytes = self._file_transport.get_bytes(path)
118
122
            size = len(bytes)
119
123
            executable = self._inventory[id].executable
120
 
            sha1 = None # no stat cache
 
124
            sha1 = None  # no stat cache
121
125
            return (kind, size, executable, sha1)
122
126
        elif kind == 'directory':
123
127
            # memory tree does not support nested trees yet.
127
131
        else:
128
132
            raise NotImplementedError('unknown kind')
129
133
 
130
 
    def _file_size(self, entry, stat_value):
131
 
        """See Tree._file_size."""
132
 
        if entry is None:
133
 
            return 0
134
 
        return entry.text_size
135
 
 
136
 
    @needs_read_lock
137
134
    def get_parent_ids(self):
138
135
        """See Tree.get_parent_ids.
139
136
 
140
137
        This implementation returns the current cached value from
141
138
            self._parent_ids.
142
139
        """
143
 
        return list(self._parent_ids)
 
140
        with self.lock_read():
 
141
            return list(self._parent_ids)
144
142
 
145
143
    def has_filename(self, filename):
146
144
        """See Tree.has_filename()."""
147
145
        return self._file_transport.has(filename)
148
146
 
149
 
    def is_executable(self, file_id, path=None):
150
 
        return self._inventory[file_id].executable
 
147
    def is_executable(self, path):
 
148
        return self._inventory.get_entry_by_path(path).executable
151
149
 
152
 
    def kind(self, file_id):
 
150
    def kind(self, path):
 
151
        file_id = self.path2id(path)
153
152
        return self._inventory[file_id].kind
154
153
 
155
154
    def mkdir(self, path, file_id=None):
160
159
        self._file_transport.mkdir(path)
161
160
        return file_id
162
161
 
163
 
    @needs_read_lock
164
162
    def last_revision(self):
165
163
        """See MutableTree.last_revision."""
166
 
        return self._branch_revision_id
 
164
        with self.lock_read():
 
165
            return self._branch_revision_id
167
166
 
168
167
    def lock_read(self):
169
168
        """Lock the memory tree for reading.
176
175
                self.branch.lock_read()
177
176
                self._lock_mode = "r"
178
177
                self._populate_from_branch()
179
 
        except:
 
178
            return lock.LogicalLockResult(self.unlock)
 
179
        except BaseException:
180
180
            self._locks -= 1
181
181
            raise
182
182
 
190
190
                self._populate_from_branch()
191
191
            elif self._lock_mode == "r":
192
192
                raise errors.ReadOnlyError(self)
193
 
        except:
 
193
        except BaseException:
194
194
            self._locks -= 1
195
195
            raise
 
196
        return lock.LogicalLockResult(self.unlock)
196
197
 
197
198
    def lock_write(self):
198
199
        """See MutableTree.lock_write()."""
204
205
                self._populate_from_branch()
205
206
            elif self._lock_mode == "r":
206
207
                raise errors.ReadOnlyError(self)
207
 
        except:
 
208
            return lock.LogicalLockResult(self.unlock)
 
209
        except BaseException:
208
210
            self._locks -= 1
209
211
            raise
210
212
 
215
217
            self._parent_ids = []
216
218
        else:
217
219
            self._parent_ids = [self._branch_revision_id]
218
 
        self._inventory = self._basis_tree._inventory._get_mutable_inventory()
 
220
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
219
221
        self._file_transport = MemoryTransport()
220
222
        # TODO copy the revision trees content, or do it lazy, or something.
221
 
        inventory_entries = self._inventory.iter_entries()
 
223
        inventory_entries = self._basis_tree.iter_entries_by_dir()
222
224
        for path, entry in inventory_entries:
 
225
            self._inventory.add(entry.copy())
223
226
            if path == '':
224
227
                continue
225
228
            if entry.kind == 'directory':
226
229
                self._file_transport.mkdir(path)
227
230
            elif entry.kind == 'file':
228
 
                self._file_transport.put_file(path,
229
 
                    self._basis_tree.get_file(entry.file_id))
 
231
                self._file_transport.put_file(
 
232
                    path, self._basis_tree.get_file(path))
230
233
            else:
231
234
                raise NotImplementedError(self._populate_from_branch)
232
235
 
233
 
    def put_file_bytes_non_atomic(self, file_id, bytes):
 
236
    def put_file_bytes_non_atomic(self, path, bytes):
234
237
        """See MutableTree.put_file_bytes_non_atomic."""
235
 
        self._file_transport.put_bytes(self.id2path(file_id), bytes)
 
238
        self._file_transport.put_bytes(path, bytes)
236
239
 
237
240
    def unlock(self):
238
241
        """Release a lock.
252
255
        else:
253
256
            self._locks -= 1
254
257
 
255
 
    @needs_tree_write_lock
256
 
    def unversion(self, file_ids):
257
 
        """Remove the file ids in file_ids from the current versioned set.
 
258
    def unversion(self, paths):
 
259
        """Remove the paths from the current versioned set.
258
260
 
259
261
        When a file_id is unversioned, all of its children are automatically
260
262
        unversioned.
261
263
 
262
 
        :param file_ids: The file ids to stop versioning.
 
264
        :param paths: The paths to stop versioning.
263
265
        :raises: NoSuchId if any fileid is not currently versioned.
264
266
        """
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)
 
267
        with self.lock_tree_write():
 
268
            # XXX: This should be in mutabletree, but the inventory-save action
 
269
            # is not relevant to memory tree. Until that is done in unlock by
 
270
            # working tree, we cannot share the implementation.
 
271
            file_ids = set()
 
272
            for path in paths:
 
273
                file_id = self.path2id(path)
 
274
                if file_id is None:
 
275
                    raise errors.NoSuchFile(path)
 
276
                file_ids.add(file_id)
 
277
            for file_id in file_ids:
 
278
                if self._inventory.has_id(file_id):
 
279
                    self._inventory.remove_recursive_id(file_id)
273
280
 
274
281
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
275
282
        """See MutableTree.set_parent_trees()."""
283
290
            self._branch_revision_id = revision_ids[0]
284
291
        self._allow_leftmost_as_ghost = allow_leftmost_as_ghost
285
292
        self._set_basis()
286
 
    
 
293
 
287
294
    def _set_basis(self):
288
295
        try:
289
296
            self._basis_tree = self.branch.repository.revision_tree(
300
307
        if len(parents_list) == 0:
301
308
            self._parent_ids = []
302
309
            self._basis_tree = self.branch.repository.revision_tree(
303
 
                                   _mod_revision.NULL_REVISION)
 
310
                _mod_revision.NULL_REVISION)
304
311
        else:
305
312
            if parents_list[0][1] is None and not allow_leftmost_as_ghost:
306
313
                # a ghost in the left most parent
307
314
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
308
315
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
309
 
            if parents_list[0][1] is None or parents_list[0][1] == 'null:':
 
316
            if parents_list[0][1] is None or parents_list[0][1] == b'null:':
310
317
                self._basis_tree = self.branch.repository.revision_tree(
311
 
                                       _mod_revision.NULL_REVISION)
 
318
                    _mod_revision.NULL_REVISION)
312
319
            else:
313
320
                self._basis_tree = parents_list[0][1]
314
321
            self._branch_revision_id = parents_list[0][0]