/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

Cope with the fact that the old format didn't export file ids.

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
 
        refs = repository._git.get_refs()
272
 
        if not (name in refs.keys() or "HEAD" in refs.keys()):
 
267
        if not name in repository._git.get_refs().keys():
273
268
            raise errors.NotBranchError(self.base)
274
269
 
275
270
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
286
281
            return tree
287
282
        else:
288
283
            return self._create_heavyweight_checkout(to_location, revision_id,
289
 
                hardlink)
 
284
            hardlink)
290
285
 
291
286
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
292
287
                                     hardlink=False):
298
293
        :return: WorkingTree object of checkout.
299
294
        """
300
295
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
301
 
            to_location, force_new_tree=False)
 
296
            to_location, force_new_tree=False, format=get_rich_root_format())
302
297
        checkout = checkout_branch.bzrdir
303
298
        checkout_branch.bind(self)
304
299
        # pull up to the specified revision_id to set the initial
316
311
 
317
312
    def _get_head(self):
318
313
        try:
319
 
            return self.repository._git.ref(self.ref or "HEAD")
 
314
            return self.repository._git.ref(self.ref)
320
315
        except KeyError:
321
316
            return None
322
317
 
329
324
 
330
325
    def _set_head(self, value):
331
326
        self._head = value
332
 
        self.repository._git.refs[self.ref or "HEAD"] = self._head
 
327
        self.repository._git.refs[self.ref] = self._head
333
328
        self._clear_cached_state()
334
329
 
335
330
    head = property(_get_head, _set_head)
349
344
 
350
345
    def supports_tags(self):
351
346
        return True
352
 
 
 
347
    
353
348
 
354
349
class GitBranchPullResult(branch.PullResult):
355
350
 
396
391
 
397
392
    def _set_new_revno(self, revno):
398
393
        self._new_revno = revno
399
 
 
 
394
    
400
395
    new_revno = property(_get_new_revno, _set_new_revno)
401
396
 
402
397
 
423
418
class InterFromGitBranch(branch.GenericInterBranch):
424
419
    """InterBranch implementation that pulls from Git into bzr."""
425
420
 
426
 
    @staticmethod
427
 
    def _get_branch_formats_to_test():
428
 
        return []
429
 
 
430
421
    @classmethod
431
422
    def _get_interrepo(self, source, target):
432
423
        return repository.InterRepository.get(source.repository,
448
439
        """
449
440
        interrepo = self._get_interrepo(self.source, self.target)
450
441
        def determine_wants(heads):
451
 
            if self.source.ref is not None and not self.source.ref in heads:
 
442
            if not self.source.ref in heads:
452
443
                raise NoSuchRef(self.source.ref, heads.keys())
453
444
            if stop_revision is not None:
454
445
                self._last_revid = stop_revision
455
446
                head, mapping = self.source.repository.lookup_bzr_revision_id(
456
447
                    stop_revision)
457
448
            else:
458
 
                if self.source.ref is not None:
459
 
                    head = heads[self.source.ref]
460
 
                else:
461
 
                    head = heads["HEAD"]
 
449
                head = heads[self.source.ref]
462
450
                self._last_revid = self.source.lookup_foreign_revision_id(head)
463
451
            if self.target.repository.has_revision(self._last_revid):
464
452
                return []
465
453
            return [head]
466
 
        pack_hint, head, refs = interrepo.fetch_objects(
 
454
        pack_hint, head = interrepo.fetch_objects(
467
455
            determine_wants, self.source.mapping, limit=limit)
468
456
        if (pack_hint is not None and
469
457
            self.target.repository._format.pack_compresses):
554
542
class InterGitLocalRemoteBranch(InterGitBranch):
555
543
    """InterBranch that copies from a local to a remote git branch."""
556
544
 
557
 
    @staticmethod
558
 
    def _get_branch_formats_to_test():
559
 
        return []
560
 
 
561
545
    @classmethod
562
546
    def is_compatible(self, source, target):
563
547
        from bzrlib.plugins.git.remote import RemoteGitBranch
587
571
class InterGitRemoteLocalBranch(InterGitBranch):
588
572
    """InterBranch that copies from a remote to a local git branch."""
589
573
 
590
 
    @staticmethod
591
 
    def _get_branch_formats_to_test():
592
 
        return []
593
 
 
594
574
    @classmethod
595
575
    def is_compatible(self, source, target):
596
576
        from bzrlib.plugins.git.remote import RemoteGitBranch
617
597
        interrepo = repository.InterRepository.get(self.source.repository,
618
598
            self.target.repository)
619
599
        if stop_revision is None:
620
 
            refs = interrepo.fetch(branches=["HEAD"])
 
600
            refs = interrepo.fetch_refs(branches=["HEAD"])
621
601
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
622
602
        else:
623
 
            refs = interrepo.fetch(revision_id=stop_revision)
 
603
            refs = interrepo.fetch_refs(revision_id=stop_revision)
624
604
        return refs, stop_revision
625
605
 
626
606
    def pull(self, stop_revision=None, overwrite=False,
639
619
        return result
640
620
 
641
621
 
642
 
class InterToGitBranch(branch.GenericInterBranch):
 
622
class InterToGitBranch(branch.InterBranch):
643
623
    """InterBranch implementation that pulls from Git into bzr."""
644
624
 
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
625
    @staticmethod
651
626
    def _get_branch_formats_to_test():
652
 
        return []
 
627
        return None, None
653
628
 
654
629
    @classmethod
655
630
    def is_compatible(self, source, target):
662
637
    def _get_new_refs(self, stop_revision=None):
663
638
        if stop_revision is None:
664
639
            stop_revision = self.source.last_revision()
665
 
        assert type(stop_revision) is str
666
 
        main_ref = self.target.ref or "refs/heads/master"
667
 
        refs = { main_ref: (None, stop_revision) }
 
640
        refs = {
 
641
            branch_name_to_ref(self.target.name, "refs/heads/master"): stop_revision }
668
642
        for name, revid in self.source.tags.get_tag_dict().iteritems():
669
643
            if self.source.repository.has_revision(revid):
670
 
                refs[tag_name_to_ref(name)] = (None, revid)
671
 
        return refs, main_ref
 
644
                refs[tag_name_to_ref(name)] = revid
 
645
        return refs
672
646
 
673
647
    def pull(self, overwrite=False, stop_revision=None, local=False,
674
648
             possible_transports=None):
676
650
        result = GitBranchPullResult()
677
651
        result.source_branch = self.source
678
652
        result.target_branch = self.target
679
 
        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)
 
653
        # FIXME: Check for diverged branches
 
654
        old_refs = self.target.repository._git.get_refs()
 
655
        refs = dict(old_refs)
 
656
        refs.update(self._get_new_refs(stop_revision))
 
657
        self.target.repository.fetch_refs(self.source.repository, refs)
686
658
        result.old_revid = self.target.lookup_foreign_revision_id(
687
 
            old_refs.get(main_ref, ZERO_SHA))
688
 
        result.new_revid = new_refs[main_ref]
 
659
            old_refs.get(self.target.ref, ZERO_SHA))
 
660
        result.new_revid = refs[self.target.ref]
689
661
        return result
690
662
 
691
663
    def push(self, overwrite=False, stop_revision=None,
694
666
        result = GitBranchPushResult()
695
667
        result.source_branch = self.source
696
668
        result.target_branch = self.target
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
 
        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]
 
669
        # FIXME: Check for diverged branches
 
670
        old_refs = self.target.repository._git.get_refs()
 
671
        refs = dict(old_refs)
 
672
        refs.update(self._get_new_refs(stop_revision))
 
673
        self.target.repository.fetch_refs(self.source.repository, refs)
 
674
        result.old_revid = self.target.lookup_foreign_revision_id(
 
675
            old_refs.get(self.target.ref, ZERO_SHA))
 
676
        result.new_revid = refs[self.target.ref]
708
677
        return result
709
678
 
710
679
    def lossy_push(self, stop_revision=None):
 
680
        from dulwich.protocol import ZERO_SHA
711
681
        result = GitBranchPushResult()
712
682
        result.source_branch = self.source
713
683
        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]
 
684
        # FIXME: Check for diverged branches
 
685
        refs = self._get_new_refs(stop_revision)
 
686
        result.revidmap, old_refs, new_refs = self.target.repository.dfetch_refs(
 
687
            self.source.repository, refs)
 
688
        result.old_revid = self.target.lookup_foreign_revision_id(
 
689
            old_refs.get(self.target.ref, ZERO_SHA))
 
690
        result.new_revid = self.target.lookup_foreign_revision_id(
 
691
            new_refs[self.target.ref])
724
692
        return result
725
693
 
726
694