/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
    )
60
60
 
61
61
 
62
62
class GitPullResult(branch.PullResult):
 
63
    """Result of a pull from a Git branch."""
63
64
 
64
65
    def _lookup_revno(self, revid):
65
66
        assert isinstance(revid, str), "was %r" % revid
97
98
                mutter("Tag %s points at object %r that is not a commit, "
98
99
                       "ignoring", k, obj)
99
100
                continue
100
 
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
101
            ret[k] = self.branch.lookup_foreign_revision_id(v)
101
102
        return ret
102
103
 
103
104
    def _set_tag_dict(self, to_dict):
110
111
        for name in extra:
111
112
            if name.startswith("refs/tags/"):
112
113
                del self.repository._git[name]
113
 
        
 
114
 
114
115
    def set_tag(self, name, revid):
115
116
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
116
 
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
 
117
            self.branch.lookup_bzr_revision_id(revid)
117
118
 
118
119
 
119
120
class DictTagDict(LocalGitTagDict):
149
150
            return LocalGitTagDict(branch)
150
151
 
151
152
 
 
153
class GitReadLock(object):
 
154
 
 
155
    def __init__(self, unlock):
 
156
        self.unlock = unlock
 
157
 
 
158
 
 
159
class GitWriteLock(object):
 
160
 
 
161
    def __init__(self, unlock):
 
162
        self.unlock = unlock
 
163
 
 
164
 
152
165
class GitBranch(ForeignBranch):
153
166
    """An adapter to git repositories for bzr Branch objects."""
154
167
 
169
182
        """Return the most suitable metadir for a checkout of this branch.
170
183
        Weaves are used if this branch's repository uses weaves.
171
184
        """
172
 
        return get_rich_root_format()
 
185
        return bzrdir.format_registry.make_bzrdir("default")
173
186
 
174
187
    def get_child_submit_format(self):
175
188
        """Return the preferred format of submissions to this branch."""
183
196
 
184
197
        :return: Branch nick
185
198
        """
186
 
        return self.name
 
199
        return self.name or "HEAD"
187
200
 
188
201
    def _set_nick(self, nick):
189
202
        raise NotImplementedError
192
205
 
193
206
    def __repr__(self):
194
207
        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
195
 
            self.ref)
 
208
            self.ref or "HEAD")
196
209
 
197
210
    def generate_revision_history(self, revid, old_revid=None):
198
211
        # FIXME: Check that old_revid is in the ancestry of revid
201
214
 
202
215
    def lock_write(self):
203
216
        self.control_files.lock_write()
 
217
        return GitWriteLock(self.unlock)
204
218
 
205
219
    def get_stacked_on_url(self):
206
220
        # Git doesn't do stacking (yet...)
217
231
 
218
232
    def lock_read(self):
219
233
        self.control_files.lock_read()
 
234
        return GitReadLock(self.unlock)
220
235
 
221
236
    def is_locked(self):
222
237
        return self.control_files.is_locked()
232
247
        # perhaps should escape this ?
233
248
        if self.head is None:
234
249
            return revision.NULL_REVISION
235
 
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
250
        return self.lookup_foreign_revision_id(self.head)
236
251
 
237
252
    def _basic_push(self, target, overwrite=False, stop_revision=None):
238
253
        return branch.InterBranch.get(self, target)._basic_push(
239
254
            overwrite, stop_revision)
240
255
 
 
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
 
241
264
 
242
265
class LocalGitBranch(GitBranch):
243
266
    """A local Git branch."""
244
267
 
245
268
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
246
 
        super(LocalGitBranch, self).__init__(bzrdir, repository, name, 
 
269
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
247
270
              lockfiles, tagsdict)
248
 
        if not name in repository._git.get_refs().keys():
 
271
        refs = repository._git.get_refs()
 
272
        if not (name in refs.keys() or "HEAD" in refs.keys()):
249
273
            raise errors.NotBranchError(self.base)
250
274
 
251
275
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
262
286
            return tree
263
287
        else:
264
288
            return self._create_heavyweight_checkout(to_location, revision_id,
265
 
            hardlink)
 
289
                hardlink)
266
290
 
267
291
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
268
292
                                     hardlink=False):
274
298
        :return: WorkingTree object of checkout.
275
299
        """
276
300
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
277
 
            to_location, force_new_tree=False, format=get_rich_root_format())
 
301
            to_location, force_new_tree=False)
278
302
        checkout = checkout_branch.bzrdir
279
303
        checkout_branch.bind(self)
280
304
        # pull up to the specified revision_id to set the initial
292
316
 
293
317
    def _get_head(self):
294
318
        try:
295
 
            return self.repository._git.ref(self.ref)
 
319
            return self.repository._git.ref(self.ref or "HEAD")
296
320
        except KeyError:
297
321
            return None
298
322
 
305
329
 
306
330
    def _set_head(self, value):
307
331
        self._head = value
308
 
        self.repository._git.refs[self.ref] = self._head
 
332
        self.repository._git.refs[self.ref or "HEAD"] = self._head
309
333
        self._clear_cached_state()
310
334
 
311
335
    head = property(_get_head, _set_head)
329
353
 
330
354
class GitBranchPullResult(branch.PullResult):
331
355
 
 
356
    def __init__(self):
 
357
        super(GitBranchPullResult, self).__init__()
 
358
        self.new_git_head = None
 
359
        self._old_revno = None
 
360
        self._new_revno = None
 
361
 
332
362
    def report(self, to_file):
333
363
        if not is_quiet():
334
364
            if self.old_revid == self.new_revid:
340
370
                to_file.write('Now on revision %d.\n' % (self.new_revno,))
341
371
        self._show_tag_conficts(to_file)
342
372
 
 
373
    def _lookup_revno(self, revid):
 
374
        assert isinstance(revid, str), "was %r" % revid
 
375
        # Try in source branch first, it'll be faster
 
376
        try:
 
377
            return self.source_branch.revision_id_to_revno(revid)
 
378
        except errors.NoSuchRevision:
 
379
            # FIXME: Check using graph.find_distance_to_null() ?
 
380
            return self.target_branch.revision_id_to_revno(revid)
 
381
 
 
382
    def _get_old_revno(self):
 
383
        if self._old_revno is not None:
 
384
            return self._old_revno
 
385
        return self._lookup_revno(self.old_revid)
 
386
 
 
387
    def _set_old_revno(self, revno):
 
388
        self._old_revno = revno
 
389
 
 
390
    old_revno = property(_get_old_revno, _set_old_revno)
 
391
 
 
392
    def _get_new_revno(self):
 
393
        if self._new_revno is not None:
 
394
            return self._new_revno
 
395
        return self._lookup_revno(self.new_revid)
 
396
 
 
397
    def _set_new_revno(self, revno):
 
398
        self._new_revno = revno
 
399
 
 
400
    new_revno = property(_get_new_revno, _set_new_revno)
 
401
 
343
402
 
344
403
class GitBranchPushResult(branch.BranchPushResult):
345
404
 
364
423
class InterFromGitBranch(branch.GenericInterBranch):
365
424
    """InterBranch implementation that pulls from Git into bzr."""
366
425
 
 
426
    @staticmethod
 
427
    def _get_branch_formats_to_test():
 
428
        return []
 
429
 
367
430
    @classmethod
368
431
    def _get_interrepo(self, source, target):
369
432
        return repository.InterRepository.get(source.repository,
385
448
        """
386
449
        interrepo = self._get_interrepo(self.source, self.target)
387
450
        def determine_wants(heads):
388
 
            if not self.source.ref in heads:
 
451
            if self.source.ref is not None and not self.source.ref in heads:
389
452
                raise NoSuchRef(self.source.ref, heads.keys())
390
453
            if stop_revision is not None:
391
454
                self._last_revid = stop_revision
392
455
                head, mapping = self.source.repository.lookup_bzr_revision_id(
393
456
                    stop_revision)
394
457
            else:
395
 
                head = heads[self.source.ref]
396
 
                self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(
397
 
                    head)
 
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)
398
463
            if self.target.repository.has_revision(self._last_revid):
399
464
                return []
400
465
            return [head]
401
 
        pack_hint, head = interrepo.fetch_objects(
 
466
        pack_hint, head, refs = interrepo.fetch_objects(
402
467
            determine_wants, self.source.mapping, limit=limit)
403
 
        if pack_hint is not None and self.target.repository._format.pack_compresses:
 
468
        if (pack_hint is not None and
 
469
            self.target.repository._format.pack_compresses):
404
470
            self.target.repository.pack(hint=pack_hint)
405
471
        if head is not None:
406
 
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
 
472
            self._last_revid = self.source.lookup_foreign_revision_id(head)
407
473
        if overwrite:
408
474
            prev_last_revid = None
409
475
        else:
488
554
class InterGitLocalRemoteBranch(InterGitBranch):
489
555
    """InterBranch that copies from a local to a remote git branch."""
490
556
 
 
557
    @staticmethod
 
558
    def _get_branch_formats_to_test():
 
559
        return []
 
560
 
491
561
    @classmethod
492
562
    def is_compatible(self, source, target):
493
563
        from bzrlib.plugins.git.remote import RemoteGitBranch
503
573
            stop_revision = self.source.last_revision()
504
574
        # FIXME: Check for diverged branches
505
575
        def get_changed_refs(old_refs):
506
 
            result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs.get(self.target.ref, ZERO_SHA))
 
576
            result.old_revid = self.target.lookup_foreign_revision_id(old_refs.get(self.target.ref, ZERO_SHA))
507
577
            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
508
578
            result.new_revid = stop_revision
509
579
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
517
587
class InterGitRemoteLocalBranch(InterGitBranch):
518
588
    """InterBranch that copies from a remote to a local git branch."""
519
589
 
 
590
    @staticmethod
 
591
    def _get_branch_formats_to_test():
 
592
        return []
 
593
 
520
594
    @classmethod
521
595
    def is_compatible(self, source, target):
522
596
        from bzrlib.plugins.git.remote import RemoteGitBranch
536
610
 
537
611
    def update_tags(self, refs):
538
612
        for name, v in extract_tags(refs).iteritems():
539
 
            revid = self.target.mapping.revision_id_foreign_to_bzr(v)
 
613
            revid = self.target.lookup_foreign_revision_id(v)
540
614
            self.target.tags.set_tag(name, revid)
541
615
 
542
616
    def update_refs(self, stop_revision=None):
543
617
        interrepo = repository.InterRepository.get(self.source.repository,
544
618
            self.target.repository)
545
619
        if stop_revision is None:
546
 
            refs = interrepo.fetch_refs(branches=["HEAD"])
547
 
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
 
620
            refs = interrepo.fetch(branches=["HEAD"])
 
621
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
548
622
        else:
549
 
            refs = interrepo.fetch_refs(revision_id=stop_revision)
 
623
            refs = interrepo.fetch(revision_id=stop_revision)
550
624
        return refs, stop_revision
551
625
 
552
626
    def pull(self, stop_revision=None, overwrite=False,
565
639
        return result
566
640
 
567
641
 
568
 
class InterToGitBranch(branch.InterBranch):
 
642
class InterToGitBranch(branch.GenericInterBranch):
569
643
    """InterBranch implementation that pulls from Git into bzr."""
570
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
 
571
650
    @staticmethod
572
651
    def _get_branch_formats_to_test():
573
 
        return None, None
 
652
        return []
574
653
 
575
654
    @classmethod
576
655
    def is_compatible(self, source, target):
580
659
    def update_revisions(self, *args, **kwargs):
581
660
        raise NoPushSupport()
582
661
 
583
 
    def push(self, overwrite=True, stop_revision=None,
 
662
    def _get_new_refs(self, stop_revision=None):
 
663
        if stop_revision is None:
 
664
            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) }
 
668
        for name, revid in self.source.tags.get_tag_dict().iteritems():
 
669
            if self.source.repository.has_revision(revid):
 
670
                refs[tag_name_to_ref(name)] = (None, revid)
 
671
        return refs, main_ref
 
672
 
 
673
    def pull(self, overwrite=False, stop_revision=None, local=False,
 
674
             possible_transports=None):
 
675
        from dulwich.protocol import ZERO_SHA
 
676
        result = GitBranchPullResult()
 
677
        result.source_branch = self.source
 
678
        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]
 
689
        return result
 
690
 
 
691
    def push(self, overwrite=False, stop_revision=None,
584
692
             _override_hook_source_branch=None):
585
693
        from dulwich.protocol import ZERO_SHA
586
694
        result = GitBranchPushResult()
587
695
        result.source_branch = self.source
588
696
        result.target_branch = self.target
589
 
        if stop_revision is None:
590
 
            stop_revision = self.source.last_revision()
591
 
        # FIXME: Check for diverged branches
592
 
        refs = { self.target.ref: stop_revision }
593
 
        for name, revid in self.source.tags.get_tag_dict().iteritems():
594
 
            if self.source.repository.has_revision(revid):
595
 
                refs[tag_name_to_ref(name)] = revid
596
 
        old_refs = self.target.repository._git.get_refs()
597
 
        self.target.repository.fetch_refs(self.source.repository, refs)
598
 
        result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(
599
 
            old_refs.get(self.target.ref, ZERO_SHA))
600
 
        result.new_revid = refs[self.target.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
        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]
601
708
        return result
602
709
 
603
710
    def lossy_push(self, stop_revision=None):
604
 
        return self._push(stop_revision=stop_revision, roundtrip=False)
605
 
        from dulwich.protocol import ZERO_SHA
606
711
        result = GitBranchPushResult()
607
712
        result.source_branch = self.source
608
713
        result.target_branch = self.target
609
 
        if stop_revision is None:
610
 
            stop_revision = self.source.last_revision()
611
 
        # FIXME: Check for diverged branches
612
 
        refs = { self.target.ref: stop_revision }
613
 
        for name, revid in self.source.tags.get_tag_dict().iteritems():
614
 
            if self.source.repository.has_revision(revid):
615
 
                refs[tag_name_to_ref(name)] = revid
616
 
        revidmap, old_refs, new_refs = self.target.repository.dfetch_refs(
617
 
            self.source.repository, refs)
618
 
        result.revidmap = revidmap
619
 
        result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(
620
 
            old_refs.get(self.target.ref, ZERO_SHA))
621
 
        result.new_revid = self.target.mapping.revision_id_foreign_to_bzr(
622
 
            new_refs[self.target.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]
623
724
        return result
624
725
 
625
726