/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: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

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