← 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: 2008-09-09 15:09:12 UTC
  • mto: This revision was merged to the branch mainline in revision 3699.
  • Revision ID: john@arbash-meinel.com-20080909150912-wyttm8he1zsls2ck
Use the right timing function on win32

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).
73
72
 
74
73
    def _gather_kinds(self, files, kinds):
75
74
        """See MutableTree._gather_kinds.
76
 
 
 
75
        
77
76
        This implementation does not care about the file kind of
78
77
        missing files, so is a no-op.
79
78
        """
100
99
            return None, False, None
101
100
        return entry.kind, entry.executable, None
102
101
 
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
102
    def path_content_summary(self, path):
112
103
        """See Tree.path_content_summary."""
113
104
        id = self.path2id(path)
211
202
 
212
203
    def _populate_from_branch(self):
213
204
        """Populate the in-tree state from the branch."""
214
 
        self._set_basis()
 
205
        self._basis_tree = self.branch.repository.revision_tree(
 
206
            self._branch_revision_id)
215
207
        if self._branch_revision_id == _mod_revision.NULL_REVISION:
216
208
            self._parent_ids = []
217
209
        else:
218
210
            self._parent_ids = [self._branch_revision_id]
219
 
        self._inventory = self._basis_tree._inventory._get_mutable_inventory()
 
211
        self._inventory = deepcopy(self._basis_tree._inventory)
220
212
        self._file_transport = MemoryTransport()
221
213
        # TODO copy the revision trees content, or do it lazy, or something.
222
214
        inventory_entries = self._inventory.iter_entries()
278
270
            _mod_revision.check_not_reserved_id(revision_id)
279
271
        if len(revision_ids) == 0:
280
272
            self._parent_ids = []
281
 
            self._branch_revision_id = _mod_revision.NULL_REVISION
 
273
            self._basis_tree = self.branch.repository.revision_tree(
 
274
                                    _mod_revision.NULL_REVISION)
282
275
        else:
283
276
            self._parent_ids = revision_ids
 
277
            self._basis_tree = self.branch.repository.revision_tree(
 
278
                                    revision_ids[0])
284
279
            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
280
 
299
281
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
300
282
        """See MutableTree.set_parent_trees()."""