/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

Register lazily where possible.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
41
41
from bzrlib.plugins.git.foreign import (
42
42
    versionedfiles,
43
43
    )
44
 
from bzrlib.plugins.git.mapping import default_mapping
 
44
from bzrlib.plugins.git.mapping import default_mapping, mapping_registry
45
45
 
46
 
from bzrlib.plugins.git import git
 
46
import dulwich as git
47
47
 
48
48
 
49
49
class GitTags(object):
125
125
            if revision_id == revision.NULL_REVISION:
126
126
                parent_map[revision_id] = ()
127
127
                continue
128
 
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
 
128
            hexsha, mapping = self.lookup_git_revid(revision_id)
129
129
            commit  = self._git.commit(hexsha)
130
130
            if commit is None:
131
131
                continue
132
132
            else:
133
 
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
 
133
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
134
134
        return parent_map
135
135
 
136
136
    def get_ancestry(self, revision_id, topo_sorted=True):
163
163
    def has_signature_for_revision_id(self, revision_id):
164
164
        return False
165
165
 
166
 
    def lookup_git_revid(self, bzr_revid, mapping):
 
166
    def lookup_git_revid(self, bzr_revid):
167
167
        try:
168
 
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
 
168
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
169
169
        except errors.InvalidRevisionId:
170
170
            raise errors.NoSuchRevision(self, bzr_revid)
171
171
 
172
172
    def get_revision(self, revision_id):
173
 
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
 
173
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
174
174
        try:
175
175
            commit = self._git.commit(git_commit_id)
176
176
        except KeyError:
177
177
            raise errors.NoSuchRevision(self, revision_id)
178
178
        # print "fetched revision:", git_commit_id
179
 
        revision = self.get_mapping().import_commit(commit)
 
179
        revision = mapping.import_commit(commit)
180
180
        assert revision is not None
181
181
        return revision
182
182
 
203
203
            inv.revision_id = revision_id
204
204
            return revisiontree.RevisionTree(self, inv, revision_id)
205
205
 
206
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
206
        return GitRevisionTree(self, revision_id)
207
207
 
208
208
    def get_inventory(self, revision_id):
209
209
        assert revision_id != None
218
218
 
219
219
class GitRevisionTree(revisiontree.RevisionTree):
220
220
 
221
 
    def __init__(self, repository, mapping, revision_id):
 
221
    def __init__(self, repository, revision_id):
222
222
        self._repository = repository
223
223
        self.revision_id = revision_id
224
224
        assert isinstance(revision_id, str)
225
 
        self.mapping = mapping
226
 
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
 
225
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
227
226
        try:
228
227
            commit = repository._git.commit(git_id)
229
228
        except KeyError, r: