/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

Simplify ref handling in remote.py.

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
 
    )
41
38
from bzrlib.trace import (
42
39
    is_quiet,
43
40
    mutter,
44
41
    )
45
42
 
 
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,
54
55
    ref_to_branch_name,
55
56
    extract_tags,
56
57
    tag_name_to_ref,
60
61
 
61
62
 
62
63
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.lookup_bzr_revision_id(revid)
 
117
            self.branch.mapping.revision_id_bzr_to_foreign(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 bzrdir.format_registry.make_bzrdir("default")
 
185
        return get_rich_root_format()
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 or "HEAD"
 
199
        return self.name
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 or "HEAD")
 
208
            self.ref)
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
 
 
264
260
 
265
261
class LocalGitBranch(GitBranch):
266
262
    """A local Git branch."""
267
263
 
268
264
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
269
 
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
 
265
        super(LocalGitBranch, self).__init__(bzrdir, repository, name, 
270
266
              lockfiles, tagsdict)
271
267
        refs = repository._git.get_refs()
272
268
        if not (name in refs.keys() or "HEAD" in refs.keys()):
286
282
            return tree
287
283
        else:
288
284
            return self._create_heavyweight_checkout(to_location, revision_id,
289
 
                hardlink)
 
285
            hardlink)
290
286
 
291
287
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
292
288
                                     hardlink=False):
298
294
        :return: WorkingTree object of checkout.
299
295
        """
300
296
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
301
 
            to_location, force_new_tree=False)
 
297
            to_location, force_new_tree=False, format=get_rich_root_format())
302
298
        checkout = checkout_branch.bzrdir
303
299
        checkout_branch.bind(self)
304
300
        # pull up to the specified revision_id to set the initial
349
345
 
350
346
    def supports_tags(self):
351
347
        return True
352
 
 
 
348
    
353
349
 
354
350
class GitBranchPullResult(branch.PullResult):
355
351
 
396
392
 
397
393
    def _set_new_revno(self, revno):
398
394
        self._new_revno = revno
399
 
 
 
395
    
400
396
    new_revno = property(_get_new_revno, _set_new_revno)
401
397
 
402
398
 
423
419
class InterFromGitBranch(branch.GenericInterBranch):
424
420
    """InterBranch implementation that pulls from Git into bzr."""
425
421
 
426
 
    @staticmethod
427
 
    def _get_branch_formats_to_test():
428
 
        return []
429
 
 
430
422
    @classmethod
431
423
    def _get_interrepo(self, source, target):
432
424
        return repository.InterRepository.get(source.repository,
463
455
            if self.target.repository.has_revision(self._last_revid):
464
456
                return []
465
457
            return [head]
466
 
        pack_hint, head, refs = interrepo.fetch_objects(
 
458
        pack_hint, head = interrepo.fetch_objects(
467
459
            determine_wants, self.source.mapping, limit=limit)
468
460
        if (pack_hint is not None and
469
461
            self.target.repository._format.pack_compresses):
554
546
class InterGitLocalRemoteBranch(InterGitBranch):
555
547
    """InterBranch that copies from a local to a remote git branch."""
556
548
 
557
 
    @staticmethod
558
 
    def _get_branch_formats_to_test():
559
 
        return []
560
 
 
561
549
    @classmethod
562
550
    def is_compatible(self, source, target):
563
551
        from bzrlib.plugins.git.remote import RemoteGitBranch
587
575
class InterGitRemoteLocalBranch(InterGitBranch):
588
576
    """InterBranch that copies from a remote to a local git branch."""
589
577
 
590
 
    @staticmethod
591
 
    def _get_branch_formats_to_test():
592
 
        return []
593
 
 
594
578
    @classmethod
595
579
    def is_compatible(self, source, target):
596
580
        from bzrlib.plugins.git.remote import RemoteGitBranch
617
601
        interrepo = repository.InterRepository.get(self.source.repository,
618
602
            self.target.repository)
619
603
        if stop_revision is None:
620
 
            refs = interrepo.fetch(branches=["HEAD"])
 
604
            refs = interrepo.fetch_refs(branches=["HEAD"])
621
605
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
622
606
        else:
623
 
            refs = interrepo.fetch(revision_id=stop_revision)
 
607
            refs = interrepo.fetch_refs(revision_id=stop_revision)
624
608
        return refs, stop_revision
625
609
 
626
610
    def pull(self, stop_revision=None, overwrite=False,
639
623
        return result
640
624
 
641
625
 
642
 
class InterToGitBranch(branch.GenericInterBranch):
 
626
class InterToGitBranch(branch.InterBranch):
643
627
    """InterBranch implementation that pulls from Git into bzr."""
644
628
 
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
 
 
650
629
    @staticmethod
651
630
    def _get_branch_formats_to_test():
652
 
        return []
 
631
        return None, None
653
632
 
654
633
    @classmethod
655
634
    def is_compatible(self, source, target):
662
641
    def _get_new_refs(self, stop_revision=None):
663
642
        if stop_revision is None:
664
643
            stop_revision = self.source.last_revision()
665
 
        assert type(stop_revision) is str
666
644
        main_ref = self.target.ref or "refs/heads/master"
667
 
        refs = { main_ref: (None, stop_revision) }
 
645
        refs = { main_ref: stop_revision }
668
646
        for name, revid in self.source.tags.get_tag_dict().iteritems():
669
647
            if self.source.repository.has_revision(revid):
670
 
                refs[tag_name_to_ref(name)] = (None, revid)
 
648
                refs[tag_name_to_ref(name)] = revid
671
649
        return refs, main_ref
672
650
 
673
651
    def pull(self, overwrite=False, stop_revision=None, local=False,
676
654
        result = GitBranchPullResult()
677
655
        result.source_branch = self.source
678
656
        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)
679
660
        new_refs, main_ref = self._get_new_refs(stop_revision)
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)
 
661
        refs.update(new_refs)
 
662
        self.target.repository.fetch_refs(self.source.repository, refs)
686
663
        result.old_revid = self.target.lookup_foreign_revision_id(
687
664
            old_refs.get(main_ref, ZERO_SHA))
688
 
        result.new_revid = new_refs[main_ref]
 
665
        result.new_revid = refs[main_ref]
689
666
        return result
690
667
 
691
668
    def push(self, overwrite=False, stop_revision=None,
694
671
        result = GitBranchPushResult()
695
672
        result.source_branch = self.source
696
673
        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)
697
677
        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
 
        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]
 
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]
708
683
        return result
709
684
 
710
685
    def lossy_push(self, stop_revision=None):
 
686
        from dulwich.protocol import ZERO_SHA
711
687
        result = GitBranchPushResult()
712
688
        result.source_branch = self.source
713
689
        result.target_branch = self.target
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]
 
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])
724
698
        return result
725
699
 
726
700