/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
99
99
    def is_executable(self, file_id, path=None):
100
100
        return self._inventory[file_id].executable
101
101
 
 
102
    def kind(self, file_id):
 
103
        return self._inventory[file_id].kind
 
104
 
102
105
    def mkdir(self, path, file_id=None):
103
106
        """See MutableTree.mkdir()."""
104
107
        self.add(path, file_id, 'directory')
219
222
            else:
220
223
                raise errors.NoSuchId(self, file_id)
221
224
 
 
225
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
 
226
        """See MutableTree.set_parent_trees()."""
 
227
        if len(revision_ids) == 0:
 
228
            self._parent_ids = []
 
229
            self._basis_tree = self.branch.repository.revision_tree(None)
 
230
        else:
 
231
            self._parent_ids = revision_ids
 
232
            self._basis_tree = self.branch.repository.revision_tree(
 
233
                                    revision_ids[0])
 
234
            self._branch_revision_id = revision_ids[0]
 
235
 
222
236
    def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
223
237
        """See MutableTree.set_parent_trees()."""
224
238
        if len(parents_list) == 0:
225
239
            self._parent_ids = []
226
 
            self._basis_tree = self.branch.repository.revisiontree(None)
 
240
            self._basis_tree = self.branch.repository.revision_tree(None)
227
241
        else:
228
242
            if parents_list[0][1] is None and not allow_leftmost_as_ghost:
229
243
                # a ghost in the left most parent
230
244
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
231
245
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
232
246
            if parents_list[0][1] is None:
233
 
                self._basis_tree = self.branch.repository.revisiontree(None)
 
247
                self._basis_tree = self.branch.repository.revision_tree(None)
234
248
            else:
235
249
                self._basis_tree = parents_list[0][1]
236
250
            self._branch_revision_id = parents_list[0][0]