/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
24
 
26
 
from . import (
 
25
from bzrlib import (
27
26
    errors,
28
 
    lock,
 
27
    mutabletree,
29
28
    revision as _mod_revision,
30
29
    )
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):
 
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):
38
37
    """A MemoryTree is a specialisation of MutableTree.
39
38
 
40
39
    It maintains nearly no state outside of read_lock and write_lock
45
44
    def __init__(self, branch, revision_id):
46
45
        """Construct a MemoryTree for branch using revision_id."""
47
46
        self.branch = branch
48
 
        self.controldir = branch.controldir
 
47
        self.bzrdir = branch.bzrdir
49
48
        self._branch_revision_id = revision_id
50
49
        self._locks = 0
51
50
        self._lock_mode = None
52
51
 
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
 
 
 
52
    @needs_tree_write_lock
60
53
    def _add(self, files, ids, kinds):
61
54
        """See MutableTree._add."""
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)
 
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)
70
62
 
71
63
    def basis_tree(self):
72
64
        """See Tree.basis_tree()."""
85
77
        missing files, so is a no-op.
86
78
        """
87
79
 
88
 
    def get_file(self, path, file_id=None):
 
80
    def get_file(self, file_id, path=None):
89
81
        """See Tree.get_file."""
 
82
        if path is None:
 
83
            path = self.id2path(file_id)
90
84
        return self._file_transport.get(path)
91
85
 
92
 
    def get_file_sha1(self, path, file_id=None, stat_value=None):
 
86
    def get_file_sha1(self, file_id, path=None, stat_value=None):
93
87
        """See Tree.get_file_sha1()."""
 
88
        if path is None:
 
89
            path = self.id2path(file_id)
94
90
        stream = self._file_transport.get(path)
95
91
        return sha_file(stream)
96
92
 
103
99
            return None, False, None
104
100
        return entry.kind, entry.executable, None
105
101
 
 
102
    @needs_tree_write_lock
106
103
    def rename_one(self, from_rel, to_rel):
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)
 
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)
113
109
 
114
110
    def path_content_summary(self, path):
115
111
        """See Tree.path_content_summary."""
116
112
        id = self.path2id(path)
117
113
        if id is None:
118
114
            return 'missing', None, None, None
119
 
        kind = self.kind(path, id)
 
115
        kind = self.kind(id)
120
116
        if kind == 'file':
121
117
            bytes = self._file_transport.get_bytes(path)
122
118
            size = len(bytes)
131
127
        else:
132
128
            raise NotImplementedError('unknown kind')
133
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
134
137
    def get_parent_ids(self):
135
138
        """See Tree.get_parent_ids.
136
139
 
137
140
        This implementation returns the current cached value from
138
141
            self._parent_ids.
139
142
        """
140
 
        with self.lock_read():
141
 
            return list(self._parent_ids)
 
143
        return list(self._parent_ids)
142
144
 
143
145
    def has_filename(self, filename):
144
146
        """See Tree.has_filename()."""
145
147
        return self._file_transport.has(filename)
146
148
 
147
 
    def is_executable(self, path, file_id=None):
 
149
    def is_executable(self, file_id, path=None):
148
150
        return self._inventory[file_id].executable
149
151
 
150
 
    def kind(self, path, file_id=None):
151
 
        if file_id is None:
152
 
            file_id = self.path2id(path)
 
152
    def kind(self, file_id):
153
153
        return self._inventory[file_id].kind
154
154
 
155
155
    def mkdir(self, path, file_id=None):
160
160
        self._file_transport.mkdir(path)
161
161
        return file_id
162
162
 
 
163
    @needs_read_lock
163
164
    def last_revision(self):
164
165
        """See MutableTree.last_revision."""
165
 
        with self.lock_read():
166
 
            return self._branch_revision_id
 
166
        return self._branch_revision_id
167
167
 
168
168
    def lock_read(self):
169
169
        """Lock the memory tree for reading.
176
176
                self.branch.lock_read()
177
177
                self._lock_mode = "r"
178
178
                self._populate_from_branch()
179
 
            return lock.LogicalLockResult(self.unlock)
180
179
        except:
181
180
            self._locks -= 1
182
181
            raise
194
193
        except:
195
194
            self._locks -= 1
196
195
            raise
197
 
        return lock.LogicalLockResult(self.unlock)
198
196
 
199
197
    def lock_write(self):
200
198
        """See MutableTree.lock_write()."""
206
204
                self._populate_from_branch()
207
205
            elif self._lock_mode == "r":
208
206
                raise errors.ReadOnlyError(self)
209
 
            return lock.LogicalLockResult(self.unlock)
210
207
        except:
211
208
            self._locks -= 1
212
209
            raise
218
215
            self._parent_ids = []
219
216
        else:
220
217
            self._parent_ids = [self._branch_revision_id]
221
 
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
 
218
        self._inventory = self._basis_tree._inventory._get_mutable_inventory()
222
219
        self._file_transport = MemoryTransport()
223
220
        # TODO copy the revision trees content, or do it lazy, or something.
224
 
        inventory_entries = self._basis_tree.iter_entries_by_dir()
 
221
        inventory_entries = self._inventory.iter_entries()
225
222
        for path, entry in inventory_entries:
226
 
            self._inventory.add(entry.copy())
227
223
            if path == '':
228
224
                continue
229
225
            if entry.kind == 'directory':
230
226
                self._file_transport.mkdir(path)
231
227
            elif entry.kind == 'file':
232
228
                self._file_transport.put_file(path,
233
 
                    self._basis_tree.get_file(path, entry.file_id))
 
229
                    self._basis_tree.get_file(entry.file_id))
234
230
            else:
235
231
                raise NotImplementedError(self._populate_from_branch)
236
232
 
237
 
    def put_file_bytes_non_atomic(self, path, bytes, file_id=None):
 
233
    def put_file_bytes_non_atomic(self, file_id, bytes):
238
234
        """See MutableTree.put_file_bytes_non_atomic."""
239
 
        self._file_transport.put_bytes(path, bytes)
 
235
        self._file_transport.put_bytes(self.id2path(file_id), bytes)
240
236
 
241
237
    def unlock(self):
242
238
        """Release a lock.
256
252
        else:
257
253
            self._locks -= 1
258
254
 
259
 
    def unversion(self, paths, file_ids=None):
260
 
        """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.
261
258
 
262
259
        When a file_id is unversioned, all of its children are automatically
263
260
        unversioned.
264
261
 
265
 
        :param paths: The paths to stop versioning.
 
262
        :param file_ids: The file ids to stop versioning.
266
263
        :raises: NoSuchId if any fileid is not currently versioned.
267
264
        """
268
 
        with self.lock_tree_write():
269
 
            # XXX: This should be in mutabletree, but the inventory-save action
270
 
            # is not relevant to memory tree. Until that is done in unlock by
271
 
            # working tree, we cannot share the implementation.
272
 
            if file_ids is None:
273
 
                file_ids = set()
274
 
                for path in paths:
275
 
                    file_id = self.path2id(path)
276
 
                    if file_id is None:
277
 
                        raise errors.NoSuchFile(path)
278
 
                    file_ids.add(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)
279
271
            else:
280
 
                for file_id in file_ids:
281
 
                    if not self._inventory.has_id(file_id):
282
 
                        raise errors.NoSuchId(self, file_id)
283
 
            for file_id in file_ids:
284
 
                if self._inventory.has_id(file_id):
285
 
                    self._inventory.remove_recursive_id(file_id)
 
272
                raise errors.NoSuchId(self, file_id)
286
273
 
287
274
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
288
275
        """See MutableTree.set_parent_trees()."""
296
283
            self._branch_revision_id = revision_ids[0]
297
284
        self._allow_leftmost_as_ghost = allow_leftmost_as_ghost
298
285
        self._set_basis()
299
 
 
 
286
    
300
287
    def _set_basis(self):
301
288
        try:
302
289
            self._basis_tree = self.branch.repository.revision_tree(
319
306
                # a ghost in the left most parent
320
307
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
321
308
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
322
 
            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:':
323
310
                self._basis_tree = self.branch.repository.revision_tree(
324
311
                                       _mod_revision.NULL_REVISION)
325
312
            else: