← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Aaron Bentley
  • Date: 2007-08-16 00:54:00 UTC
  • mto: This revision was merged to the branch mainline in revision 2711.
  • Revision ID: aaron.bentley@utoronto.ca-20070816005400-oxxtqiy310wx10h9
Fix typo

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
 
20
20
"""
21
21
 
22
22
 
23
 
import os
 
23
from copy import deepcopy
24
24
 
25
25
from bzrlib import (
26
26
    errors,
27
27
    mutabletree,
28
 
    osutils,
29
28
    revision as _mod_revision,
30
29
    )
31
30
from bzrlib.decorators import needs_read_lock, needs_write_lock
36
35
 
37
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
41
40
    transactions. (it keeps a reference to the branch, and its last-revision
42
41
    only).
69
68
    def create_on_branch(branch):
70
69
        """Create a MemoryTree for branch, using the last-revision of branch."""
71
70
        revision_id = _mod_revision.ensure_null(branch.last_revision())
 
71
        if _mod_revision.is_null(revision_id):
 
72
            revision_id = None
72
73
        return MemoryTree(branch, revision_id)
73
74
 
74
75
    def _gather_kinds(self, files, kinds):
75
76
        """See MutableTree._gather_kinds.
76
 
 
 
77
        
77
78
        This implementation does not care about the file kind of
78
79
        missing files, so is a no-op.
79
80
        """
80
81
 
81
 
    def get_file(self, file_id, path=None):
 
82
    def get_file(self, file_id):
82
83
        """See Tree.get_file."""
83
 
        if path is None:
84
 
            path = self.id2path(file_id)
85
 
        return self._file_transport.get(path)
 
84
        return self._file_transport.get(self.id2path(file_id))
86
85
 
87
86
    def get_file_sha1(self, file_id, path=None, stat_value=None):
88
87
        """See Tree.get_file_sha1()."""
91
90
        stream = self._file_transport.get(path)
92
91
        return sha_file(stream)
93
92
 
94
 
    def get_root_id(self):
95
 
        return self.path2id('')
96
 
 
97
93
    def _comparison_data(self, entry, path):
98
94
        """See Tree._comparison_data."""
99
95
        if entry is None:
100
96
            return None, False, None
101
97
        return entry.kind, entry.executable, None
102
98
 
103
 
    @needs_tree_write_lock
104
 
    def rename_one(self, from_rel, to_rel):
105
 
        file_id = self.path2id(from_rel)
106
 
        to_dir, to_tail = os.path.split(to_rel)
107
 
        to_parent_id = self.path2id(to_dir)
108
 
        self._file_transport.move(from_rel, to_rel)
109
 
        self._inventory.rename(file_id, to_parent_id, to_tail)
110
 
 
111
 
    def path_content_summary(self, path):
112
 
        """See Tree.path_content_summary."""
113
 
        id = self.path2id(path)
114
 
        if id is None:
115
 
            return 'missing', None, None, None
116
 
        kind = self.kind(id)
117
 
        if kind == 'file':
118
 
            bytes = self._file_transport.get_bytes(path)
119
 
            size = len(bytes)
120
 
            executable = self._inventory[id].executable
121
 
            sha1 = None # no stat cache
122
 
            return (kind, size, executable, sha1)
123
 
        elif kind == 'directory':
124
 
            # memory tree does not support nested trees yet.
125
 
            return kind, None, None, None
126
 
        elif kind == 'symlink':
127
 
            raise NotImplementedError('symlink support')
128
 
        else:
129
 
            raise NotImplementedError('unknown kind')
130
 
 
131
99
    def _file_size(self, entry, stat_value):
132
100
        """See Tree._file_size."""
133
101
        if entry is None:
211
179
 
212
180
    def _populate_from_branch(self):
213
181
        """Populate the in-tree state from the branch."""
214
 
        self._set_basis()
215
 
        if self._branch_revision_id == _mod_revision.NULL_REVISION:
 
182
        self._basis_tree = self.branch.repository.revision_tree(
 
183
            self._branch_revision_id)
 
184
        if self._branch_revision_id is None:
216
185
            self._parent_ids = []
217
186
        else:
218
187
            self._parent_ids = [self._branch_revision_id]
219
 
        self._inventory = self._basis_tree._inventory._get_mutable_inventory()
 
188
        self._inventory = deepcopy(self._basis_tree._inventory)
220
189
        self._file_transport = MemoryTransport()
221
190
        # TODO copy the revision trees content, or do it lazy, or something.
222
191
        inventory_entries = self._inventory.iter_entries()
278
247
            _mod_revision.check_not_reserved_id(revision_id)
279
248
        if len(revision_ids) == 0:
280
249
            self._parent_ids = []
281
 
            self._branch_revision_id = _mod_revision.NULL_REVISION
 
250
            self._basis_tree = self.branch.repository.revision_tree(None)
282
251
        else:
283
252
            self._parent_ids = revision_ids
 
253
            self._basis_tree = self.branch.repository.revision_tree(
 
254
                                    revision_ids[0])
284
255
            self._branch_revision_id = revision_ids[0]
285
 
        self._allow_leftmost_as_ghost = allow_leftmost_as_ghost
286
 
        self._set_basis()
287
 
    
288
 
    def _set_basis(self):
289
 
        try:
290
 
            self._basis_tree = self.branch.repository.revision_tree(
291
 
                self._branch_revision_id)
292
 
        except errors.NoSuchRevision:
293
 
            if self._allow_leftmost_as_ghost:
294
 
                self._basis_tree = self.branch.repository.revision_tree(
295
 
                    _mod_revision.NULL_REVISION)
296
 
            else:
297
 
                raise
298
256
 
299
257
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
300
258
        """See MutableTree.set_parent_trees()."""
301
259
        if len(parents_list) == 0:
302
260
            self._parent_ids = []
303
 
            self._basis_tree = self.branch.repository.revision_tree(
304
 
                                   _mod_revision.NULL_REVISION)
 
261
            self._basis_tree = self.branch.repository.revision_tree(None)
305
262
        else:
306
263
            if parents_list[0][1] is None and not allow_leftmost_as_ghost:
307
264
                # a ghost in the left most parent
308
265
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
309
266
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
310
267
            if parents_list[0][1] is None or parents_list[0][1] == 'null:':
311
 
                self._basis_tree = self.branch.repository.revision_tree(
312
 
                                       _mod_revision.NULL_REVISION)
 
268
                import pdb; pdb.set_trace()
 
269
                self._basis_tree = self.branch.repository.revision_tree(None)
313
270
            else:
314
271
                self._basis_tree = parents_list[0][1]
315
272
            self._branch_revision_id = parents_list[0][0]