← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

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 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
 
52
61
    @needs_tree_write_lock
53
62
    def _add(self, files, ids, kinds):
54
63
        """See MutableTree._add."""
68
77
    def create_on_branch(branch):
69
78
        """Create a MemoryTree for branch, using the last-revision of branch."""
70
79
        revision_id = _mod_revision.ensure_null(branch.last_revision())
71
 
        if _mod_revision.is_null(revision_id):
72
 
            revision_id = None
73
80
        return MemoryTree(branch, revision_id)
74
81
 
75
82
    def _gather_kinds(self, files, kinds):
76
83
        """See MutableTree._gather_kinds.
77
 
        
 
84
 
78
85
        This implementation does not care about the file kind of
79
86
        missing files, so is a no-op.
80
87
        """
92
99
        stream = self._file_transport.get(path)
93
100
        return sha_file(stream)
94
101
 
 
102
    def get_root_id(self):
 
103
        return self.path2id('')
 
104
 
95
105
    def _comparison_data(self, entry, path):
96
106
        """See Tree._comparison_data."""
97
107
        if entry is None:
98
108
            return None, False, None
99
109
        return entry.kind, entry.executable, None
100
110
 
 
111
    @needs_tree_write_lock
 
112
    def rename_one(self, from_rel, to_rel):
 
113
        file_id = self.path2id(from_rel)
 
114
        to_dir, to_tail = os.path.split(to_rel)
 
115
        to_parent_id = self.path2id(to_dir)
 
116
        self._file_transport.move(from_rel, to_rel)
 
117
        self._inventory.rename(file_id, to_parent_id, to_tail)
 
118
 
 
119
    def path_content_summary(self, path):
 
120
        """See Tree.path_content_summary."""
 
121
        id = self.path2id(path)
 
122
        if id is None:
 
123
            return 'missing', None, None, None
 
124
        kind = self.kind(id)
 
125
        if kind == 'file':
 
126
            bytes = self._file_transport.get_bytes(path)
 
127
            size = len(bytes)
 
128
            executable = self._inventory[id].executable
 
129
            sha1 = None # no stat cache
 
130
            return (kind, size, executable, sha1)
 
131
        elif kind == 'directory':
 
132
            # memory tree does not support nested trees yet.
 
133
            return kind, None, None, None
 
134
        elif kind == 'symlink':
 
135
            raise NotImplementedError('symlink support')
 
136
        else:
 
137
            raise NotImplementedError('unknown kind')
 
138
 
101
139
    def _file_size(self, entry, stat_value):
102
140
        """See Tree._file_size."""
103
141
        if entry is None:
181
219
 
182
220
    def _populate_from_branch(self):
183
221
        """Populate the in-tree state from the branch."""
184
 
        self._basis_tree = self.branch.repository.revision_tree(
185
 
            self._branch_revision_id)
186
 
        if self._branch_revision_id is None:
 
222
        self._set_basis()
 
223
        if self._branch_revision_id == _mod_revision.NULL_REVISION:
187
224
            self._parent_ids = []
188
225
        else:
189
226
            self._parent_ids = [self._branch_revision_id]
190
 
        self._inventory = deepcopy(self._basis_tree._inventory)
 
227
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
191
228
        self._file_transport = MemoryTransport()
192
229
        # TODO copy the revision trees content, or do it lazy, or something.
193
 
        inventory_entries = self._inventory.iter_entries()
 
230
        inventory_entries = self._basis_tree.iter_entries_by_dir()
194
231
        for path, entry in inventory_entries:
 
232
            self._inventory.add(entry.copy())
195
233
            if path == '':
196
234
                continue
197
235
            if entry.kind == 'directory':
249
287
            _mod_revision.check_not_reserved_id(revision_id)
250
288
        if len(revision_ids) == 0:
251
289
            self._parent_ids = []
252
 
            self._basis_tree = self.branch.repository.revision_tree(None)
 
290
            self._branch_revision_id = _mod_revision.NULL_REVISION
253
291
        else:
254
292
            self._parent_ids = revision_ids
255
 
            self._basis_tree = self.branch.repository.revision_tree(
256
 
                                    revision_ids[0])
257
293
            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
258
307
 
259
308
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
260
309
        """See MutableTree.set_parent_trees()."""
261
310
        if len(parents_list) == 0:
262
311
            self._parent_ids = []
263
 
            self._basis_tree = self.branch.repository.revision_tree(None)
 
312
            self._basis_tree = self.branch.repository.revision_tree(
 
313
                                   _mod_revision.NULL_REVISION)
264
314
        else:
265
315
            if parents_list[0][1] is None and not allow_leftmost_as_ghost:
266
316
                # a ghost in the left most parent
267
317
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
268
318
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
269
319
            if parents_list[0][1] is None or parents_list[0][1] == 'null:':
270
 
                import pdb; pdb.set_trace()
271
 
                self._basis_tree = self.branch.repository.revision_tree(None)
 
320
                self._basis_tree = self.branch.repository.revision_tree(
 
321
                                       _mod_revision.NULL_REVISION)
272
322
            else:
273
323
                self._basis_tree = parents_list[0][1]
274
324
            self._branch_revision_id = parents_list[0][0]