/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

Merge changes, open index.

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