/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: 2020-02-18 01:57:45 UTC
  • mto: This revision was merged to the branch mainline in revision 7493.
  • Revision ID: jelmer@jelmer.uk-20200218015745-q2ss9tsk74h4nh61
drop use of future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/interrepo.py
75
75
    )
76
76
from .refs import (
77
77
    is_tag,
78
 
    ref_to_tag_name,
79
78
    )
80
79
from .repository import (
81
80
    GitRepository,
84
83
    )
85
84
from .remote import (
86
85
    RemoteGitRepository,
87
 
    RemoteGitError,
88
86
    )
89
87
from .unpeel_map import (
90
88
    UnpeelMap,
243
241
                # broken symref?
244
242
                continue
245
243
            revid = None
246
 
            if v and not v.startswith(SYMREF):
 
244
            if not v.startswith(SYMREF):
247
245
                try:
248
246
                    for (kind, type_data) in self.source_store.lookup_git_sha(
249
247
                            v):
309
307
                        try:
310
308
                            self.mapping.revision_id_bzr_to_foreign(old_revid)
311
309
                        except InvalidRevisionId:
312
 
                            pass
 
310
                            refname = self.mapping.revid_as_refname(old_revid)
 
311
                            self.target_refs[refname] = git_sha
313
312
                    revidmap[old_revid] = (git_sha, new_revid)
314
313
                self.target_store.add_objects(object_generator)
315
314
                return revidmap
371
370
            return ret
372
371
        self._warn_slow()
373
372
        with self.source_store.lock_read():
374
 
            result = self.target.send_pack(
 
373
            new_refs = self.target.send_pack(
375
374
                git_update_refs, self.source_store.generate_lossy_pack_data)
376
 
            if result is not None and not isinstance(result, dict):
377
 
                for ref, error in result.ref_status.items():
378
 
                    if error:
379
 
                        raise RemoteGitError(
380
 
                            'unable to update ref %r: %s' % (ref, error))
381
 
                new_refs = result.refs
382
 
            else:  # dulwich < 0.20.3
383
 
                new_refs = result
384
375
        # FIXME: revidmap?
385
376
        return revidmap, self.old_refs, new_refs
386
377
 
412
403
    def _target_has_shas(self, shas):
413
404
        raise NotImplementedError(self._target_has_shas)
414
405
 
415
 
    def get_determine_wants_heads(self, wants, include_tags=False, tag_selector=None):
 
406
    def get_determine_wants_heads(self, wants, include_tags=False):
416
407
        wants = set(wants)
417
408
 
418
409
        def determine_wants(refs):
425
416
                for k, sha in refs.items():
426
417
                    if k.endswith(ANNOTATED_TAG_SUFFIX):
427
418
                        continue
428
 
                    try:
429
 
                        tag_name = ref_to_tag_name(k)
430
 
                    except ValueError:
431
 
                        continue
432
 
                    if tag_selector and not tag_selector(tag_name):
 
419
                    if not is_tag(k):
433
420
                        continue
434
421
                    if sha == ZERO_SHA:
435
422
                        continue
515
502
        """
516
503
        raise NotImplementedError(self.fetch_objects)
517
504
 
518
 
    def get_determine_wants_revids(self, revids, include_tags=False, tag_selector=None):
 
505
    def get_determine_wants_revids(self, revids, include_tags=False):
519
506
        wants = set()
520
507
        for revid in set(revids):
521
508
            if self.target.has_revision(revid):
522
509
                continue
523
510
            git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
524
511
            wants.add(git_sha)
525
 
        return self.get_determine_wants_heads(
526
 
            wants, include_tags=include_tags, tag_selector=tag_selector)
 
512
        return self.get_determine_wants_heads(wants, include_tags=include_tags)
527
513
 
528
514
    def fetch(self, revision_id=None, find_ghosts=False,
529
515
              mapping=None, fetch_spec=None, include_tags=False, lossy=False):
696
682
        result.refs = wants_recorder.remote_refs
697
683
        return result
698
684
 
699
 
    def get_determine_wants_revids(self, revids, include_tags=False, tag_selector=None):
 
685
    def get_determine_wants_revids(self, revids, include_tags=False):
700
686
        wants = set()
701
687
        for revid in set(revids):
702
688
            if revid == NULL_REVISION:
703
689
                continue
704
690
            git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
705
691
            wants.add(git_sha)
706
 
        return self.get_determine_wants_heads(wants, include_tags=include_tags, tag_selector=tag_selector)
 
692
        return self.get_determine_wants_heads(wants, include_tags=include_tags)
707
693
 
708
694
    def get_determine_wants_branches(self, branches, include_tags=False):
709
695
        def determine_wants(refs):