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