/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,
41
44
    )
42
45
 
43
 
from bzrlib.plugins.git import (
44
 
    get_rich_root_format,
45
 
    )
46
46
from bzrlib.plugins.git.config import (
47
47
    GitBranchConfig,
48
48
    )
51
51
    NoSuchRef,
52
52
    )
53
53
from bzrlib.plugins.git.refs import (
54
 
    branch_name_to_ref,
55
54
    ref_to_branch_name,
56
55
    extract_tags,
57
56
    tag_name_to_ref,
61
60
 
62
61
 
63
62
class GitPullResult(branch.PullResult):
 
63
    """Result of a pull from a Git branch."""
64
64
 
65
65
    def _lookup_revno(self, revid):
66
66
        assert isinstance(revid, str), "was %r" % revid
111
111
        for name in extra:
112
112
            if name.startswith("refs/tags/"):
113
113
                del self.repository._git[name]
114
 
        
 
114
 
115
115
    def set_tag(self, name, revid):
116
116
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
117
 
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
 
117
            self.branch.lookup_bzr_revision_id(revid)
118
118
 
119
119
 
120
120
class DictTagDict(LocalGitTagDict):
182
182
        """Return the most suitable metadir for a checkout of this branch.
183
183
        Weaves are used if this branch's repository uses weaves.
184
184
        """
185
 
        return get_rich_root_format()
 
185
        return bzrdir.format_registry.make_bzrdir("default")
186
186
 
187
187
    def get_child_submit_format(self):
188
188
        """Return the preferred format of submissions to this branch."""
196
196
 
197
197
        :return: Branch nick
198
198
        """
199
 
        return self.name
 
199
        return self.name or "HEAD"
200
200
 
201
201
    def _set_nick(self, nick):
202
202
        raise NotImplementedError
205
205
 
206
206
    def __repr__(self):
207
207
        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
208
 
            self.ref)
 
208
            self.ref or "HEAD")
209
209
 
210
210
    def generate_revision_history(self, revid, old_revid=None):
211
211
        # FIXME: Check that old_revid is in the ancestry of revid
254
254
            overwrite, stop_revision)
255
255
 
256
256
    def lookup_foreign_revision_id(self, foreign_revid):
257
 
        return self.repository.lookup_foreign_revision_id(foreign_revid, 
 
257
        return self.repository.lookup_foreign_revision_id(foreign_revid,
258
258
            self.mapping)
259
259
 
 
260
    def lookup_bzr_revision_id(self, revid):
 
261
        return self.repository.lookup_bzr_revision_id(
 
262
            revid, mapping=self.mapping)
 
263
 
260
264
 
261
265
class LocalGitBranch(GitBranch):
262
266
    """A local Git branch."""
263
267
 
264
268
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
265
 
        super(LocalGitBranch, self).__init__(bzrdir, repository, name, 
 
269
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
266
270
              lockfiles, tagsdict)
267
271
        refs = repository._git.get_refs()
268
272
        if not (name in refs.keys() or "HEAD" in refs.keys()):
282
286
            return tree
283
287
        else:
284
288
            return self._create_heavyweight_checkout(to_location, revision_id,
285
 
            hardlink)
 
289
                hardlink)
286
290
 
287
291
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
288
292
                                     hardlink=False):
294
298
        :return: WorkingTree object of checkout.
295
299
        """
296
300
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
297
 
            to_location, force_new_tree=False, format=get_rich_root_format())
 
301
            to_location, force_new_tree=False)
298
302
        checkout = checkout_branch.bzrdir
299
303
        checkout_branch.bind(self)
300
304
        # pull up to the specified revision_id to set the initial
345
349
 
346
350
    def supports_tags(self):
347
351
        return True
348
 
    
 
352
 
349
353
 
350
354
class GitBranchPullResult(branch.PullResult):
351
355
 
392
396
 
393
397
    def _set_new_revno(self, revno):
394
398
        self._new_revno = revno
395
 
    
 
399
 
396
400
    new_revno = property(_get_new_revno, _set_new_revno)
397
401
 
398
402
 
419
423
class InterFromGitBranch(branch.GenericInterBranch):
420
424
    """InterBranch implementation that pulls from Git into bzr."""
421
425
 
 
426
    @staticmethod
 
427
    def _get_branch_formats_to_test():
 
428
        return []
 
429
 
422
430
    @classmethod
423
431
    def _get_interrepo(self, source, target):
424
432
        return repository.InterRepository.get(source.repository,
455
463
            if self.target.repository.has_revision(self._last_revid):
456
464
                return []
457
465
            return [head]
458
 
        pack_hint, head = interrepo.fetch_objects(
 
466
        pack_hint, head, refs = interrepo.fetch_objects(
459
467
            determine_wants, self.source.mapping, limit=limit)
460
468
        if (pack_hint is not None and
461
469
            self.target.repository._format.pack_compresses):
546
554
class InterGitLocalRemoteBranch(InterGitBranch):
547
555
    """InterBranch that copies from a local to a remote git branch."""
548
556
 
 
557
    @staticmethod
 
558
    def _get_branch_formats_to_test():
 
559
        return []
 
560
 
549
561
    @classmethod
550
562
    def is_compatible(self, source, target):
551
563
        from bzrlib.plugins.git.remote import RemoteGitBranch
575
587
class InterGitRemoteLocalBranch(InterGitBranch):
576
588
    """InterBranch that copies from a remote to a local git branch."""
577
589
 
 
590
    @staticmethod
 
591
    def _get_branch_formats_to_test():
 
592
        return []
 
593
 
578
594
    @classmethod
579
595
    def is_compatible(self, source, target):
580
596
        from bzrlib.plugins.git.remote import RemoteGitBranch
601
617
        interrepo = repository.InterRepository.get(self.source.repository,
602
618
            self.target.repository)
603
619
        if stop_revision is None:
604
 
            refs = interrepo.fetch_refs(branches=["HEAD"])
 
620
            refs = interrepo.fetch(branches=["HEAD"])
605
621
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
606
622
        else:
607
 
            refs = interrepo.fetch_refs(revision_id=stop_revision)
 
623
            refs = interrepo.fetch(revision_id=stop_revision)
608
624
        return refs, stop_revision
609
625
 
610
626
    def pull(self, stop_revision=None, overwrite=False,
623
639
        return result
624
640
 
625
641
 
626
 
class InterToGitBranch(branch.InterBranch):
 
642
class InterToGitBranch(branch.GenericInterBranch):
627
643
    """InterBranch implementation that pulls from Git into bzr."""
628
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
 
629
650
    @staticmethod
630
651
    def _get_branch_formats_to_test():
631
 
        return None, None
 
652
        return []
632
653
 
633
654
    @classmethod
634
655
    def is_compatible(self, source, target):
641
662
    def _get_new_refs(self, stop_revision=None):
642
663
        if stop_revision is None:
643
664
            stop_revision = self.source.last_revision()
 
665
        assert type(stop_revision) is str
644
666
        main_ref = self.target.ref or "refs/heads/master"
645
 
        refs = { main_ref: stop_revision }
 
667
        refs = { main_ref: (None, stop_revision) }
646
668
        for name, revid in self.source.tags.get_tag_dict().iteritems():
647
669
            if self.source.repository.has_revision(revid):
648
 
                refs[tag_name_to_ref(name)] = revid
 
670
                refs[tag_name_to_ref(name)] = (None, revid)
649
671
        return refs, main_ref
650
672
 
651
673
    def pull(self, overwrite=False, stop_revision=None, local=False,
654
676
        result = GitBranchPullResult()
655
677
        result.source_branch = self.source
656
678
        result.target_branch = self.target
657
 
        # FIXME: Check for diverged branches
658
 
        old_refs = self.target.repository._git.get_refs()
659
 
        refs = dict(old_refs)
660
679
        new_refs, main_ref = self._get_new_refs(stop_revision)
661
 
        refs.update(new_refs)
662
 
        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)
663
686
        result.old_revid = self.target.lookup_foreign_revision_id(
664
687
            old_refs.get(main_ref, ZERO_SHA))
665
 
        result.new_revid = refs[main_ref]
 
688
        result.new_revid = new_refs[main_ref]
666
689
        return result
667
690
 
668
691
    def push(self, overwrite=False, stop_revision=None,
671
694
        result = GitBranchPushResult()
672
695
        result.source_branch = self.source
673
696
        result.target_branch = self.target
674
 
        # FIXME: Check for diverged branches
675
 
        old_refs = self.target.repository._git.get_refs()
676
 
        refs = dict(old_refs)
677
697
        new_refs, main_ref = self._get_new_refs(stop_revision)
678
 
        refs.update(new_refs)
679
 
        self.target.repository.fetch_refs(self.source.repository, refs)
680
 
        result.old_revid = self.target.lookup_foreign_revision_id(
681
 
            old_refs.get(main_ref, ZERO_SHA))
682
 
        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]
683
708
        return result
684
709
 
685
710
    def lossy_push(self, stop_revision=None):
686
 
        from dulwich.protocol import ZERO_SHA
687
711
        result = GitBranchPushResult()
688
712
        result.source_branch = self.source
689
713
        result.target_branch = self.target
690
 
        # FIXME: Check for diverged branches
691
 
        refs, main_ref = self._get_new_refs(stop_revision)
692
 
        result.revidmap, old_refs, new_refs = self.target.repository.dfetch_refs(
693
 
            self.source.repository, refs)
694
 
        result.old_revid = self.target.lookup_foreign_revision_id(
695
 
            old_refs.get(self.target.ref, ZERO_SHA))
696
 
        result.new_revid = self.target.lookup_foreign_revision_id(
697
 
            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]
698
724
        return result
699
725
 
700
726