/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

  • Committer: Jelmer Vernooij
  • Date: 2010-05-13 12:34:24 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100513123424-c1sk9vcg2ekrcsol
Some refactoring, support proper file ids in revision deltas.

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
    )
60
60
 
61
61
 
62
62
class GitPullResult(branch.PullResult):
63
 
    """Result of a pull from a Git branch."""
64
63
 
65
64
    def _lookup_revno(self, revid):
66
65
        assert isinstance(revid, str), "was %r" % revid
98
97
                mutter("Tag %s points at object %r that is not a commit, "
99
98
                       "ignoring", k, obj)
100
99
                continue
101
 
            ret[k] = self.branch.lookup_foreign_revision_id(v)
 
100
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
102
101
        return ret
103
102
 
104
103
    def _set_tag_dict(self, to_dict):
111
110
        for name in extra:
112
111
            if name.startswith("refs/tags/"):
113
112
                del self.repository._git[name]
114
 
 
 
113
        
115
114
    def set_tag(self, name, revid):
116
115
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
117
 
            self.branch.lookup_bzr_revision_id(revid)
 
116
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
118
117
 
119
118
 
120
119
class DictTagDict(LocalGitTagDict):
182
181
        """Return the most suitable metadir for a checkout of this branch.
183
182
        Weaves are used if this branch's repository uses weaves.
184
183
        """
185
 
        return bzrdir.format_registry.make_bzrdir("default")
 
184
        return get_rich_root_format()
186
185
 
187
186
    def get_child_submit_format(self):
188
187
        """Return the preferred format of submissions to this branch."""
196
195
 
197
196
        :return: Branch nick
198
197
        """
199
 
        return self.name or "HEAD"
 
198
        return self.name
200
199
 
201
200
    def _set_nick(self, nick):
202
201
        raise NotImplementedError
205
204
 
206
205
    def __repr__(self):
207
206
        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
208
 
            self.ref or "HEAD")
 
207
            self.ref)
209
208
 
210
209
    def generate_revision_history(self, revid, old_revid=None):
211
210
        # FIXME: Check that old_revid is in the ancestry of revid
247
246
        # perhaps should escape this ?
248
247
        if self.head is None:
249
248
            return revision.NULL_REVISION
250
 
        return self.lookup_foreign_revision_id(self.head)
 
249
        return self.mapping.revision_id_foreign_to_bzr(self.head)
251
250
 
252
251
    def _basic_push(self, target, overwrite=False, stop_revision=None):
253
252
        return branch.InterBranch.get(self, target)._basic_push(
254
253
            overwrite, stop_revision)
255
254
 
256
 
    def lookup_foreign_revision_id(self, foreign_revid):
257
 
        return self.repository.lookup_foreign_revision_id(foreign_revid,
258
 
            self.mapping)
259
 
 
260
 
    def lookup_bzr_revision_id(self, revid):
261
 
        return self.repository.lookup_bzr_revision_id(
262
 
            revid, mapping=self.mapping)
263
 
 
264
255
 
265
256
class LocalGitBranch(GitBranch):
266
257
    """A local Git branch."""
267
258
 
268
259
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
269
 
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
 
260
        super(LocalGitBranch, self).__init__(bzrdir, repository, name, 
270
261
              lockfiles, tagsdict)
271
 
        refs = repository._git.get_refs()
272
 
        if not (name in refs.keys() or "HEAD" in refs.keys()):
 
262
        if not name in repository._git.get_refs().keys():
273
263
            raise errors.NotBranchError(self.base)
274
264
 
275
265
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
286
276
            return tree
287
277
        else:
288
278
            return self._create_heavyweight_checkout(to_location, revision_id,
289
 
                hardlink)
 
279
            hardlink)
290
280
 
291
281
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
292
282
                                     hardlink=False):
298
288
        :return: WorkingTree object of checkout.
299
289
        """
300
290
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
301
 
            to_location, force_new_tree=False)
 
291
            to_location, force_new_tree=False, format=get_rich_root_format())
302
292
        checkout = checkout_branch.bzrdir
303
293
        checkout_branch.bind(self)
304
294
        # pull up to the specified revision_id to set the initial
316
306
 
317
307
    def _get_head(self):
318
308
        try:
319
 
            return self.repository._git.ref(self.ref or "HEAD")
 
309
            return self.repository._git.ref(self.ref)
320
310
        except KeyError:
321
311
            return None
322
312
 
329
319
 
330
320
    def _set_head(self, value):
331
321
        self._head = value
332
 
        self.repository._git.refs[self.ref or "HEAD"] = self._head
 
322
        self.repository._git.refs[self.ref] = self._head
333
323
        self._clear_cached_state()
334
324
 
335
325
    head = property(_get_head, _set_head)
396
386
 
397
387
    def _set_new_revno(self, revno):
398
388
        self._new_revno = revno
399
 
 
 
389
    
400
390
    new_revno = property(_get_new_revno, _set_new_revno)
401
391
 
402
392
 
423
413
class InterFromGitBranch(branch.GenericInterBranch):
424
414
    """InterBranch implementation that pulls from Git into bzr."""
425
415
 
426
 
    @staticmethod
427
 
    def _get_branch_formats_to_test():
428
 
        return []
429
 
 
430
416
    @classmethod
431
417
    def _get_interrepo(self, source, target):
432
418
        return repository.InterRepository.get(source.repository,
448
434
        """
449
435
        interrepo = self._get_interrepo(self.source, self.target)
450
436
        def determine_wants(heads):
451
 
            if self.source.ref is not None and not self.source.ref in heads:
 
437
            if not self.source.ref in heads:
452
438
                raise NoSuchRef(self.source.ref, heads.keys())
453
439
            if stop_revision is not None:
454
440
                self._last_revid = stop_revision
455
441
                head, mapping = self.source.repository.lookup_bzr_revision_id(
456
442
                    stop_revision)
457
443
            else:
458
 
                if self.source.ref is not None:
459
 
                    head = heads[self.source.ref]
460
 
                else:
461
 
                    head = heads["HEAD"]
462
 
                self._last_revid = self.source.lookup_foreign_revision_id(head)
 
444
                head = heads[self.source.ref]
 
445
                self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(
 
446
                    head)
463
447
            if self.target.repository.has_revision(self._last_revid):
464
448
                return []
465
449
            return [head]
466
 
        pack_hint, head, refs = interrepo.fetch_objects(
 
450
        pack_hint, head = interrepo.fetch_objects(
467
451
            determine_wants, self.source.mapping, limit=limit)
468
 
        if (pack_hint is not None and
469
 
            self.target.repository._format.pack_compresses):
 
452
        if pack_hint is not None and self.target.repository._format.pack_compresses:
470
453
            self.target.repository.pack(hint=pack_hint)
471
454
        if head is not None:
472
 
            self._last_revid = self.source.lookup_foreign_revision_id(head)
 
455
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
473
456
        if overwrite:
474
457
            prev_last_revid = None
475
458
        else:
554
537
class InterGitLocalRemoteBranch(InterGitBranch):
555
538
    """InterBranch that copies from a local to a remote git branch."""
556
539
 
557
 
    @staticmethod
558
 
    def _get_branch_formats_to_test():
559
 
        return []
560
 
 
561
540
    @classmethod
562
541
    def is_compatible(self, source, target):
563
542
        from bzrlib.plugins.git.remote import RemoteGitBranch
573
552
            stop_revision = self.source.last_revision()
574
553
        # FIXME: Check for diverged branches
575
554
        def get_changed_refs(old_refs):
576
 
            result.old_revid = self.target.lookup_foreign_revision_id(old_refs.get(self.target.ref, ZERO_SHA))
 
555
            result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs.get(self.target.ref, ZERO_SHA))
577
556
            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
578
557
            result.new_revid = stop_revision
579
558
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
587
566
class InterGitRemoteLocalBranch(InterGitBranch):
588
567
    """InterBranch that copies from a remote to a local git branch."""
589
568
 
590
 
    @staticmethod
591
 
    def _get_branch_formats_to_test():
592
 
        return []
593
 
 
594
569
    @classmethod
595
570
    def is_compatible(self, source, target):
596
571
        from bzrlib.plugins.git.remote import RemoteGitBranch
610
585
 
611
586
    def update_tags(self, refs):
612
587
        for name, v in extract_tags(refs).iteritems():
613
 
            revid = self.target.lookup_foreign_revision_id(v)
 
588
            revid = self.target.mapping.revision_id_foreign_to_bzr(v)
614
589
            self.target.tags.set_tag(name, revid)
615
590
 
616
591
    def update_refs(self, stop_revision=None):
617
592
        interrepo = repository.InterRepository.get(self.source.repository,
618
593
            self.target.repository)
619
594
        if stop_revision is None:
620
 
            refs = interrepo.fetch(branches=["HEAD"])
621
 
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
 
595
            refs = interrepo.fetch_refs(branches=["HEAD"])
 
596
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
622
597
        else:
623
 
            refs = interrepo.fetch(revision_id=stop_revision)
 
598
            refs = interrepo.fetch_refs(revision_id=stop_revision)
624
599
        return refs, stop_revision
625
600
 
626
601
    def pull(self, stop_revision=None, overwrite=False,
639
614
        return result
640
615
 
641
616
 
642
 
class InterToGitBranch(branch.GenericInterBranch):
 
617
class InterToGitBranch(branch.InterBranch):
643
618
    """InterBranch implementation that pulls from Git into bzr."""
644
619
 
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
620
    @staticmethod
651
621
    def _get_branch_formats_to_test():
652
 
        return []
 
622
        return None, None
653
623
 
654
624
    @classmethod
655
625
    def is_compatible(self, source, target):
662
632
    def _get_new_refs(self, stop_revision=None):
663
633
        if stop_revision is None:
664
634
            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) }
 
635
        refs = { self.target.ref: stop_revision }
668
636
        for name, revid in self.source.tags.get_tag_dict().iteritems():
669
637
            if self.source.repository.has_revision(revid):
670
 
                refs[tag_name_to_ref(name)] = (None, revid)
671
 
        return refs, main_ref
 
638
                refs[tag_name_to_ref(name)] = revid
 
639
        return refs
672
640
 
673
641
    def pull(self, overwrite=False, stop_revision=None, local=False,
674
642
             possible_transports=None):
676
644
        result = GitBranchPullResult()
677
645
        result.source_branch = self.source
678
646
        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)
686
 
        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]
 
647
        # FIXME: Check for diverged branches
 
648
        old_refs = self.target.repository._git.get_refs()
 
649
        refs = dict(old_refs)
 
650
        refs.update(self._get_new_refs(stop_revision))
 
651
        self.target.repository.fetch_refs(self.source.repository, refs)
 
652
        result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(
 
653
            old_refs.get(self.target.ref, ZERO_SHA))
 
654
        result.new_revid = refs[self.target.ref]
689
655
        return result
690
656
 
691
657
    def push(self, overwrite=False, stop_revision=None,
694
660
        result = GitBranchPushResult()
695
661
        result.source_branch = self.source
696
662
        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]
 
663
        # FIXME: Check for diverged branches
 
664
        old_refs = self.target.repository._git.get_refs()
 
665
        refs = dict(old_refs)
 
666
        refs.update(self._get_new_refs(stop_revision))
 
667
        self.target.repository.fetch_refs(self.source.repository, refs)
 
668
        result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(
 
669
            old_refs.get(self.target.ref, ZERO_SHA))
 
670
        result.new_revid = refs[self.target.ref]
708
671
        return result
709
672
 
710
673
    def lossy_push(self, stop_revision=None):
 
674
        from dulwich.protocol import ZERO_SHA
711
675
        result = GitBranchPushResult()
712
676
        result.source_branch = self.source
713
677
        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]
 
678
        # FIXME: Check for diverged branches
 
679
        refs = self._get_new_refs(stop_revision)
 
680
        result.revidmap, old_refs, new_refs = self.target.repository.dfetch_refs(
 
681
            self.source.repository, refs)
 
682
        result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(
 
683
            old_refs.get(self.target.ref, ZERO_SHA))
 
684
        result.new_revid = self.target.mapping.revision_id_foreign_to_bzr(
 
685
            new_refs[self.target.ref])
724
686
        return result
725
687
 
726
688