/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 push.py

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
31
31
    NoPushSupport,
32
32
    )
33
33
from bzrlib.plugins.git.object_store import (
34
 
    get_object_store,
 
34
    BazaarObjectStore,
35
35
    )
36
36
from bzrlib.plugins.git.repository import (
37
37
    GitRepository,
41
41
from bzrlib.plugins.git.remote import (
42
42
    RemoteGitRepository,
43
43
    )
44
 
from bzrlib.plugins.git.refs import (
45
 
    UnpeelMap,
46
 
    )
47
44
 
48
45
 
49
46
class MissingObjectsIterator(object):
103
100
    def __init__(self, source, target):
104
101
        super(InterToGitRepository, self).__init__(source, target)
105
102
        self.mapping = self.target.get_mapping()
106
 
        self.source_store = get_object_store(self.source, self.mapping)
 
103
        self.source_store = BazaarObjectStore(self.source, self.mapping)
107
104
 
108
105
    @staticmethod
109
106
    def _get_repo_format_to_test():
190
187
            pb.finished()
191
188
        for sha1 in stop_sha1s:
192
189
            try:
193
 
                for (kind, (revid, tree_sha, verifiers)) in self.source_store.lookup_git_sha(sha1):
194
 
                    missing.append(revid)
195
 
                    revid_sha_map[revid] = sha1
 
190
                (kind, (revid, tree_sha, verifiers)) = self.source_store.lookup_git_sha(sha1)
196
191
            except KeyError:
197
192
                continue
 
193
            else:
 
194
                missing.append(revid)
 
195
                revid_sha_map[revid] = sha1
198
196
        return graph.iter_topo_order(missing)
199
197
 
200
198
    def _get_target_bzr_refs(self):
204
202
            with Git SHA, Bazaar revid as values.
205
203
        """
206
204
        bzr_refs = {}
207
 
        refs = {}
208
 
        for k in self.target._git.refs.allkeys():
209
 
            v = self.target._git.refs.read_ref(k)
 
205
        refs = self.target._git.get_refs()
 
206
        for k, v in refs.iteritems():
210
207
            try:
211
 
                for (kind, type_data) in self.source_store.lookup_git_sha(v):
212
 
                    if kind == "commit" and self.source.has_revision(type_data[0]):
213
 
                        revid = type_data[0]
214
 
                        break
 
208
                (kind, type_data) = self.source_store.lookup_git_sha(v)
 
209
            except KeyError:
 
210
                revid = None
 
211
            else:
 
212
                if kind == "commit":
 
213
                    revid = type_data[0]
215
214
                else:
216
215
                    revid = None
217
 
            except KeyError:
218
 
                revid = None
219
216
            bzr_refs[k] = (v, revid)
220
217
        return bzr_refs
221
218
 
222
219
    def fetch_refs(self, update_refs):
223
 
        self.source_store.lock_read()
 
220
        self.source.lock_read()
224
221
        try:
225
222
            old_refs = self._get_target_bzr_refs()
226
223
            new_refs = update_refs(old_refs)
227
224
            self.fetch(mapped_refs=new_refs.values())
228
225
        finally:
229
 
            self.source_store.unlock()
 
226
            self.source.unlock()
230
227
        return old_refs, new_refs
231
228
 
232
229
    def dfetch_refs(self, update_refs):
233
 
        self.source_store.lock_read()
 
230
        self.source.lock_read()
234
231
        try:
235
232
            old_refs = self._get_target_bzr_refs()
236
233
            new_refs = update_refs(old_refs)
237
 
            gitidmap = {}
238
 
            revidmap = {}
239
 
            todo = list(self.missing_revisions(new_refs.values()))
240
 
            pb = ui.ui_factory.nested_progress_bar()
241
 
            try:
242
 
                object_generator = self._get_missing_objects_iterator(pb)
243
 
                for old_bzr_revid, git_commit in object_generator.import_revisions(
244
 
                    todo, roundtrip=False):
245
 
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
246
 
                    assert type(old_bzr_revid) is str
247
 
                    assert type(new_bzr_revid) is str
248
 
                    assert type(git_commit) is str
249
 
                    revidmap[old_bzr_revid] = new_bzr_revid
250
 
                    gitidmap[old_bzr_revid] = git_commit
251
 
                self.target_store.add_objects(object_generator)
252
 
            finally:
253
 
                pb.finished()
 
234
            revidmap, gitidmap = self.dfetch(new_refs.values())
254
235
            for name, (gitid, revid) in new_refs.iteritems():
255
236
                if gitid is None:
256
237
                    try:
257
238
                        gitid = gitidmap[revid]
258
239
                    except KeyError:
259
240
                        gitid = self.source_store._lookup_revision_sha1(revid)
260
 
                self.target_refs[name] = gitid
 
241
                self.target._git.refs[name] = gitid
 
242
                new_refs[name] = (gitid, self.source_store.lookup_git_sha(gitid)[1][0])
261
243
        finally:
262
 
            self.source_store.unlock()
 
244
            self.source.unlock()
263
245
        return revidmap, old_refs, new_refs
264
246
 
265
247
    def _get_missing_objects_iterator(self, pb):
267
249
 
268
250
    def dfetch(self, stop_revisions):
269
251
        """Import the gist of the ancestry of a particular revision."""
 
252
        gitidmap = {}
 
253
        revidmap = {}
 
254
        self.source.lock_read()
 
255
        try:
 
256
            todo = list(self.missing_revisions(stop_revisions))
 
257
            pb = ui.ui_factory.nested_progress_bar()
 
258
            try:
 
259
                object_generator = self._get_missing_objects_iterator(pb)
 
260
                for old_bzr_revid, git_commit in object_generator.import_revisions(
 
261
                    todo, roundtrip=False):
 
262
                    new_bzr_revid = self.mapping.revision_id_foreign_to_bzr(git_commit)
 
263
                    revidmap[old_bzr_revid] = new_bzr_revid
 
264
                    gitidmap[old_bzr_revid] = git_commit
 
265
                self.target_store.add_objects(object_generator)
 
266
            finally:
 
267
                pb.finished()
 
268
        finally:
 
269
            self.source.unlock()
 
270
        return revidmap, gitidmap
270
271
 
271
272
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
272
273
            fetch_spec=None, mapped_refs=None):
273
 
        if not self.mapping.roundtripping:
274
 
            raise NoPushSupport()
275
 
        self.source_store.lock_read()
 
274
        if mapped_refs is not None:
 
275
            stop_revisions = mapped_refs
 
276
        elif revision_id is not None:
 
277
            stop_revisions = [(None, revision_id)]
 
278
        elif fetch_spec is not None:
 
279
            stop_revisions = [(None, revid) for revid in fetch_spec.heads]
 
280
        else:
 
281
            stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
 
282
        self.source.lock_read()
276
283
        try:
277
 
            if mapped_refs is not None:
278
 
                stop_revisions = mapped_refs
279
 
            elif revision_id is not None:
280
 
                stop_revisions = [(None, revision_id)]
281
 
            elif fetch_spec is not None:
282
 
                stop_revisions = [(None, revid) for revid in fetch_spec.heads]
283
 
            else:
284
 
                stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
285
284
            todo = list(self.missing_revisions(stop_revisions))
286
285
            pb = ui.ui_factory.nested_progress_bar()
287
286
            try:
296
295
            finally:
297
296
                pb.finished()
298
297
        finally:
299
 
            self.source_store.unlock()
 
298
            self.source.unlock()
300
299
 
301
300
    @staticmethod
302
301
    def is_compatible(source, target):
309
308
 
310
309
    def dfetch_refs(self, update_refs):
311
310
        """Import the gist of the ancestry of a particular revision."""
312
 
        unpeel_map = UnpeelMap.from_repository(self.source)
313
311
        revidmap = {}
314
312
        def determine_wants(old_refs):
315
313
            ret = {}
316
 
            self.old_refs = dict([(k, (v, None)) for (k, v) in old_refs.iteritems()])
 
314
            self.old_refs = old_refs
317
315
            self.new_refs = update_refs(self.old_refs)
318
316
            for name, (gitid, revid) in self.new_refs.iteritems():
319
317
                if gitid is None:
320
 
                    git_sha = self.source_store._lookup_revision_sha1(revid)
321
 
                    ret[name] = unpeel_map.re_unpeel_tag(git_sha, old_refs.get(name))
 
318
                    ret[name] = self.source_store._lookup_revision_sha1(revid)
322
319
                else:
323
320
                    ret[name] = gitid
324
321
            return ret
325
 
        self.source_store.lock_read()
 
322
        self.source.lock_read()
326
323
        try:
327
324
            new_refs = self.target.send_pack(determine_wants,
328
325
                    self.source_store.generate_lossy_pack_contents)
329
326
        finally:
330
 
            self.source_store.unlock()
 
327
            self.source.unlock()
331
328
        return revidmap, self.old_refs, self.new_refs
332
329
 
333
330
    def fetch_refs(self, update_refs):