/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

Cope with files disappearing during commit.

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