← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Ian Clatworthy
  • Date: 2007-03-22 01:02:07 UTC
  • mto: (2370.2.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2371.
  • Revision ID: ian.clatworthy@internode.on.net-20070322010207-r8xcwjshipoahmcx
Minor corrections to HACKING

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""MemoryTree object.
18
18
 
19
19
See MemoryTree for more details.
20
20
"""
21
21
 
22
 
from __future__ import absolute_import
23
 
 
24
 
import os
25
 
 
26
 
from bzrlib import (
27
 
    errors,
28
 
    mutabletree,
29
 
    revision as _mod_revision,
30
 
    )
31
 
from bzrlib.decorators import needs_read_lock
32
 
from bzrlib.inventory import Inventory
 
22
 
 
23
from copy import deepcopy
 
24
 
 
25
from bzrlib import errors, mutabletree
 
26
from bzrlib.decorators import needs_read_lock, needs_write_lock
33
27
from bzrlib.osutils import sha_file
34
28
from bzrlib.mutabletree import needs_tree_write_lock
35
29
from bzrlib.transport.memory import MemoryTransport
36
30
 
37
31
 
38
 
class MemoryTree(mutabletree.MutableInventoryTree):
 
32
class MemoryTree(mutabletree.MutableTree):
39
33
    """A MemoryTree is a specialisation of MutableTree.
40
 
 
 
34
    
41
35
    It maintains nearly no state outside of read_lock and write_lock
42
36
    transactions. (it keeps a reference to the branch, and its last-revision
43
37
    only).
51
45
        self._locks = 0
52
46
        self._lock_mode = None
53
47
 
54
 
    def get_config_stack(self):
55
 
        return self.branch.get_config_stack()
56
 
 
57
 
    def is_control_filename(self, filename):
58
 
        # Memory tree doesn't have any control filenames
59
 
        return False
60
 
 
61
48
    @needs_tree_write_lock
62
49
    def _add(self, files, ids, kinds):
63
50
        """See MutableTree._add."""
76
63
    @staticmethod
77
64
    def create_on_branch(branch):
78
65
        """Create a MemoryTree for branch, using the last-revision of branch."""
79
 
        revision_id = _mod_revision.ensure_null(branch.last_revision())
80
 
        return MemoryTree(branch, revision_id)
 
66
        return MemoryTree(branch, branch.last_revision())
81
67
 
82
68
    def _gather_kinds(self, files, kinds):
83
69
        """See MutableTree._gather_kinds.
84
 
 
 
70
        
85
71
        This implementation does not care about the file kind of
86
72
        missing files, so is a no-op.
87
73
        """
88
74
 
89
 
    def get_file(self, file_id, path=None):
 
75
    def get_file(self, file_id):
90
76
        """See Tree.get_file."""
91
 
        if path is None:
92
 
            path = self.id2path(file_id)
93
 
        return self._file_transport.get(path)
 
77
        return self._file_transport.get(self.id2path(file_id))
94
78
 
95
 
    def get_file_sha1(self, file_id, path=None, stat_value=None):
 
79
    def get_file_sha1(self, file_id, path=None):
96
80
        """See Tree.get_file_sha1()."""
97
81
        if path is None:
98
82
            path = self.id2path(file_id)
99
83
        stream = self._file_transport.get(path)
100
84
        return sha_file(stream)
101
85
 
102
 
    def get_root_id(self):
103
 
        return self.path2id('')
104
 
 
105
 
    def _comparison_data(self, entry, path):
106
 
        """See Tree._comparison_data."""
107
 
        if entry is None:
108
 
            return None, False, None
109
 
        return entry.kind, entry.executable, None
110
 
 
111
 
    @needs_tree_write_lock
112
 
    def rename_one(self, from_rel, to_rel):
113
 
        file_id = self.path2id(from_rel)
114
 
        to_dir, to_tail = os.path.split(to_rel)
115
 
        to_parent_id = self.path2id(to_dir)
116
 
        self._file_transport.move(from_rel, to_rel)
117
 
        self._inventory.rename(file_id, to_parent_id, to_tail)
118
 
 
119
 
    def path_content_summary(self, path):
120
 
        """See Tree.path_content_summary."""
121
 
        id = self.path2id(path)
122
 
        if id is None:
123
 
            return 'missing', None, None, None
124
 
        kind = self.kind(id)
125
 
        if kind == 'file':
126
 
            bytes = self._file_transport.get_bytes(path)
127
 
            size = len(bytes)
128
 
            executable = self._inventory[id].executable
129
 
            sha1 = None # no stat cache
130
 
            return (kind, size, executable, sha1)
131
 
        elif kind == 'directory':
132
 
            # memory tree does not support nested trees yet.
133
 
            return kind, None, None, None
134
 
        elif kind == 'symlink':
135
 
            raise NotImplementedError('symlink support')
136
 
        else:
137
 
            raise NotImplementedError('unknown kind')
138
 
 
139
 
    def _file_size(self, entry, stat_value):
140
 
        """See Tree._file_size."""
141
 
        if entry is None:
142
 
            return 0
143
 
        return entry.text_size
144
 
 
145
86
    @needs_read_lock
146
87
    def get_parent_ids(self):
147
88
        """See Tree.get_parent_ids.
219
160
 
220
161
    def _populate_from_branch(self):
221
162
        """Populate the in-tree state from the branch."""
222
 
        self._set_basis()
223
 
        if self._branch_revision_id == _mod_revision.NULL_REVISION:
 
163
        self._basis_tree = self.branch.repository.revision_tree(
 
164
            self._branch_revision_id)
 
165
        if self._branch_revision_id is None:
224
166
            self._parent_ids = []
225
167
        else:
226
168
            self._parent_ids = [self._branch_revision_id]
227
 
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
 
169
        self._inventory = deepcopy(self._basis_tree._inventory)
228
170
        self._file_transport = MemoryTransport()
229
171
        # TODO copy the revision trees content, or do it lazy, or something.
230
 
        inventory_entries = self._basis_tree.iter_entries_by_dir()
 
172
        inventory_entries = self._inventory.iter_entries()
231
173
        for path, entry in inventory_entries:
232
 
            self._inventory.add(entry.copy())
233
174
            if path == '':
234
175
                continue
235
176
            if entry.kind == 'directory':
281
222
            else:
282
223
                raise errors.NoSuchId(self, file_id)
283
224
 
284
 
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
285
 
        """See MutableTree.set_parent_trees()."""
286
 
        for revision_id in revision_ids:
287
 
            _mod_revision.check_not_reserved_id(revision_id)
288
 
        if len(revision_ids) == 0:
289
 
            self._parent_ids = []
290
 
            self._branch_revision_id = _mod_revision.NULL_REVISION
291
 
        else:
292
 
            self._parent_ids = revision_ids
293
 
            self._branch_revision_id = revision_ids[0]
294
 
        self._allow_leftmost_as_ghost = allow_leftmost_as_ghost
295
 
        self._set_basis()
296
 
    
297
 
    def _set_basis(self):
298
 
        try:
299
 
            self._basis_tree = self.branch.repository.revision_tree(
300
 
                self._branch_revision_id)
301
 
        except errors.NoSuchRevision:
302
 
            if self._allow_leftmost_as_ghost:
303
 
                self._basis_tree = self.branch.repository.revision_tree(
304
 
                    _mod_revision.NULL_REVISION)
305
 
            else:
306
 
                raise
307
 
 
308
225
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
309
226
        """See MutableTree.set_parent_trees()."""
310
227
        if len(parents_list) == 0:
311
228
            self._parent_ids = []
312
 
            self._basis_tree = self.branch.repository.revision_tree(
313
 
                                   _mod_revision.NULL_REVISION)
 
229
            self._basis_tree = self.branch.repository.revisiontree(None)
314
230
        else:
315
231
            if parents_list[0][1] is None and not allow_leftmost_as_ghost:
316
232
                # a ghost in the left most parent
317
233
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
318
234
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
319
 
            if parents_list[0][1] is None or parents_list[0][1] == 'null:':
320
 
                self._basis_tree = self.branch.repository.revision_tree(
321
 
                                       _mod_revision.NULL_REVISION)
 
235
            if parents_list[0][1] is None:
 
236
                self._basis_tree = self.branch.repository.revisiontree(None)
322
237
            else:
323
238
                self._basis_tree = parents_list[0][1]
324
239
            self._branch_revision_id = parents_list[0][0]