/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

  • Committer: Jelmer Vernooij
  • Date: 2008-09-01 14:03:34 UTC
  • mto: (3680.1.1 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 3689.
  • Revision ID: jelmer@samba.org-20080901140334-iph5u142g49dv3zu
Use NULL_REVISION rather than None for Repository.revision_tree().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
272
272
            _mod_revision.check_not_reserved_id(revision_id)
273
273
        if len(revision_ids) == 0:
274
274
            self._parent_ids = []
275
 
            self._basis_tree = self.branch.repository.revision_tree(None)
 
275
            self._basis_tree = self.branch.repository.revision_tree(
 
276
                                    _mod_revision.NULL_REVISION)
276
277
        else:
277
278
            self._parent_ids = revision_ids
278
279
            self._basis_tree = self.branch.repository.revision_tree(
283
284
        """See MutableTree.set_parent_trees()."""
284
285
        if len(parents_list) == 0:
285
286
            self._parent_ids = []
286
 
            self._basis_tree = self.branch.repository.revision_tree(None)
 
287
            self._basis_tree = self.branch.repository.revision_tree(
 
288
                                   _mod_revision.NULL_REVISION)
287
289
        else:
288
290
            if parents_list[0][1] is None and not allow_leftmost_as_ghost:
289
291
                # a ghost in the left most parent
290
292
                raise errors.GhostRevisionUnusableHere(parents_list[0][0])
291
293
            self._parent_ids = [parent_id for parent_id, tree in parents_list]
292
294
            if parents_list[0][1] is None or parents_list[0][1] == 'null:':
293
 
                self._basis_tree = self.branch.repository.revision_tree(None)
 
295
                self._basis_tree = self.branch.repository.revision_tree(
 
296
                                       _mod_revision.NULL_REVISION)
294
297
            else:
295
298
                self._basis_tree = parents_list[0][1]
296
299
            self._branch_revision_id = parents_list[0][0]