/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

Fix imports of TestLoader on newer versions of bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
105
105
        self.texts = GitTexts(self)
106
106
 
107
107
    def _iter_revision_ids(self):
 
108
        mapping = self.get_mapping()
108
109
        for sha in self._git.object_store:
109
110
            o = self._git.object_store[sha]
110
111
            if not isinstance(o, Commit):
111
112
                continue
112
 
            rev = self.get_mapping().import_commit(o,
 
113
            rev, roundtrip_revid, testament3_sha1 = mapping.import_commit(o,
113
114
                self.lookup_foreign_revision_id)
114
 
            yield o.id, rev.revision_id
 
115
            yield o.id, rev.revision_id, roundtrip_revid
115
116
 
116
117
    def all_revision_ids(self):
117
118
        ret = set([])
118
 
        for git_sha, revid in self._iter_revision_ids():
 
119
        for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
119
120
            ret.add(revid)
 
121
            if roundtrip_revid:
 
122
                ret.add(roundtrip_revid)
120
123
        return ret
121
124
 
122
125
    def get_parent_map(self, revids):
131
134
                commit = self._git[hexsha]
132
135
            except KeyError:
133
136
                continue
134
 
            parent_map[revision_id] = [self.lookup_foreign_revision_id(p, mapping) for p in commit.parents]
 
137
            parent_map[revision_id] = [
 
138
                self.lookup_foreign_revision_id(p, mapping)
 
139
                for p in commit.parents]
135
140
        return parent_map
136
141
 
137
142
    def get_ancestry(self, revision_id, topo_sorted=True):
165
170
        if foreign_revid == ZERO_SHA:
166
171
            return revision.NULL_REVISION
167
172
        commit = self._git[foreign_revid]
168
 
        rev = mapping.import_commit(commit, lambda x: None)
169
 
        return rev.revision_id
 
173
        rev, roundtrip_revid, testament3_sha1 = mapping.import_commit(commit,
 
174
            lambda x: None)
 
175
        # FIXME: check testament before doing this?
 
176
        if roundtrip_revid:
 
177
            return roundtrip_revid
 
178
        else:
 
179
            return rev.revision_id
170
180
 
171
181
    def has_signature_for_revision_id(self, revision_id):
172
182
        return False
178
188
            if mapping is None:
179
189
                mapping = self.get_mapping()
180
190
            try:
181
 
                return self._git.refs[mapping.revid_as_refname(bzr_revid)], mapping
 
191
                return (self._git.refs[mapping.revid_as_refname(bzr_revid)],
 
192
                        mapping)
182
193
            except KeyError:
183
194
                # Update refs from Git commit objects
184
195
                # FIXME: Hitting this a lot will be very inefficient...
185
 
                for git_sha, revid in self._iter_revision_ids():
186
 
                    self._git.refs[mapping.revid_as_refname(revid)] = git_sha
187
 
                    if revid == bzr_revid:
 
196
                for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
 
197
                    if not roundtrip_revid:
 
198
                        continue
 
199
                    refname = mapping.revid_as_refname(roundtrip_revid)
 
200
                    self._git.refs[refname] = git_sha
 
201
                    if roundtrip_revid == bzr_revid:
188
202
                        return git_sha, mapping
189
203
                raise errors.NoSuchRevision(self, bzr_revid)
190
204
 
194
208
            commit = self._git[git_commit_id]
195
209
        except KeyError:
196
210
            raise errors.NoSuchRevision(self, revision_id)
197
 
        # print "fetched revision:", git_commit_id
198
 
        revision = mapping.import_commit(commit,
199
 
            self.lookup_foreign_revision_id)
 
211
        revision, roundtrip_revid, testament3_sha1 = mapping.import_commit(
 
212
            commit, self.lookup_foreign_revision_id)
200
213
        assert revision is not None
 
214
        # FIXME: check testament3_sha1 ?
 
215
        if roundtrip_revid:
 
216
            revision.revision_id = roundtrip_revid
201
217
        return revision
202
218
 
203
219
    def has_revision(self, revision_id):
240
256
                        ancestors=None):
241
257
        return GitVersionedFileChecker(self,
242
258
            text_key_references=text_key_references, ancestors=ancestors)
243
 
    
 
259
 
244
260
 
245
261
class GitVersionedFileChecker(repository._VersionedFileChecker):
246
262