← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-09-04 14:22:34 UTC
  • mfrom: (3680.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20080904142234-pldim6ie032cb6am
(Jelmer) Deprecate Repository.revision_tree(None).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
159
159
    def get_base(self, revision):
160
160
        revision_info = self.get_revision_info(revision.revision_id)
161
161
        if revision_info.base_id is not None:
162
 
            if revision_info.base_id == NULL_REVISION:
163
 
                return None
164
 
            else:
165
 
                return revision_info.base_id
 
162
            return revision_info.base_id
166
163
        if len(revision.parent_ids) == 0:
167
164
            # There is no base listed, and
168
165
            # the lowest revision doesn't have a parent
169
166
            # so this is probably against the empty tree
170
 
            # and thus base truly is None
171
 
            return None
 
167
            # and thus base truly is NULL_REVISION
 
168
            return NULL_REVISION
172
169
        else:
173
170
            return revision.parent_ids[-1]
174
171