/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
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, inventory_to_tree_and_blobs, revision_to_commit
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):
139
136
        """See Repository.get_ancestry().
140
137
        """
141
138
        if revision_id is None:
142
 
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
 
139
            return self._all_revision_ids()
143
140
        assert isinstance(revision_id, str)
144
141
        ancestry = []
145
142
        graph = self.get_graph()
146
143
        for rev, parents in graph.iter_ancestry([revision_id]):
 
144
            if rev == revision.NULL_REVISION:
 
145
                rev = None
147
146
            ancestry.append(rev)
148
147
        ancestry.reverse()
149
 
        return [None] + ancestry
150
 
 
151
 
    def import_revision_gist(self, source, revid, parent_lookup):
152
 
        """Impor the gist of another revision into this Git repository.
153
 
 
154
 
        """
155
 
        objects = []
156
 
        rev = source.get_revision(revid)
157
 
        for sha, object, path in inventory_to_tree_and_blobs(source, None, revid):
158
 
            if path == "":
159
 
                tree_sha = sha
160
 
            objects.append((object, path))
161
 
        commit = revision_to_commit(rev, tree_sha, parent_lookup)
162
 
        objects.append((commit, None))
163
 
        self._git.object_store.add_objects(objects)
164
 
        return commit.sha().hexdigest()
165
 
 
166
 
    def dfetch(self, source, stop_revision):
167
 
        if stop_revision is None:
168
 
            raise NotImplementedError
169
 
        revidmap = {}
170
 
        gitidmap = {}
171
 
        todo = []
172
 
        source.lock_write()
173
 
        try:
174
 
            graph = source.get_graph()
175
 
            ancestry = [x for x in source.get_ancestry(stop_revision) if x is not None]
176
 
            for revid in graph.iter_topo_order(ancestry):
177
 
                if not self.has_revision(revid):
178
 
                    todo.append(revid)
179
 
            pb = ui.ui_factory.nested_progress_bar()
180
 
            try:
181
 
                for i, revid in enumerate(todo):
182
 
                    pb.update("pushing revisions", i, len(todo))
183
 
                    git_commit = self.import_revision_gist(source, revid, gitidmap.__getitem__)
184
 
                    gitidmap[revid] = git_commit
185
 
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(git_commit)
186
 
                    revidmap[revid] = git_revid
187
 
            finally:
188
 
                pb.finished()
189
 
            source.fetch(self, revision_id=revidmap[stop_revision])
190
 
        finally:
191
 
            source.unlock()
192
 
        return revidmap
 
148
        return ancestry
193
149
 
194
150
    def get_signature_text(self, revision_id):
195
151
        raise errors.NoSuchRevision(self, revision_id)
206
162
    def has_signature_for_revision_id(self, revision_id):
207
163
        return False
208
164
 
209
 
    def lookup_git_revid(self, bzr_revid):
 
165
    def lookup_git_revid(self, bzr_revid, mapping):
210
166
        try:
211
 
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
167
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
212
168
        except errors.InvalidRevisionId:
213
169
            raise errors.NoSuchRevision(self, bzr_revid)
214
170
 
215
171
    def get_revision(self, revision_id):
216
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
 
172
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
217
173
        try:
218
174
            commit = self._git.commit(git_commit_id)
219
175
        except KeyError:
220
176
            raise errors.NoSuchRevision(self, revision_id)
221
177
        # print "fetched revision:", git_commit_id
222
 
        revision = mapping.import_commit(commit)
 
178
        revision = self.get_mapping().import_commit(commit)
223
179
        assert revision is not None
224
180
        return revision
225
181
 
246
202
            inv.revision_id = revision_id
247
203
            return revisiontree.RevisionTree(self, inv, revision_id)
248
204
 
249
 
        return GitRevisionTree(self, revision_id)
 
205
        return GitRevisionTree(self, self.get_mapping(), revision_id)
250
206
 
251
207
    def get_inventory(self, revision_id):
252
208
        assert revision_id != None
255
211
    def set_make_working_trees(self, trees):
256
212
        pass
257
213
 
258
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
 
214
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
259
215
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
260
216
 
261
217
 
262
218
class GitRevisionTree(revisiontree.RevisionTree):
263
219
 
264
 
    def __init__(self, repository, revision_id):
 
220
    def __init__(self, repository, mapping, revision_id):
265
221
        self._repository = repository
266
222
        self.revision_id = revision_id
267
223
        assert isinstance(revision_id, str)
268
 
        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)
269
226
        try:
270
227
            commit = repository._git.commit(git_id)
271
228
        except KeyError, r: