← 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: 2008-11-23 16:38:39 UTC
  • mto: This revision was merged to the branch mainline in revision 3892.
  • Revision ID: aaron@aaronbentley.com-20081123163839-ew27m17130fz85v6
Update documentation

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
22
 
 
23
from copy import deepcopy
24
24
import os
25
25
 
26
26
from bzrlib import (
27
27
    errors,
28
28
    mutabletree,
 
29
    osutils,
29
30
    revision as _mod_revision,
30
31
    )
31
 
from bzrlib.decorators import needs_read_lock
32
 
from bzrlib.inventory import Inventory
 
32
from bzrlib.decorators import needs_read_lock, needs_write_lock
33
33
from bzrlib.osutils import sha_file
34
34
from bzrlib.mutabletree import needs_tree_write_lock
35
35
from bzrlib.transport.memory import MemoryTransport
36
36
 
37
37
 
38
 
class MemoryTree(mutabletree.MutableInventoryTree):
 
38
class MemoryTree(mutabletree.MutableTree):
39
39
    """A MemoryTree is a specialisation of MutableTree.
40
 
 
 
40
    
41
41
    It maintains nearly no state outside of read_lock and write_lock
42
42
    transactions. (it keeps a reference to the branch, and its last-revision
43
43
    only).
51
51
        self._locks = 0
52
52
        self._lock_mode = None
53
53
 
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
54
    @needs_tree_write_lock
62
55
    def _add(self, files, ids, kinds):
63
56
        """See MutableTree._add."""
81
74
 
82
75
    def _gather_kinds(self, files, kinds):
83
76
        """See MutableTree._gather_kinds.
84
 
 
 
77
        
85
78
        This implementation does not care about the file kind of
86
79
        missing files, so is a no-op.
87
80
        """
219
212
 
220
213
    def _populate_from_branch(self):
221
214
        """Populate the in-tree state from the branch."""
222
 
        self._set_basis()
 
215
        self._basis_tree = self.branch.repository.revision_tree(
 
216
            self._branch_revision_id)
223
217
        if self._branch_revision_id == _mod_revision.NULL_REVISION:
224
218
            self._parent_ids = []
225
219
        else:
226
220
            self._parent_ids = [self._branch_revision_id]
227
 
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
 
221
        self._inventory = deepcopy(self._basis_tree._inventory)
228
222
        self._file_transport = MemoryTransport()
229
223
        # TODO copy the revision trees content, or do it lazy, or something.
230
 
        inventory_entries = self._basis_tree.iter_entries_by_dir()
 
224
        inventory_entries = self._inventory.iter_entries()
231
225
        for path, entry in inventory_entries:
232
 
            self._inventory.add(entry.copy())
233
226
            if path == '':
234
227
                continue
235
228
            if entry.kind == 'directory':
287
280
            _mod_revision.check_not_reserved_id(revision_id)
288
281
        if len(revision_ids) == 0:
289
282
            self._parent_ids = []
290
 
            self._branch_revision_id = _mod_revision.NULL_REVISION
 
283
            self._basis_tree = self.branch.repository.revision_tree(
 
284
                                    _mod_revision.NULL_REVISION)
291
285
        else:
292
286
            self._parent_ids = revision_ids
 
287
            self._basis_tree = self.branch.repository.revision_tree(
 
288
                                    revision_ids[0])
293
289
            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
290
 
308
291
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
309
292
        """See MutableTree.set_parent_trees()."""