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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
35
35
from bzrlib.decorators import (
36
36
    needs_read_lock,
37
37
    )
 
38
from bzrlib.revision import (
 
39
    NULL_REVISION,
 
40
    )
38
41
from bzrlib.trace import (
39
42
    is_quiet,
40
43
    mutter,
48
51
    NoSuchRef,
49
52
    )
50
53
from bzrlib.plugins.git.refs import (
51
 
    branch_name_to_ref,
52
54
    ref_to_branch_name,
53
55
    extract_tags,
54
56
    tag_name_to_ref,
58
60
 
59
61
 
60
62
class GitPullResult(branch.PullResult):
 
63
    """Result of a pull from a Git branch."""
61
64
 
62
65
    def _lookup_revno(self, revid):
63
66
        assert isinstance(revid, str), "was %r" % revid
108
111
        for name in extra:
109
112
            if name.startswith("refs/tags/"):
110
113
                del self.repository._git[name]
111
 
        
 
114
 
112
115
    def set_tag(self, name, revid):
113
116
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
114
 
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
 
117
            self.branch.lookup_bzr_revision_id(revid)
115
118
 
116
119
 
117
120
class DictTagDict(LocalGitTagDict):
251
254
            overwrite, stop_revision)
252
255
 
253
256
    def lookup_foreign_revision_id(self, foreign_revid):
254
 
        return self.repository.lookup_foreign_revision_id(foreign_revid, 
 
257
        return self.repository.lookup_foreign_revision_id(foreign_revid,
255
258
            self.mapping)
256
259
 
 
260
    def lookup_bzr_revision_id(self, revid):
 
261
        return self.repository.lookup_bzr_revision_id(
 
262
            revid, mapping=self.mapping)
 
263
 
257
264
 
258
265
class LocalGitBranch(GitBranch):
259
266
    """A local Git branch."""
260
267
 
261
268
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
262
 
        super(LocalGitBranch, self).__init__(bzrdir, repository, name, 
 
269
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
263
270
              lockfiles, tagsdict)
264
271
        refs = repository._git.get_refs()
265
272
        if not (name in refs.keys() or "HEAD" in refs.keys()):
279
286
            return tree
280
287
        else:
281
288
            return self._create_heavyweight_checkout(to_location, revision_id,
282
 
            hardlink)
 
289
                hardlink)
283
290
 
284
291
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
285
292
                                     hardlink=False):
342
349
 
343
350
    def supports_tags(self):
344
351
        return True
345
 
    
 
352
 
346
353
 
347
354
class GitBranchPullResult(branch.PullResult):
348
355
 
389
396
 
390
397
    def _set_new_revno(self, revno):
391
398
        self._new_revno = revno
392
 
    
 
399
 
393
400
    new_revno = property(_get_new_revno, _set_new_revno)
394
401
 
395
402
 
416
423
class InterFromGitBranch(branch.GenericInterBranch):
417
424
    """InterBranch implementation that pulls from Git into bzr."""
418
425
 
 
426
    @staticmethod
 
427
    def _get_branch_formats_to_test():
 
428
        return []
 
429
 
419
430
    @classmethod
420
431
    def _get_interrepo(self, source, target):
421
432
        return repository.InterRepository.get(source.repository,
452
463
            if self.target.repository.has_revision(self._last_revid):
453
464
                return []
454
465
            return [head]
455
 
        pack_hint, head = interrepo.fetch_objects(
 
466
        pack_hint, head, refs = interrepo.fetch_objects(
456
467
            determine_wants, self.source.mapping, limit=limit)
457
468
        if (pack_hint is not None and
458
469
            self.target.repository._format.pack_compresses):
543
554
class InterGitLocalRemoteBranch(InterGitBranch):
544
555
    """InterBranch that copies from a local to a remote git branch."""
545
556
 
 
557
    @staticmethod
 
558
    def _get_branch_formats_to_test():
 
559
        return []
 
560
 
546
561
    @classmethod
547
562
    def is_compatible(self, source, target):
548
563
        from bzrlib.plugins.git.remote import RemoteGitBranch
572
587
class InterGitRemoteLocalBranch(InterGitBranch):
573
588
    """InterBranch that copies from a remote to a local git branch."""
574
589
 
 
590
    @staticmethod
 
591
    def _get_branch_formats_to_test():
 
592
        return []
 
593
 
575
594
    @classmethod
576
595
    def is_compatible(self, source, target):
577
596
        from bzrlib.plugins.git.remote import RemoteGitBranch
598
617
        interrepo = repository.InterRepository.get(self.source.repository,
599
618
            self.target.repository)
600
619
        if stop_revision is None:
601
 
            refs = interrepo.fetch_refs(branches=["HEAD"])
 
620
            refs = interrepo.fetch(branches=["HEAD"])
602
621
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
603
622
        else:
604
 
            refs = interrepo.fetch_refs(revision_id=stop_revision)
 
623
            refs = interrepo.fetch(revision_id=stop_revision)
605
624
        return refs, stop_revision
606
625
 
607
626
    def pull(self, stop_revision=None, overwrite=False,
620
639
        return result
621
640
 
622
641
 
623
 
class InterToGitBranch(branch.InterBranch):
 
642
class InterToGitBranch(branch.GenericInterBranch):
624
643
    """InterBranch implementation that pulls from Git into bzr."""
625
644
 
 
645
    def __init__(self, source, target):
 
646
        super(InterToGitBranch, self).__init__(source, target)
 
647
        self.interrepo = repository.InterRepository.get(source.repository,
 
648
                                           target.repository)
 
649
 
626
650
    @staticmethod
627
651
    def _get_branch_formats_to_test():
628
 
        return None, None
 
652
        return []
629
653
 
630
654
    @classmethod
631
655
    def is_compatible(self, source, target):
638
662
    def _get_new_refs(self, stop_revision=None):
639
663
        if stop_revision is None:
640
664
            stop_revision = self.source.last_revision()
 
665
        assert type(stop_revision) is str
641
666
        main_ref = self.target.ref or "refs/heads/master"
642
 
        refs = { main_ref: stop_revision }
 
667
        refs = { main_ref: (None, stop_revision) }
643
668
        for name, revid in self.source.tags.get_tag_dict().iteritems():
644
669
            if self.source.repository.has_revision(revid):
645
 
                refs[tag_name_to_ref(name)] = revid
 
670
                refs[tag_name_to_ref(name)] = (None, revid)
646
671
        return refs, main_ref
647
672
 
648
673
    def pull(self, overwrite=False, stop_revision=None, local=False,
651
676
        result = GitBranchPullResult()
652
677
        result.source_branch = self.source
653
678
        result.target_branch = self.target
654
 
        # FIXME: Check for diverged branches
655
 
        old_refs = self.target.repository._git.get_refs()
656
 
        refs = dict(old_refs)
657
679
        new_refs, main_ref = self._get_new_refs(stop_revision)
658
 
        refs.update(new_refs)
659
 
        self.target.repository.fetch_refs(self.source.repository, refs)
 
680
        def update_refs(old_refs):
 
681
            refs = dict(old_refs)
 
682
            # FIXME: Check for diverged branches
 
683
            refs.update(new_refs)
 
684
            return refs
 
685
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
660
686
        result.old_revid = self.target.lookup_foreign_revision_id(
661
687
            old_refs.get(main_ref, ZERO_SHA))
662
 
        result.new_revid = refs[main_ref]
 
688
        result.new_revid = new_refs[main_ref]
663
689
        return result
664
690
 
665
691
    def push(self, overwrite=False, stop_revision=None,
668
694
        result = GitBranchPushResult()
669
695
        result.source_branch = self.source
670
696
        result.target_branch = self.target
671
 
        # FIXME: Check for diverged branches
672
 
        old_refs = self.target.repository._git.get_refs()
673
 
        refs = dict(old_refs)
674
697
        new_refs, main_ref = self._get_new_refs(stop_revision)
675
 
        refs.update(new_refs)
676
 
        self.target.repository.fetch_refs(self.source.repository, refs)
677
 
        result.old_revid = self.target.lookup_foreign_revision_id(
678
 
            old_refs.get(main_ref, ZERO_SHA))
679
 
        result.new_revid = refs[main_ref]
 
698
        def update_refs(old_refs):
 
699
            refs = dict(old_refs)
 
700
            # FIXME: Check for diverged branches
 
701
            refs.update(new_refs)
 
702
            return refs
 
703
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
 
704
        (result.old_revid, old_sha1) = old_refs.get(main_ref, (ZERO_SHA, NULL_REVISION))
 
705
        if result.old_revid is None:
 
706
            result.old_revid = self.target.lookup_foreign_revision_id(old_sha1)
 
707
        result.new_revid = new_refs[main_ref]
680
708
        return result
681
709
 
682
710
    def lossy_push(self, stop_revision=None):
683
 
        from dulwich.protocol import ZERO_SHA
684
711
        result = GitBranchPushResult()
685
712
        result.source_branch = self.source
686
713
        result.target_branch = self.target
687
 
        # FIXME: Check for diverged branches
688
 
        refs, main_ref = self._get_new_refs(stop_revision)
689
 
        result.revidmap, old_refs, new_refs = self.target.repository.dfetch_refs(
690
 
            self.source.repository, refs)
691
 
        result.old_revid = self.target.lookup_foreign_revision_id(
692
 
            old_refs.get(self.target.ref, ZERO_SHA))
693
 
        result.new_revid = self.target.lookup_foreign_revision_id(
694
 
            new_refs[main_ref])
 
714
        new_refs, main_ref = self._get_new_refs(stop_revision)
 
715
        def update_refs(old_refs):
 
716
            refs = dict(old_refs)
 
717
            # FIXME: Check for diverged branches
 
718
            refs.update(new_refs)
 
719
            return refs
 
720
        result.revidmap, old_refs, new_refs = self.interrepo.dfetch_refs(
 
721
            update_refs)
 
722
        result.old_revid = old_refs.get(self.target.ref, (None, NULL_REVISION))[1]
 
723
        result.new_revid = new_refs[main_ref][1]
695
724
        return result
696
725
 
697
726