/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-09-21 19:49:11 UTC
  • mto: This revision was merged to the branch mainline in revision 7394.
  • Revision ID: jelmer@jelmer.uk-20190921194911-bxlcotmw2j003ex3
Port testr-run to Python3.

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
 
25
import stat
24
26
 
25
 
from bzrlib import (
 
27
from . import (
26
28
    errors,
27
 
    mutabletree,
 
29
    lock,
28
30
    revision as _mod_revision,
29
31
    )
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):
 
32
from .bzr.inventory import Inventory
 
33
from .bzr.inventorytree import MutableInventoryTree
 
34
from .osutils import sha_file
 
35
from .transport.memory import MemoryTransport
 
36
 
 
37
 
 
38
class MemoryTree(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
44
46
    def __init__(self, branch, revision_id):
45
47
        """Construct a MemoryTree for branch using revision_id."""
46
48
        self.branch = branch
47
 
        self.bzrdir = branch.bzrdir
 
49
        self.controldir = branch.controldir
48
50
        self._branch_revision_id = revision_id
49
51
        self._locks = 0
50
52
        self._lock_mode = None
51
53
 
52
 
    @needs_tree_write_lock
 
54
    def supports_symlinks(self):
 
55
        return True
 
56
 
 
57
    def get_config_stack(self):
 
58
        return self.branch.get_config_stack()
 
59
 
 
60
    def is_control_filename(self, filename):
 
61
        # Memory tree doesn't have any control filenames
 
62
        return False
 
63
 
53
64
    def _add(self, files, ids, kinds):
54
65
        """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)
 
66
        with self.lock_tree_write():
 
67
            for f, file_id, kind in zip(files, ids, kinds):
 
68
                if kind is None:
 
69
                    st_mode = self._file_transport.stat(f).st_mode
 
70
                    if stat.S_ISREG(st_mode):
 
71
                        kind = 'file'
 
72
                    elif stat.S_ISLNK(st_mode):
 
73
                        kind = 'symlink'
 
74
                    elif stat.S_ISDIR(st_mode):
 
75
                        kind = 'directory'
 
76
                    else:
 
77
                        raise AssertionError('Unknown file kind')
 
78
                if file_id is None:
 
79
                    self._inventory.add_path(f, kind=kind)
 
80
                else:
 
81
                    self._inventory.add_path(f, kind=kind, file_id=file_id)
62
82
 
63
83
    def basis_tree(self):
64
84
        """See Tree.basis_tree()."""
77
97
        missing files, so is a no-op.
78
98
        """
79
99
 
80
 
    def get_file(self, file_id, path=None):
 
100
    def get_file(self, path):
81
101
        """See Tree.get_file."""
82
 
        if path is None:
83
 
            path = self.id2path(file_id)
84
102
        return self._file_transport.get(path)
85
103
 
86
 
    def get_file_sha1(self, file_id, path=None, stat_value=None):
 
104
    def get_file_sha1(self, path, stat_value=None):
87
105
        """See Tree.get_file_sha1()."""
88
 
        if path is None:
89
 
            path = self.id2path(file_id)
90
106
        stream = self._file_transport.get(path)
91
107
        return sha_file(stream)
92
108
 
93
 
    def get_root_id(self):
94
 
        return self.path2id('')
95
 
 
96
109
    def _comparison_data(self, entry, path):
97
110
        """See Tree._comparison_data."""
98
111
        if entry is None:
99
112
            return None, False, None
100
113
        return entry.kind, entry.executable, None
101
114
 
102
 
    @needs_tree_write_lock
103
115
    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)
 
116
        with self.lock_tree_write():
 
117
            file_id = self.path2id(from_rel)
 
118
            to_dir, to_tail = os.path.split(to_rel)
 
119
            to_parent_id = self.path2id(to_dir)
 
120
            self._file_transport.move(from_rel, to_rel)
 
121
            self._inventory.rename(file_id, to_parent_id, to_tail)
109
122
 
110
123
    def path_content_summary(self, path):
111
124
        """See Tree.path_content_summary."""
112
125
        id = self.path2id(path)
113
126
        if id is None:
114
127
            return 'missing', None, None, None
115
 
        kind = self.kind(id)
 
128
        kind = self.kind(path, id)
116
129
        if kind == 'file':
117
130
            bytes = self._file_transport.get_bytes(path)
118
131
            size = len(bytes)
119
132
            executable = self._inventory[id].executable
120
 
            sha1 = None # no stat cache
 
133
            sha1 = None  # no stat cache
121
134
            return (kind, size, executable, sha1)
122
135
        elif kind == 'directory':
123
136
            # memory tree does not support nested trees yet.
124
137
            return kind, None, None, None
125
138
        elif kind == 'symlink':
126
 
            raise NotImplementedError('symlink support')
 
139
            return kind, None, None, self._inventory[id].symlink_target
127
140
        else:
128
141
            raise NotImplementedError('unknown kind')
129
142
 
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
143
    def get_parent_ids(self):
138
144
        """See Tree.get_parent_ids.
139
145
 
140
146
        This implementation returns the current cached value from
141
147
            self._parent_ids.
142
148
        """
143
 
        return list(self._parent_ids)
 
149
        with self.lock_read():
 
150
            return list(self._parent_ids)
144
151
 
145
152
    def has_filename(self, filename):
146
153
        """See Tree.has_filename()."""
147
154
        return self._file_transport.has(filename)
148
155
 
149
 
    def is_executable(self, file_id, path=None):
150
 
        return self._inventory[file_id].executable
 
156
    def is_executable(self, path):
 
157
        return self._inventory.get_entry_by_path(path).executable
151
158
 
152
 
    def kind(self, file_id):
153
 
        return self._inventory[file_id].kind
 
159
    def kind(self, path):
 
160
        return self._inventory.get_entry_by_path(path).kind
154
161
 
155
162
    def mkdir(self, path, file_id=None):
156
163
        """See MutableTree.mkdir()."""
160
167
        self._file_transport.mkdir(path)
161
168
        return file_id
162
169
 
163
 
    @needs_read_lock
164
170
    def last_revision(self):
165
171
        """See MutableTree.last_revision."""
166
 
        return self._branch_revision_id
 
172
        with self.lock_read():
 
173
            return self._branch_revision_id
167
174
 
168
175
    def lock_read(self):
169
176
        """Lock the memory tree for reading.
176
183
                self.branch.lock_read()
177
184
                self._lock_mode = "r"
178
185
                self._populate_from_branch()
179
 
        except:
 
186
            return lock.LogicalLockResult(self.unlock)
 
187
        except BaseException:
180
188
            self._locks -= 1
181
189
            raise
182
190
 
190
198
                self._populate_from_branch()
191
199
            elif self._lock_mode == "r":
192
200
                raise errors.ReadOnlyError(self)
193
 
        except:
 
201
        except BaseException:
194
202
            self._locks -= 1
195
203
            raise
 
204
        return lock.LogicalLockResult(self.unlock)
196
205
 
197
206
    def lock_write(self):
198
207
        """See MutableTree.lock_write()."""
204
213
                self._populate_from_branch()
205
214
            elif self._lock_mode == "r":
206
215
                raise errors.ReadOnlyError(self)
207
 
        except:
 
216
            return lock.LogicalLockResult(self.unlock)
 
217
        except BaseException:
208
218
            self._locks -= 1
209
219
            raise
210
220
 
215
225
            self._parent_ids = []
216
226
        else:
217
227
            self._parent_ids = [self._branch_revision_id]
218
 
        self._inventory = self._basis_tree._inventory._get_mutable_inventory()
 
228
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
219
229
        self._file_transport = MemoryTransport()
220
230
        # TODO copy the revision trees content, or do it lazy, or something.
221
 
        inventory_entries = self._inventory.iter_entries()
 
231
        inventory_entries = self._basis_tree.iter_entries_by_dir()
222
232
        for path, entry in inventory_entries:
 
233
            self._inventory.add(entry.copy())
223
234
            if path == '':
224
235
                continue
225
236
            if entry.kind == 'directory':
226
237
                self._file_transport.mkdir(path)
 
238
            elif entry.kind == 'symlink':
 
239
                self._file_transport.symlink(entry.symlink_target, path)
227
240
            elif entry.kind == 'file':
228
 
                self._file_transport.put_file(path,
229
 
                    self._basis_tree.get_file(entry.file_id))
 
241
                self._file_transport.put_file(
 
242
                    path, self._basis_tree.get_file(path))
230
243
            else:
231
244
                raise NotImplementedError(self._populate_from_branch)
232
245
 
233
 
    def put_file_bytes_non_atomic(self, file_id, bytes):
 
246
    def put_file_bytes_non_atomic(self, path, bytes):
234
247
        """See MutableTree.put_file_bytes_non_atomic."""
235
 
        self._file_transport.put_bytes(self.id2path(file_id), bytes)
 
248
        self._file_transport.put_bytes(path, bytes)
236
249
 
237
250
    def unlock(self):
238
251
        """Release a lock.
252
265
        else:
253
266
            self._locks -= 1
254
267
 
255
 
    @needs_tree_write_lock
256
 
    def unversion(self, file_ids):
257
 
        """Remove the file ids in file_ids from the current versioned set.
 
268
    def unversion(self, paths):
 
269
        """Remove the paths from the current versioned set.
258
270
 
259
271
        When a file_id is unversioned, all of its children are automatically
260
272
        unversioned.
261
273
 
262
 
        :param file_ids: The file ids to stop versioning.
 
274
        :param paths: The paths to stop versioning.
263
275
        :raises: NoSuchId if any fileid is not currently versioned.
264
276
        """
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)
 
277
        with self.lock_tree_write():
 
278
            # XXX: This should be in mutabletree, but the inventory-save action
 
279
            # is not relevant to memory tree. Until that is done in unlock by
 
280
            # working tree, we cannot share the implementation.
 
281
            file_ids = set()
 
282
            for path in paths:
 
283
                file_id = self.path2id(path)
 
284
                if file_id is None:
 
285
                    raise errors.NoSuchFile(path)
 
286
                file_ids.add(file_id)
 
287
            for file_id in file_ids:
 
288
                if self._inventory.has_id(file_id):
 
289
                    self._inventory.remove_recursive_id(file_id)
273
290
 
274
291
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
275
292
        """See MutableTree.set_parent_trees()."""
283
300
            self._branch_revision_id = revision_ids[0]
284
301
        self._allow_leftmost_as_ghost = allow_leftmost_as_ghost
285
302
        self._set_basis()
286
 
    
 
303
 
287
304
    def _set_basis(self):
288
305
        try:
289
306
            self._basis_tree = self.branch.repository.revision_tree(
295
312
            else:
296
313
                raise
297
314
 
 
315
    def get_symlink_target(self, path):
 
316
        with self.lock_read():
 
317
            return self._file_transport.readlink(path)
 
318
 
298
319
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
299
320
        """See MutableTree.set_parent_trees()."""
300
321
        if len(parents_list) == 0:
301
322
            self._parent_ids = []
302
323
            self._basis_tree = self.branch.repository.revision_tree(
303
 
                                   _mod_revision.NULL_REVISION)
 
324
                _mod_revision.NULL_REVISION)
304
325
        else:
305
326
            if parents_list[0][1] is None and not allow_leftmost_as_ghost:
306
327
                # a ghost in the left most parent
307
328
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
308
329
            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:':
 
330
            if parents_list[0][1] is None or parents_list[0][1] == b'null:':
310
331
                self._basis_tree = self.branch.repository.revision_tree(
311
 
                                       _mod_revision.NULL_REVISION)
 
332
                    _mod_revision.NULL_REVISION)
312
333
            else:
313
334
                self._basis_tree = parents_list[0][1]
314
335
            self._branch_revision_id = parents_list[0][0]