← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-27 19:05:43 UTC
  • mto: This revision was merged to the branch mainline in revision 6450.
  • Revision ID: jelmer@samba.org-20120127190543-vk350mv4a0c7aug2
Fix weave test.

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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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
22
23
 
23
 
from copy import deepcopy
 
24
import os
24
25
 
25
26
from bzrlib import (
26
27
    errors,
27
28
    mutabletree,
28
29
    revision as _mod_revision,
29
30
    )
30
 
from bzrlib.decorators import needs_read_lock, needs_write_lock
 
31
from bzrlib.decorators import needs_read_lock
 
32
from bzrlib.inventory import Inventory
31
33
from bzrlib.osutils import sha_file
32
34
from bzrlib.mutabletree import needs_tree_write_lock
33
35
from bzrlib.transport.memory import MemoryTransport
34
36
 
35
37
 
36
 
class MemoryTree(mutabletree.MutableTree):
 
38
class MemoryTree(mutabletree.MutableInventoryTree):
37
39
    """A MemoryTree is a specialisation of MutableTree.
38
 
    
 
40
 
39
41
    It maintains nearly no state outside of read_lock and write_lock
40
42
    transactions. (it keeps a reference to the branch, and its last-revision
41
43
    only).
49
51
        self._locks = 0
50
52
        self._lock_mode = None
51
53
 
 
54
    def is_control_filename(self, filename):
 
55
        # Memory tree doesn't have any control filenames
 
56
        return False
 
57
 
52
58
    @needs_tree_write_lock
53
59
    def _add(self, files, ids, kinds):
54
60
        """See MutableTree._add."""
68
74
    def create_on_branch(branch):
69
75
        """Create a MemoryTree for branch, using the last-revision of branch."""
70
76
        revision_id = _mod_revision.ensure_null(branch.last_revision())
71
 
        if _mod_revision.is_null(revision_id):
72
 
            revision_id = None
73
77
        return MemoryTree(branch, revision_id)
74
78
 
75
79
    def _gather_kinds(self, files, kinds):
76
80
        """See MutableTree._gather_kinds.
77
 
        
 
81
 
78
82
        This implementation does not care about the file kind of
79
83
        missing files, so is a no-op.
80
84
        """
101
105
            return None, False, None
102
106
        return entry.kind, entry.executable, None
103
107
 
 
108
    @needs_tree_write_lock
 
109
    def rename_one(self, from_rel, to_rel):
 
110
        file_id = self.path2id(from_rel)
 
111
        to_dir, to_tail = os.path.split(to_rel)
 
112
        to_parent_id = self.path2id(to_dir)
 
113
        self._file_transport.move(from_rel, to_rel)
 
114
        self._inventory.rename(file_id, to_parent_id, to_tail)
 
115
 
104
116
    def path_content_summary(self, path):
105
117
        """See Tree.path_content_summary."""
106
118
        id = self.path2id(path)
204
216
 
205
217
    def _populate_from_branch(self):
206
218
        """Populate the in-tree state from the branch."""
207
 
        self._basis_tree = self.branch.repository.revision_tree(
208
 
            self._branch_revision_id)
209
 
        if self._branch_revision_id is None:
 
219
        self._set_basis()
 
220
        if self._branch_revision_id == _mod_revision.NULL_REVISION:
210
221
            self._parent_ids = []
211
222
        else:
212
223
            self._parent_ids = [self._branch_revision_id]
213
 
        self._inventory = deepcopy(self._basis_tree._inventory)
 
224
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
214
225
        self._file_transport = MemoryTransport()
215
226
        # TODO copy the revision trees content, or do it lazy, or something.
216
 
        inventory_entries = self._inventory.iter_entries()
 
227
        inventory_entries = self._basis_tree.iter_entries_by_dir()
217
228
        for path, entry in inventory_entries:
 
229
            self._inventory.add(entry.copy())
218
230
            if path == '':
219
231
                continue
220
232
            if entry.kind == 'directory':
272
284
            _mod_revision.check_not_reserved_id(revision_id)
273
285
        if len(revision_ids) == 0:
274
286
            self._parent_ids = []
275
 
            self._basis_tree = self.branch.repository.revision_tree(None)
 
287
            self._branch_revision_id = _mod_revision.NULL_REVISION
276
288
        else:
277
289
            self._parent_ids = revision_ids
278
 
            self._basis_tree = self.branch.repository.revision_tree(
279
 
                                    revision_ids[0])
280
290
            self._branch_revision_id = revision_ids[0]
 
291
        self._allow_leftmost_as_ghost = allow_leftmost_as_ghost
 
292
        self._set_basis()
 
293
    
 
294
    def _set_basis(self):
 
295
        try:
 
296
            self._basis_tree = self.branch.repository.revision_tree(
 
297
                self._branch_revision_id)
 
298
        except errors.NoSuchRevision:
 
299
            if self._allow_leftmost_as_ghost:
 
300
                self._basis_tree = self.branch.repository.revision_tree(
 
301
                    _mod_revision.NULL_REVISION)
 
302
            else:
 
303
                raise
281
304
 
282
305
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
283
306
        """See MutableTree.set_parent_trees()."""
284
307
        if len(parents_list) == 0:
285
308
            self._parent_ids = []
286
 
            self._basis_tree = self.branch.repository.revision_tree(None)
 
309
            self._basis_tree = self.branch.repository.revision_tree(
 
310
                                   _mod_revision.NULL_REVISION)
287
311
        else:
288
312
            if parents_list[0][1] is None and not allow_leftmost_as_ghost:
289
313
                # a ghost in the left most parent
290
314
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
291
315
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
292
316
            if parents_list[0][1] is None or parents_list[0][1] == 'null:':
293
 
                import pdb; pdb.set_trace()
294
 
                self._basis_tree = self.branch.repository.revision_tree(None)
 
317
                self._basis_tree = self.branch.repository.revision_tree(
 
318
                                       _mod_revision.NULL_REVISION)
295
319
            else:
296
320
                self._basis_tree = parents_list[0][1]
297
321
            self._branch_revision_id = parents_list[0][0]