← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

Initial commit for russian version of documents.

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
 
            return revision_info.base_id
 
162
            if revision_info.base_id == NULL_REVISION:
 
163
                return None
 
164
            else:
 
165
                return revision_info.base_id
163
166
        if len(revision.parent_ids) == 0:
164
167
            # There is no base listed, and
165
168
            # the lowest revision doesn't have a parent
166
169
            # so this is probably against the empty tree
167
 
            # and thus base truly is NULL_REVISION
168
 
            return NULL_REVISION
 
170
            # and thus base truly is None
 
171
            return None
169
172
        else:
170
173
            return revision.parent_ids[-1]
171
174