/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: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

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