/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 breezy/git/interrepo.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:28:14 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20190529032814-fzqbrgf9647u9ptq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/interrepo.py
264
264
 
265
265
    def fetch_refs(self, update_refs, lossy, overwrite=False):
266
266
        self._warn_slow()
 
267
        result_refs = {}
267
268
        with self.source_store.lock_read():
268
269
            old_refs = self._get_target_bzr_refs()
269
270
            new_refs = update_refs(old_refs)
288
289
                        self.target_refs.add_if_new(name, gitid)
289
290
                    else:
290
291
                        self.target_refs.set_if_equals(name, old_git_id, gitid)
291
 
        return revidmap, old_refs, new_refs
 
292
                    result_refs[name] = (gitid, revid if not lossy else self.mapping.revision_id_foreign_to_bzr(gitid))
 
293
        return revidmap, old_refs, result_refs
292
294
 
293
295
    def fetch_objects(self, revs, lossy, limit=None):
294
296
        if not lossy and not self.mapping.roundtripping:
362
364
 
363
365
        def git_update_refs(old_refs):
364
366
            ret = {}
365
 
            self.old_refs = dict([(k, (v, None))
366
 
                                  for (k, v) in viewitems(old_refs)])
367
 
            self.new_refs = update_refs(self.old_refs)
368
 
            for name, (gitid, revid) in viewitems(self.new_refs):
 
367
            self.old_refs = {
 
368
                k: (v, None) for (k, v) in viewitems(old_refs)}
 
369
            new_refs = update_refs(self.old_refs)
 
370
            for name, (gitid, revid) in viewitems(new_refs):
369
371
                if gitid is None:
370
372
                    git_sha = self.source_store._lookup_revision_sha1(revid)
371
373
                    gitid = unpeel_map.re_unpeel_tag(
381
383
            new_refs = self.target.send_pack(
382
384
                git_update_refs, self.source_store.generate_lossy_pack_data)
383
385
        # FIXME: revidmap?
384
 
        return revidmap, self.old_refs, self.new_refs
 
386
        return revidmap, self.old_refs, new_refs
385
387
 
386
388
    @staticmethod
387
389
    def is_compatible(source, target):