/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

Re-use http connection if possible.

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.unpeel_map 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():
110
113
        """See InterRepository.copy_content."""
111
114
        self.fetch(revision_id, pb, find_ghosts=False)
112
115
 
113
 
    def dfetch_refs(self, update_refs):
114
 
        """Fetch non-roundtripped revisions into the target repository.
115
 
 
116
 
        :param update_refs: Generate refs to fetch. Receives dictionary
117
 
            with old names to old git shas. Should return a dictionary
118
 
            of new names to Bazaar revision ids.
119
 
        :return: revision id map, old refs dictionary and new refs dictionary
120
 
        """
121
 
        raise NotImplementedError(self.dfetch_refs)
122
 
 
123
 
    def fetch_refs(self, update_refs):
124
 
        """Fetch possibly roundtripped revisions into the target repository.
 
116
    def fetch_refs(self, update_refs, lossy):
 
117
        """Fetch possibly roundtripped revisions into the target repository
 
118
        and update refs.
125
119
 
126
120
        :param update_refs: Generate refs to fetch. Receives dictionary
127
121
            with old refs (git shas), returns dictionary of new names to
128
122
            git shas.
 
123
        :param lossy: Whether to roundtrip
129
124
        :return: old refs, new refs
130
125
        """
131
126
        raise NotImplementedError(self.fetch_refs)
187
182
            pb.finished()
188
183
        for sha1 in stop_sha1s:
189
184
            try:
190
 
                (kind, (revid, tree_sha, verifiers)) = self.source_store.lookup_git_sha(sha1)
 
185
                for (kind, (revid, tree_sha, verifiers)) in self.source_store.lookup_git_sha(sha1):
 
186
                    missing.append(revid)
 
187
                    revid_sha_map[revid] = sha1
191
188
            except KeyError:
192
189
                continue
193
 
            else:
194
 
                missing.append(revid)
195
 
                revid_sha_map[revid] = sha1
196
190
        return graph.iter_topo_order(missing)
197
191
 
198
192
    def _get_target_bzr_refs(self):
202
196
            with Git SHA, Bazaar revid as values.
203
197
        """
204
198
        bzr_refs = {}
205
 
        refs = self.target._git.get_refs()
206
 
        for k, v in refs.iteritems():
 
199
        refs = {}
 
200
        for k in self.target._git.refs.allkeys():
 
201
            v = self.target._git.refs.read_ref(k)
207
202
            try:
208
 
                (kind, type_data) = self.source_store.lookup_git_sha(v)
 
203
                for (kind, type_data) in self.source_store.lookup_git_sha(v):
 
204
                    if kind == "commit" and self.source.has_revision(type_data[0]):
 
205
                        revid = type_data[0]
 
206
                        break
 
207
                else:
 
208
                    revid = None
209
209
            except KeyError:
210
210
                revid = None
211
 
            else:
212
 
                if kind == "commit":
213
 
                    revid = type_data[0]
214
 
                else:
215
 
                    revid = None
216
211
            bzr_refs[k] = (v, revid)
217
212
        return bzr_refs
218
213
 
219
 
    def fetch_refs(self, update_refs):
220
 
        self.source.lock_read()
221
 
        try:
222
 
            old_refs = self._get_target_bzr_refs()
223
 
            new_refs = update_refs(old_refs)
224
 
            self.fetch(mapped_refs=new_refs.values())
225
 
        finally:
226
 
            self.source.unlock()
227
 
        return old_refs, new_refs
228
 
 
229
 
    def dfetch_refs(self, update_refs):
230
 
        self.source.lock_read()
231
 
        try:
232
 
            old_refs = self._get_target_bzr_refs()
233
 
            new_refs = update_refs(old_refs)
234
 
            revidmap, gitidmap = self.dfetch(new_refs.values())
 
214
    def fetch_refs(self, update_refs, lossy):
 
215
        self.source_store.lock_read()
 
216
        try:
 
217
            old_refs = self._get_target_bzr_refs()
 
218
            new_refs = update_refs(old_refs)
 
219
            revidmap = self.fetch_objects(new_refs.values(), roundtrip=not lossy)
235
220
            for name, (gitid, revid) in new_refs.iteritems():
236
221
                if gitid is None:
237
222
                    try:
238
 
                        gitid = gitidmap[revid]
 
223
                        gitid = revidmap[revid][0]
239
224
                    except KeyError:
240
225
                        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])
 
226
                assert len(gitid) == 40
 
227
                self.target_refs[name] = gitid
243
228
        finally:
244
 
            self.source.unlock()
 
229
            self.source_store.unlock()
245
230
        return revidmap, old_refs, new_refs
246
231
 
 
232
    def fetch_objects(self, revs, roundtrip):
 
233
        todo = list(self.missing_revisions(revs))
 
234
        revidmap = {}
 
235
        pb = ui.ui_factory.nested_progress_bar()
 
236
        try:
 
237
            object_generator = self._get_missing_objects_iterator(pb)
 
238
            for (old_revid, git_sha) in object_generator.import_revisions(
 
239
                todo, roundtrip=roundtrip):
 
240
                try:
 
241
                    self.mapping.revision_id_bzr_to_foreign(old_revid)
 
242
                except errors.InvalidRevisionId:
 
243
                    self.target_refs[self.mapping.revid_as_refname(old_revid)] = git_sha
 
244
                if not roundtrip:
 
245
                    new_revid = self.mapping.revision_id_foreign_to_bzr(git_sha)
 
246
                else:
 
247
                    new_revid = old_revid
 
248
                revidmap[old_revid] = (git_sha, new_revid)
 
249
            self.target_store.add_objects(object_generator)
 
250
            return revidmap
 
251
        finally:
 
252
            pb.finished()
 
253
 
247
254
    def _get_missing_objects_iterator(self, pb):
248
255
        return MissingObjectsIterator(self.source_store, self.source, pb)
249
256
 
250
257
    def dfetch(self, stop_revisions):
251
258
        """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
259
 
272
260
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
273
261
            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()
 
262
        if not self.mapping.roundtripping:
 
263
            raise NoPushSupport()
 
264
        self.source_store.lock_read()
283
265
        try:
284
 
            todo = list(self.missing_revisions(stop_revisions))
285
 
            pb = ui.ui_factory.nested_progress_bar()
286
 
            try:
287
 
                object_generator = self._get_missing_objects_iterator(pb)
288
 
                for (revid, git_sha) in object_generator.import_revisions(
289
 
                    todo, roundtrip=True):
290
 
                    try:
291
 
                        self.mapping.revision_id_bzr_to_foreign(revid)
292
 
                    except errors.InvalidRevisionId:
293
 
                        self.target_refs[self.mapping.revid_as_refname(revid)] = git_sha
294
 
                self.target_store.add_objects(object_generator)
295
 
            finally:
296
 
                pb.finished()
 
266
            if mapped_refs is not None:
 
267
                stop_revisions = mapped_refs
 
268
            elif revision_id is not None:
 
269
                stop_revisions = [(None, revision_id)]
 
270
            elif fetch_spec is not None:
 
271
                stop_revisions = [(None, revid) for revid in fetch_spec.heads]
 
272
            else:
 
273
                stop_revisions = [(None, revid) for revid in self.source.all_revision_ids()]
 
274
            self.fetch_objects(stop_revisions, roundtrip=True)
297
275
        finally:
298
 
            self.source.unlock()
 
276
            self.source_store.unlock()
299
277
 
300
278
    @staticmethod
301
279
    def is_compatible(source, target):
306
284
 
307
285
class InterToRemoteGitRepository(InterToGitRepository):
308
286
 
309
 
    def dfetch_refs(self, update_refs):
 
287
    def fetch_refs(self, update_refs, lossy):
310
288
        """Import the gist of the ancestry of a particular revision."""
 
289
        if not lossy:
 
290
            raise NoPushSupport()
 
291
        unpeel_map = UnpeelMap.from_repository(self.source)
311
292
        revidmap = {}
312
293
        def determine_wants(old_refs):
313
294
            ret = {}
314
 
            self.old_refs = old_refs
 
295
            self.old_refs = dict([(k, (v, None)) for (k, v) in old_refs.iteritems()])
315
296
            self.new_refs = update_refs(self.old_refs)
316
297
            for name, (gitid, revid) in self.new_refs.iteritems():
317
298
                if gitid is None:
318
 
                    ret[name] = self.source_store._lookup_revision_sha1(revid)
 
299
                    git_sha = self.source_store._lookup_revision_sha1(revid)
 
300
                    ret[name] = unpeel_map.re_unpeel_tag(git_sha, old_refs.get(name))
319
301
                else:
320
302
                    ret[name] = gitid
321
303
            return ret
322
 
        self.source.lock_read()
 
304
        self.source_store.lock_read()
323
305
        try:
324
306
            new_refs = self.target.send_pack(determine_wants,
325
307
                    self.source_store.generate_lossy_pack_contents)
326
308
        finally:
327
 
            self.source.unlock()
 
309
            self.source_store.unlock()
 
310
        # FIXME: revidmap?
328
311
        return revidmap, self.old_refs, self.new_refs
329
312
 
330
 
    def fetch_refs(self, update_refs):
331
 
        raise NoPushSupport()
332
 
 
333
313
    @staticmethod
334
314
    def is_compatible(source, target):
335
315
        """Be compatible with GitRepository."""