/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

Pass repository object to versionedfiles.

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
from bzrlib.plugins.git.versionedfiles import GitTexts
45
46
 
46
 
from bzrlib.plugins.git import git
 
47
import dulwich as git
47
48
 
48
49
 
49
50
class GitTags(object):
95
96
        self.texts = None
96
97
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
97
98
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
 
99
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
 
100
        self.texts = GitTexts(self)
98
101
        self.tags = GitTags(self._git.get_tags())
99
102
 
100
103
    def all_revision_ids(self):
125
128
            if revision_id == revision.NULL_REVISION:
126
129
                parent_map[revision_id] = ()
127
130
                continue
128
 
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
 
131
            hexsha, mapping = self.lookup_git_revid(revision_id)
129
132
            commit  = self._git.commit(hexsha)
130
133
            if commit is None:
131
134
                continue
132
135
            else:
133
 
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
 
136
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
134
137
        return parent_map
135
138
 
136
139
    def get_ancestry(self, revision_id, topo_sorted=True):
163
166
    def has_signature_for_revision_id(self, revision_id):
164
167
        return False
165
168
 
166
 
    def lookup_git_revid(self, bzr_revid, mapping):
 
169
    def lookup_git_revid(self, bzr_revid):
167
170
        try:
168
 
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
 
171
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
169
172
        except errors.InvalidRevisionId:
170
173
            raise errors.NoSuchRevision(self, bzr_revid)
171
174
 
172
175
    def get_revision(self, revision_id):
173
 
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
 
176
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
174
177
        try:
175
178
            commit = self._git.commit(git_commit_id)
176
179
        except KeyError:
177
180
            raise errors.NoSuchRevision(self, revision_id)
178
181
        # print "fetched revision:", git_commit_id
179
 
        revision = self.get_mapping().import_commit(commit)
 
182
        revision = mapping.import_commit(commit)
180
183
        assert revision is not None
181
184
        return revision
182
185
 
203
206
            inv.revision_id = revision_id
204
207
            return revisiontree.RevisionTree(self, inv, revision_id)
205
208
 
206
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
209
        return GitRevisionTree(self, revision_id)
207
210
 
208
211
    def get_inventory(self, revision_id):
209
212
        assert revision_id != None
218
221
 
219
222
class GitRevisionTree(revisiontree.RevisionTree):
220
223
 
221
 
    def __init__(self, repository, mapping, revision_id):
 
224
    def __init__(self, repository, revision_id):
222
225
        self._repository = repository
223
226
        self.revision_id = revision_id
224
227
        assert isinstance(revision_id, str)
225
 
        self.mapping = mapping
226
 
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
 
228
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
227
229
        try:
228
230
            commit = repository._git.commit(git_id)
229
231
        except KeyError, r: