/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 repository.py

Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
110
110
            o = self._git.object_store[sha]
111
111
            if not isinstance(o, Commit):
112
112
                continue
113
 
            rev, roundtrip_revid, testament3_sha1 = mapping.import_commit(o,
 
113
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
114
114
                self.lookup_foreign_revision_id)
115
115
            yield o.id, rev.revision_id, roundtrip_revid
116
116
 
170
170
        if foreign_revid == ZERO_SHA:
171
171
            return revision.NULL_REVISION
172
172
        commit = self._git[foreign_revid]
173
 
        rev, roundtrip_revid, testament3_sha1 = mapping.import_commit(commit,
 
173
        rev, roundtrip_revid, verifiers = mapping.import_commit(commit,
174
174
            lambda x: None)
175
175
        # FIXME: check testament before doing this?
176
176
        if roundtrip_revid:
208
208
            commit = self._git[git_commit_id]
209
209
        except KeyError:
210
210
            raise errors.NoSuchRevision(self, revision_id)
211
 
        revision, roundtrip_revid, testament3_sha1 = mapping.import_commit(
 
211
        revision, roundtrip_revid, verifiers = mapping.import_commit(
212
212
            commit, self.lookup_foreign_revision_id)
213
213
        assert revision is not None
214
 
        # FIXME: check testament3_sha1 ?
 
214
        # FIXME: check verifiers ?
215
215
        if roundtrip_revid:
216
216
            revision.revision_id = roundtrip_revid
217
217
        return revision