/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

Fix colocated remote branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
1
1
# Copyright (C) 2007 Canonical Ltd
2
 
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
 
2
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
5
5
# it under the terms of the GNU General Public License as published by
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
    )
50
50
    NoPushSupport,
51
51
    NoSuchRef,
52
52
    )
53
 
from bzrlib.plugins.git.refs import (
54
 
    ref_to_branch_name,
55
 
    extract_tags,
56
 
    tag_name_to_ref,
57
 
    )
58
53
 
59
54
from bzrlib.foreign import ForeignBranch
60
55
 
61
56
 
 
57
def extract_tags(refs):
 
58
    """Extract the tags from a refs dictionary.
 
59
 
 
60
    :param refs: Refs to extract the tags from.
 
61
    :return: Dictionary mapping tag names to SHA1s.
 
62
    """
 
63
    ret = {}
 
64
    for k,v in refs.iteritems():
 
65
        if k.startswith("refs/tags/") and not k.endswith("^{}"):
 
66
            v = refs.get(k+"^{}", v)
 
67
            ret[k[len("refs/tags/"):]] = v
 
68
    return ret
 
69
 
 
70
 
 
71
def branch_name_to_ref(name):
 
72
    """Map a branch name to a ref.
 
73
 
 
74
    :param name: Branch name
 
75
    :return: ref string
 
76
    """
 
77
    if name is None or name == "HEAD":
 
78
        return "HEAD"
 
79
    if not name.startswith("refs/"):
 
80
        return "refs/heads/%s" % name
 
81
    else:
 
82
        return name
 
83
 
 
84
 
 
85
def ref_to_branch_name(ref):
 
86
    """Map a ref to a branch name
 
87
 
 
88
    :param ref: Ref
 
89
    :return: A branch name
 
90
    """
 
91
    if ref == "HEAD":
 
92
        return "HEAD"
 
93
    if ref.startswith("refs/heads/"):
 
94
        return ref[len("refs/heads/"):]
 
95
    raise ValueError("unable to map ref %s back to branch name")
 
96
 
 
97
 
62
98
class GitPullResult(branch.PullResult):
63
 
    """Result of a pull from a Git branch."""
64
99
 
65
100
    def _lookup_revno(self, revid):
66
101
        assert isinstance(revid, str), "was %r" % revid
98
133
                mutter("Tag %s points at object %r that is not a commit, "
99
134
                       "ignoring", k, obj)
100
135
                continue
101
 
            ret[k] = self.branch.lookup_foreign_revision_id(v)
 
136
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
102
137
        return ret
103
138
 
104
139
    def _set_tag_dict(self, to_dict):
105
140
        extra = set(self.repository._git.get_refs().keys())
106
141
        for k, revid in to_dict.iteritems():
107
 
            name = tag_name_to_ref(k)
 
142
            name = "refs/tags/%s" % k
108
143
            if name in extra:
109
144
                extra.remove(name)
110
145
            self.set_tag(k, revid)
111
146
        for name in extra:
112
147
            if name.startswith("refs/tags/"):
113
148
                del self.repository._git[name]
114
 
 
 
149
        
115
150
    def set_tag(self, name, revid):
116
 
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
117
 
            self.branch.lookup_bzr_revision_id(revid)
 
151
        self.repository._git.refs["refs/tags/%s" % name], _ = \
 
152
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
118
153
 
119
154
 
120
155
class DictTagDict(LocalGitTagDict):
150
185
            return LocalGitTagDict(branch)
151
186
 
152
187
 
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
 
 
165
188
class GitBranch(ForeignBranch):
166
189
    """An adapter to git repositories for bzr Branch objects."""
167
190
 
182
205
        """Return the most suitable metadir for a checkout of this branch.
183
206
        Weaves are used if this branch's repository uses weaves.
184
207
        """
185
 
        return bzrdir.format_registry.make_bzrdir("default")
 
208
        return get_rich_root_format()
186
209
 
187
210
    def get_child_submit_format(self):
188
211
        """Return the preferred format of submissions to this branch."""
196
219
 
197
220
        :return: Branch nick
198
221
        """
199
 
        return self.name or "HEAD"
 
222
        return self.name
200
223
 
201
224
    def _set_nick(self, nick):
202
225
        raise NotImplementedError
205
228
 
206
229
    def __repr__(self):
207
230
        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
208
 
            self.ref or "HEAD")
 
231
            self.ref)
209
232
 
210
233
    def generate_revision_history(self, revid, old_revid=None):
211
234
        # FIXME: Check that old_revid is in the ancestry of revid
214
237
 
215
238
    def lock_write(self):
216
239
        self.control_files.lock_write()
217
 
        return GitWriteLock(self.unlock)
218
240
 
219
241
    def get_stacked_on_url(self):
220
242
        # Git doesn't do stacking (yet...)
231
253
 
232
254
    def lock_read(self):
233
255
        self.control_files.lock_read()
234
 
        return GitReadLock(self.unlock)
235
256
 
236
257
    def is_locked(self):
237
258
        return self.control_files.is_locked()
247
268
        # perhaps should escape this ?
248
269
        if self.head is None:
249
270
            return revision.NULL_REVISION
250
 
        return self.lookup_foreign_revision_id(self.head)
 
271
        return self.mapping.revision_id_foreign_to_bzr(self.head)
251
272
 
252
273
    def _basic_push(self, target, overwrite=False, stop_revision=None):
253
274
        return branch.InterBranch.get(self, target)._basic_push(
254
275
            overwrite, stop_revision)
255
276
 
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
277
 
265
278
class LocalGitBranch(GitBranch):
266
279
    """A local Git branch."""
267
280
 
268
281
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
269
 
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
 
282
        super(LocalGitBranch, self).__init__(bzrdir, repository, name, 
270
283
              lockfiles, tagsdict)
271
 
        refs = repository._git.get_refs()
272
 
        if not (name in refs.keys() or "HEAD" in refs.keys()):
 
284
        if not name in repository._git.get_refs().keys():
273
285
            raise errors.NotBranchError(self.base)
274
286
 
275
287
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
286
298
            return tree
287
299
        else:
288
300
            return self._create_heavyweight_checkout(to_location, revision_id,
289
 
                hardlink)
 
301
            hardlink)
290
302
 
291
303
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
292
304
                                     hardlink=False):
298
310
        :return: WorkingTree object of checkout.
299
311
        """
300
312
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
301
 
            to_location, force_new_tree=False)
 
313
            to_location, force_new_tree=False, format=get_rich_root_format())
302
314
        checkout = checkout_branch.bzrdir
303
315
        checkout_branch.bind(self)
304
316
        # pull up to the specified revision_id to set the initial
316
328
 
317
329
    def _get_head(self):
318
330
        try:
319
 
            return self.repository._git.ref(self.ref or "HEAD")
 
331
            return self.repository._git.ref(self.ref)
320
332
        except KeyError:
321
333
            return None
322
334
 
324
336
        self.set_last_revision(revid)
325
337
 
326
338
    def set_last_revision(self, revid):
327
 
        (newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)
 
339
        (newhead, self.mapping) = self.mapping.revision_id_bzr_to_foreign(
 
340
                revid)
328
341
        self.head = newhead
329
342
 
330
343
    def _set_head(self, value):
331
344
        self._head = value
332
 
        self.repository._git.refs[self.ref or "HEAD"] = self._head
 
345
        self.repository._git.refs[self.ref] = self._head
333
346
        self._clear_cached_state()
334
347
 
335
348
    head = property(_get_head, _set_head)
353
366
 
354
367
class GitBranchPullResult(branch.PullResult):
355
368
 
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
 
 
362
369
    def report(self, to_file):
363
370
        if not is_quiet():
364
371
            if self.old_revid == self.new_revid:
370
377
                to_file.write('Now on revision %d.\n' % (self.new_revno,))
371
378
        self._show_tag_conficts(to_file)
372
379
 
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
 
 
402
380
 
403
381
class GitBranchPushResult(branch.BranchPushResult):
404
382
 
423
401
class InterFromGitBranch(branch.GenericInterBranch):
424
402
    """InterBranch implementation that pulls from Git into bzr."""
425
403
 
426
 
    @staticmethod
427
 
    def _get_branch_formats_to_test():
428
 
        return []
429
 
 
430
404
    @classmethod
431
405
    def _get_interrepo(self, source, target):
432
406
        return repository.InterRepository.get(source.repository,
448
422
        """
449
423
        interrepo = self._get_interrepo(self.source, self.target)
450
424
        def determine_wants(heads):
451
 
            if self.source.ref is not None and not self.source.ref in heads:
 
425
            if not self.source.ref in heads:
452
426
                raise NoSuchRef(self.source.ref, heads.keys())
453
427
            if stop_revision is not None:
454
428
                self._last_revid = stop_revision
455
429
                head, mapping = self.source.repository.lookup_bzr_revision_id(
456
430
                    stop_revision)
457
431
            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)
 
432
                head = heads[self.source.ref]
 
433
                self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(
 
434
                    head)
463
435
            if self.target.repository.has_revision(self._last_revid):
464
436
                return []
465
437
            return [head]
466
 
        pack_hint, head, refs = interrepo.fetch_objects(
 
438
        pack_hint, head = interrepo.fetch_objects(
467
439
            determine_wants, self.source.mapping, limit=limit)
468
 
        if (pack_hint is not None and
469
 
            self.target.repository._format.pack_compresses):
 
440
        if pack_hint is not None and self.target.repository._format.pack_compresses:
470
441
            self.target.repository.pack(hint=pack_hint)
471
442
        if head is not None:
472
 
            self._last_revid = self.source.lookup_foreign_revision_id(head)
 
443
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
473
444
        if overwrite:
474
445
            prev_last_revid = None
475
446
        else:
554
525
class InterGitLocalRemoteBranch(InterGitBranch):
555
526
    """InterBranch that copies from a local to a remote git branch."""
556
527
 
557
 
    @staticmethod
558
 
    def _get_branch_formats_to_test():
559
 
        return []
560
 
 
561
528
    @classmethod
562
529
    def is_compatible(self, source, target):
563
530
        from bzrlib.plugins.git.remote import RemoteGitBranch
565
532
                isinstance(target, RemoteGitBranch))
566
533
 
567
534
    def _basic_push(self, overwrite=False, stop_revision=None):
568
 
        from dulwich.protocol import ZERO_SHA
569
535
        result = GitBranchPushResult()
570
536
        result.source_branch = self.source
571
537
        result.target_branch = self.target
573
539
            stop_revision = self.source.last_revision()
574
540
        # FIXME: Check for diverged branches
575
541
        def get_changed_refs(old_refs):
576
 
            result.old_revid = self.target.lookup_foreign_revision_id(old_refs.get(self.target.ref, ZERO_SHA))
577
 
            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
 
542
            result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs.get("refs/heads/master", "0" * 40))
 
543
            refs = { "refs/heads/master": self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
578
544
            result.new_revid = stop_revision
579
545
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
580
 
                refs[tag_name_to_ref(name)] = sha
 
546
                refs["refs/tags/%s" % name] = sha
581
547
            return refs
582
548
        self.target.repository.send_pack(get_changed_refs,
583
549
            self.source.repository._git.object_store.generate_pack_contents)
587
553
class InterGitRemoteLocalBranch(InterGitBranch):
588
554
    """InterBranch that copies from a remote to a local git branch."""
589
555
 
590
 
    @staticmethod
591
 
    def _get_branch_formats_to_test():
592
 
        return []
593
 
 
594
556
    @classmethod
595
557
    def is_compatible(self, source, target):
596
558
        from bzrlib.plugins.git.remote import RemoteGitBranch
610
572
 
611
573
    def update_tags(self, refs):
612
574
        for name, v in extract_tags(refs).iteritems():
613
 
            revid = self.target.lookup_foreign_revision_id(v)
 
575
            revid = self.target.mapping.revision_id_foreign_to_bzr(v)
614
576
            self.target.tags.set_tag(name, revid)
615
577
 
616
578
    def update_refs(self, stop_revision=None):
617
579
        interrepo = repository.InterRepository.get(self.source.repository,
618
580
            self.target.repository)
619
581
        if stop_revision is None:
620
 
            refs = interrepo.fetch(branches=["HEAD"])
621
 
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
 
582
            refs = interrepo.fetch_refs(branches=["HEAD"])
 
583
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
622
584
        else:
623
 
            refs = interrepo.fetch(revision_id=stop_revision)
 
585
            refs = interrepo.fetch_refs(revision_id=stop_revision)
624
586
        return refs, stop_revision
625
587
 
626
588
    def pull(self, stop_revision=None, overwrite=False,
639
601
        return result
640
602
 
641
603
 
642
 
class InterToGitBranch(branch.GenericInterBranch):
 
604
class InterToGitBranch(branch.InterBranch):
643
605
    """InterBranch implementation that pulls from Git into bzr."""
644
606
 
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
607
    @staticmethod
651
608
    def _get_branch_formats_to_test():
652
 
        return []
 
609
        return None, None
653
610
 
654
611
    @classmethod
655
612
    def is_compatible(self, source, target):
659
616
    def update_revisions(self, *args, **kwargs):
660
617
        raise NoPushSupport()
661
618
 
662
 
    def _get_new_refs(self, stop_revision=None):
 
619
    def push(self, overwrite=True, stop_revision=None,
 
620
             _override_hook_source_branch=None):
 
621
        raise NoPushSupport()
 
622
 
 
623
    def lossy_push(self, stop_revision=None):
 
624
        result = GitBranchPushResult()
 
625
        result.source_branch = self.source
 
626
        result.target_branch = self.target
 
627
        try:
 
628
            result.old_revid = self.target.last_revision()
 
629
        except NoSuchRef:
 
630
            result.old_revid = revision.NULL_REVISION
663
631
        if stop_revision is None:
664
632
            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) }
 
633
        # FIXME: Check for diverged branches
 
634
        refs = { "refs/heads/master": stop_revision }
668
635
        for name, revid in self.source.tags.get_tag_dict().iteritems():
669
636
            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,
692
 
             _override_hook_source_branch=None):
693
 
        from dulwich.protocol import ZERO_SHA
694
 
        result = GitBranchPushResult()
695
 
        result.source_branch = self.source
696
 
        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]
708
 
        return result
709
 
 
710
 
    def lossy_push(self, stop_revision=None):
711
 
        result = GitBranchPushResult()
712
 
        result.source_branch = self.source
713
 
        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]
 
637
                refs["refs/tags/%s" % name] = revid
 
638
        revidmap, new_refs = self.target.repository.dfetch_refs(
 
639
            self.source.repository, refs)
 
640
        if revidmap != {}:
 
641
            self.target.generate_revision_history(revidmap[stop_revision])
 
642
            result.new_revid = revidmap[stop_revision]
 
643
        else:
 
644
            result.new_revid = result.old_revid
 
645
        result.revidmap = revidmap
724
646
        return result
725
647
 
726
648