/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
21
21
 
22
22
import bzrlib
23
23
from bzrlib import (
 
24
    deprecated_graph,
24
25
    errors,
25
26
    graph,
26
27
    inventory,
28
29
    repository,
29
30
    revision,
30
31
    revisiontree,
31
 
    ui,
32
32
    urlutils,
 
33
    versionedfile,
33
34
    )
34
35
from bzrlib.foreign import (
35
36
        ForeignRepository,
40
41
from bzrlib.plugins.git.foreign import (
41
42
    versionedfiles,
42
43
    )
43
 
from bzrlib.plugins.git.mapping import default_mapping, mapping_registry
44
 
from bzrlib.plugins.git.versionedfiles import GitTexts
 
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
95
94
        self.texts = None
96
95
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
97
96
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
98
 
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
99
 
        self.texts = GitTexts(self)
100
97
        self.tags = GitTags(self._git.get_tags())
101
98
 
102
99
    def all_revision_ids(self):
127
124
            if revision_id == revision.NULL_REVISION:
128
125
                parent_map[revision_id] = ()
129
126
                continue
130
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
127
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
131
128
            commit  = self._git.commit(hexsha)
132
129
            if commit is None:
133
130
                continue
134
131
            else:
135
 
                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]
136
133
        return parent_map
137
134
 
138
135
    def get_ancestry(self, revision_id, topo_sorted=True):
150
147
        ancestry.reverse()
151
148
        return ancestry
152
149
 
153
 
    def import_revision_gist(self, source, revid):
154
 
        pass
155
 
 
156
 
    def dfetch(self, source, stop_revision):
157
 
        if stop_revision is None:
158
 
            raise NotImplementedError
159
 
        revidmap = {}
160
 
        todo = []
161
 
        source.lock_read()
162
 
        try:
163
 
            graph = source.get_graph()
164
 
            for revid, parents in graph.iter_ancestry([stop_revision]):
165
 
                if not self.has_revision(revid):
166
 
                    todo.append(revid)
167
 
            pb = ui.ui_factory.nested_progress_bar()
168
 
            try:
169
 
                for i, revid in enumerate(reversed(todo)):
170
 
                    pb.update("pushing revisions", i, len(todo))
171
 
                    revidmap[revid] = self.import_revision_gist(source, revid)
172
 
            finally:
173
 
                pb.finished()
174
 
        finally:
175
 
            source.unlock()
176
 
        return revidmap
177
 
 
178
150
    def get_signature_text(self, revision_id):
179
151
        raise errors.NoSuchRevision(self, revision_id)
180
152
 
190
162
    def has_signature_for_revision_id(self, revision_id):
191
163
        return False
192
164
 
193
 
    def lookup_git_revid(self, bzr_revid):
 
165
    def lookup_git_revid(self, bzr_revid, mapping):
194
166
        try:
195
 
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
167
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
196
168
        except errors.InvalidRevisionId:
197
169
            raise errors.NoSuchRevision(self, bzr_revid)
198
170
 
199
171
    def get_revision(self, revision_id):
200
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
 
172
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
201
173
        try:
202
174
            commit = self._git.commit(git_commit_id)
203
175
        except KeyError:
204
176
            raise errors.NoSuchRevision(self, revision_id)
205
177
        # print "fetched revision:", git_commit_id
206
 
        revision = mapping.import_commit(commit)
 
178
        revision = self.get_mapping().import_commit(commit)
207
179
        assert revision is not None
208
180
        return revision
209
181
 
230
202
            inv.revision_id = revision_id
231
203
            return revisiontree.RevisionTree(self, inv, revision_id)
232
204
 
233
 
        return GitRevisionTree(self, revision_id)
 
205
        return GitRevisionTree(self, self.get_mapping(), revision_id)
234
206
 
235
207
    def get_inventory(self, revision_id):
236
208
        assert revision_id != None
245
217
 
246
218
class GitRevisionTree(revisiontree.RevisionTree):
247
219
 
248
 
    def __init__(self, repository, revision_id):
 
220
    def __init__(self, repository, mapping, revision_id):
249
221
        self._repository = repository
250
222
        self.revision_id = revision_id
251
223
        assert isinstance(revision_id, str)
252
 
        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)
253
226
        try:
254
227
            commit = repository._git.commit(git_id)
255
228
        except KeyError, r: