/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

Fix branch cloning.

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