← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-31 21:20:02 UTC
  • mto: This revision was merged to the branch mainline in revision 2688.
  • Revision ID: john@arbash-meinel.com-20070731212002-tq2bht51jbfedjlk
Stop tracking medium bytes if we aren't going to use it

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