← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Patch Queue Manager
  • Date: 2013-05-27 10:52:24 UTC
  • mfrom: (6576.1.5 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20130527105224-3k2yibl2xrvnh6rf
(vila) Handle empty quoted strings in command lines and various
 cleanups (Vincent Ladeuil)

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."""
72
81
 
73
82
    def _gather_kinds(self, files, kinds):
74
83
        """See MutableTree._gather_kinds.
75
 
        
 
84
 
76
85
        This implementation does not care about the file kind of
77
86
        missing files, so is a no-op.
78
87
        """
99
108
            return None, False, None
100
109
        return entry.kind, entry.executable, None
101
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
 
102
119
    def path_content_summary(self, path):
103
120
        """See Tree.path_content_summary."""
104
121
        id = self.path2id(path)
202
219
 
203
220
    def _populate_from_branch(self):
204
221
        """Populate the in-tree state from the branch."""
205
 
        self._basis_tree = self.branch.repository.revision_tree(
206
 
            self._branch_revision_id)
 
222
        self._set_basis()
207
223
        if self._branch_revision_id == _mod_revision.NULL_REVISION:
208
224
            self._parent_ids = []
209
225
        else:
210
226
            self._parent_ids = [self._branch_revision_id]
211
 
        self._inventory = deepcopy(self._basis_tree._inventory)
 
227
        self._inventory = Inventory(None, self._basis_tree.get_revision_id())
212
228
        self._file_transport = MemoryTransport()
213
229
        # TODO copy the revision trees content, or do it lazy, or something.
214
 
        inventory_entries = self._inventory.iter_entries()
 
230
        inventory_entries = self._basis_tree.iter_entries_by_dir()
215
231
        for path, entry in inventory_entries:
 
232
            self._inventory.add(entry.copy())
216
233
            if path == '':
217
234
                continue
218
235
            if entry.kind == 'directory':
270
287
            _mod_revision.check_not_reserved_id(revision_id)
271
288
        if len(revision_ids) == 0:
272
289
            self._parent_ids = []
273
 
            self._basis_tree = self.branch.repository.revision_tree(
274
 
                                    _mod_revision.NULL_REVISION)
 
290
            self._branch_revision_id = _mod_revision.NULL_REVISION
275
291
        else:
276
292
            self._parent_ids = revision_ids
277
 
            self._basis_tree = self.branch.repository.revision_tree(
278
 
                                    revision_ids[0])
279
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
280
307
 
281
308
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
282
309
        """See MutableTree.set_parent_trees()."""