← Back to branch summary

~ubuntu-branches/debian/jessie/bzr-git/jessie

« back to all changes in this revision

Viewing changes to branch.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2010-07-31 00:18:45 UTC
  • mfrom: (1.1.11 upstream) (8.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100731001845-su2xo23q9xdqdcyu
* New upstream release.
* Bump standards version to 3.9.1.

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
117
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
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."""
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
260
 
262
262
    """A local Git branch."""
263
263
 
264
264
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
265
 
        super(LocalGitBranch, self).__init__(bzrdir, repository, name, 
 
265
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
266
266
              lockfiles, tagsdict)
267
267
        refs = repository._git.get_refs()
268
268
        if not (name in refs.keys() or "HEAD" in refs.keys()):
282
282
            return tree
283
283
        else:
284
284
            return self._create_heavyweight_checkout(to_location, revision_id,
285
 
            hardlink)
 
285
                hardlink)
286
286
 
287
287
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
288
288
                                     hardlink=False):
294
294
        :return: WorkingTree object of checkout.
295
295
        """
296
296
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
297
 
            to_location, force_new_tree=False, format=get_rich_root_format())
 
297
            to_location, force_new_tree=False)
298
298
        checkout = checkout_branch.bzrdir
299
299
        checkout_branch.bind(self)
300
300
        # pull up to the specified revision_id to set the initial
345
345
 
346
346
    def supports_tags(self):
347
347
        return True
348
 
    
 
348
 
349
349
 
350
350
class GitBranchPullResult(branch.PullResult):
351
351
 
392
392
 
393
393
    def _set_new_revno(self, revno):
394
394
        self._new_revno = revno
395
 
    
 
395
 
396
396
    new_revno = property(_get_new_revno, _set_new_revno)
397
397
 
398
398
 
601
601
        interrepo = repository.InterRepository.get(self.source.repository,
602
602
            self.target.repository)
603
603
        if stop_revision is None:
604
 
            refs = interrepo.fetch_refs(branches=["HEAD"])
 
604
            refs = interrepo.fetch(branches=["HEAD"])
605
605
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
606
606
        else:
607
 
            refs = interrepo.fetch_refs(revision_id=stop_revision)
 
607
            refs = interrepo.fetch(revision_id=stop_revision)
608
608
        return refs, stop_revision
609
609
 
610
610
    def pull(self, stop_revision=None, overwrite=False,
623
623
        return result
624
624
 
625
625
 
626
 
class InterToGitBranch(branch.InterBranch):
 
626
class InterToGitBranch(branch.GenericInterBranch):
627
627
    """InterBranch implementation that pulls from Git into bzr."""
628
628
 
 
629
    def __init__(self, source, target):
 
630
        super(InterToGitBranch, self).__init__(source, target)
 
631
        self.interrepo = repository.InterRepository.get(source.repository,
 
632
                                           target.repository)
 
633
 
629
634
    @staticmethod
630
635
    def _get_branch_formats_to_test():
631
 
        return None, None
 
636
        return []
632
637
 
633
638
    @classmethod
634
639
    def is_compatible(self, source, target):
641
646
    def _get_new_refs(self, stop_revision=None):
642
647
        if stop_revision is None:
643
648
            stop_revision = self.source.last_revision()
 
649
        assert type(stop_revision) is str
644
650
        main_ref = self.target.ref or "refs/heads/master"
645
 
        refs = { main_ref: stop_revision }
 
651
        refs = { main_ref: (None, stop_revision) }
646
652
        for name, revid in self.source.tags.get_tag_dict().iteritems():
647
653
            if self.source.repository.has_revision(revid):
648
 
                refs[tag_name_to_ref(name)] = revid
 
654
                refs[tag_name_to_ref(name)] = (None, revid)
649
655
        return refs, main_ref
650
656
 
651
657
    def pull(self, overwrite=False, stop_revision=None, local=False,
654
660
        result = GitBranchPullResult()
655
661
        result.source_branch = self.source
656
662
        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
663
        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)
 
664
        def update_refs(old_refs):
 
665
            refs = dict(old_refs)
 
666
            # FIXME: Check for diverged branches
 
667
            refs.update(new_refs)
 
668
            return refs
 
669
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
663
670
        result.old_revid = self.target.lookup_foreign_revision_id(
664
671
            old_refs.get(main_ref, ZERO_SHA))
665
 
        result.new_revid = refs[main_ref]
 
672
        result.new_revid = new_refs[main_ref]
666
673
        return result
667
674
 
668
675
    def push(self, overwrite=False, stop_revision=None,
671
678
        result = GitBranchPushResult()
672
679
        result.source_branch = self.source
673
680
        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
681
        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)
 
682
        def update_refs(old_refs):
 
683
            refs = dict(old_refs)
 
684
            # FIXME: Check for diverged branches
 
685
            refs.update(new_refs)
 
686
            return refs
 
687
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
680
688
        result.old_revid = self.target.lookup_foreign_revision_id(
681
689
            old_refs.get(main_ref, ZERO_SHA))
682
 
        result.new_revid = refs[main_ref]
 
690
        result.new_revid = new_refs[main_ref]
683
691
        return result
684
692
 
685
693
    def lossy_push(self, stop_revision=None):
686
 
        from dulwich.protocol import ZERO_SHA
687
694
        result = GitBranchPushResult()
688
695
        result.source_branch = self.source
689
696
        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])
 
697
        new_refs, main_ref = self._get_new_refs(stop_revision)
 
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
        result.revidmap, old_refs, new_refs = self.interrepo.dfetch_refs(
 
704
            update_refs)
 
705
        result.old_revid = old_refs.get(self.target.ref, (None, NULL_REVISION))[1]
 
706
        result.new_revid = new_refs[main_ref][1]
698
707
        return result
699
708
 
700
709