/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

Add git: revision specifier.

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):
64
64
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
65
65
        from bzrlib.plugins.git import fetch
66
66
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
 
67
        repository.InterRepository.register_optimiser(fetch.InterGitNonGitRepository)
67
68
 
68
69
    def is_shared(self):
69
70
        return True
124
125
            if revision_id == revision.NULL_REVISION:
125
126
                parent_map[revision_id] = ()
126
127
                continue
127
 
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
 
128
            hexsha, mapping = self.lookup_git_revid(revision_id)
128
129
            commit  = self._git.commit(hexsha)
129
130
            if commit is None:
130
131
                continue
131
132
            else:
132
 
                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]
133
134
        return parent_map
134
135
 
135
136
    def get_ancestry(self, revision_id, topo_sorted=True):
162
163
    def has_signature_for_revision_id(self, revision_id):
163
164
        return False
164
165
 
165
 
    def lookup_git_revid(self, bzr_revid, mapping):
 
166
    def lookup_git_revid(self, bzr_revid):
166
167
        try:
167
 
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
 
168
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
168
169
        except errors.InvalidRevisionId:
169
170
            raise errors.NoSuchRevision(self, bzr_revid)
170
171
 
171
172
    def get_revision(self, revision_id):
172
 
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
 
173
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
173
174
        try:
174
175
            commit = self._git.commit(git_commit_id)
175
176
        except KeyError:
176
177
            raise errors.NoSuchRevision(self, revision_id)
177
178
        # print "fetched revision:", git_commit_id
178
 
        revision = self.get_mapping().import_commit(commit)
 
179
        revision = mapping.import_commit(commit)
179
180
        assert revision is not None
180
181
        return revision
181
182
 
202
203
            inv.revision_id = revision_id
203
204
            return revisiontree.RevisionTree(self, inv, revision_id)
204
205
 
205
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
206
        return GitRevisionTree(self, revision_id)
206
207
 
207
208
    def get_inventory(self, revision_id):
208
209
        assert revision_id != None
217
218
 
218
219
class GitRevisionTree(revisiontree.RevisionTree):
219
220
 
220
 
    def __init__(self, repository, mapping, revision_id):
 
221
    def __init__(self, repository, revision_id):
221
222
        self._repository = repository
222
223
        self.revision_id = revision_id
223
224
        assert isinstance(revision_id, str)
224
 
        self.mapping = mapping
225
 
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
 
225
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
226
226
        try:
227
227
            commit = repository._git.commit(git_id)
228
228
        except KeyError, r: