/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

https://launchpad.net/bugs/613502
Fix regression in git-import.

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 Jelmer Vernooij <jelmer@samba.org>
 
2
# Copyright (C) 2009-2010 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
    )
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
    )
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
    )
53
58
 
54
59
from bzrlib.foreign import ForeignBranch
55
60
 
56
61
 
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
 
 
98
62
class GitPullResult(branch.PullResult):
 
63
    """Result of a pull from a Git branch."""
99
64
 
100
65
    def _lookup_revno(self, revid):
101
66
        assert isinstance(revid, str), "was %r" % revid
133
98
                mutter("Tag %s points at object %r that is not a commit, "
134
99
                       "ignoring", k, obj)
135
100
                continue
136
 
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
101
            ret[k] = self.branch.lookup_foreign_revision_id(v)
137
102
        return ret
138
103
 
139
104
    def _set_tag_dict(self, to_dict):
140
105
        extra = set(self.repository._git.get_refs().keys())
141
106
        for k, revid in to_dict.iteritems():
142
 
            name = "refs/tags/%s" % k
 
107
            name = tag_name_to_ref(k)
143
108
            if name in extra:
144
109
                extra.remove(name)
145
110
            self.set_tag(k, revid)
146
111
        for name in extra:
147
112
            if name.startswith("refs/tags/"):
148
113
                del self.repository._git[name]
149
 
        
 
114
 
150
115
    def set_tag(self, name, revid):
151
 
        self.repository._git.refs["refs/tags/%s" % name], _ = \
 
116
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
152
117
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
153
118
 
154
119
 
185
150
            return LocalGitTagDict(branch)
186
151
 
187
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
 
188
165
class GitBranch(ForeignBranch):
189
166
    """An adapter to git repositories for bzr Branch objects."""
190
167
 
205
182
        """Return the most suitable metadir for a checkout of this branch.
206
183
        Weaves are used if this branch's repository uses weaves.
207
184
        """
208
 
        return get_rich_root_format()
 
185
        return bzrdir.format_registry.make_bzrdir("default")
209
186
 
210
187
    def get_child_submit_format(self):
211
188
        """Return the preferred format of submissions to this branch."""
219
196
 
220
197
        :return: Branch nick
221
198
        """
222
 
        return self.name
 
199
        return self.name or "HEAD"
223
200
 
224
201
    def _set_nick(self, nick):
225
202
        raise NotImplementedError
228
205
 
229
206
    def __repr__(self):
230
207
        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
231
 
            self.ref)
 
208
            self.ref or "HEAD")
232
209
 
233
210
    def generate_revision_history(self, revid, old_revid=None):
234
211
        # FIXME: Check that old_revid is in the ancestry of revid
237
214
 
238
215
    def lock_write(self):
239
216
        self.control_files.lock_write()
 
217
        return GitWriteLock(self.unlock)
240
218
 
241
219
    def get_stacked_on_url(self):
242
220
        # Git doesn't do stacking (yet...)
253
231
 
254
232
    def lock_read(self):
255
233
        self.control_files.lock_read()
 
234
        return GitReadLock(self.unlock)
256
235
 
257
236
    def is_locked(self):
258
237
        return self.control_files.is_locked()
268
247
        # perhaps should escape this ?
269
248
        if self.head is None:
270
249
            return revision.NULL_REVISION
271
 
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
250
        return self.lookup_foreign_revision_id(self.head)
272
251
 
273
252
    def _basic_push(self, target, overwrite=False, stop_revision=None):
274
253
        return branch.InterBranch.get(self, target)._basic_push(
275
254
            overwrite, stop_revision)
276
255
 
 
256
    def lookup_foreign_revision_id(self, foreign_revid):
 
257
        return self.repository.lookup_foreign_revision_id(foreign_revid,
 
258
            self.mapping)
 
259
 
277
260
 
278
261
class LocalGitBranch(GitBranch):
279
262
    """A local Git branch."""
280
263
 
281
264
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
282
 
        super(LocalGitBranch, self).__init__(bzrdir, repository, name, 
 
265
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
283
266
              lockfiles, tagsdict)
284
 
        if not name in repository._git.get_refs().keys():
 
267
        refs = repository._git.get_refs()
 
268
        if not (name in refs.keys() or "HEAD" in refs.keys()):
285
269
            raise errors.NotBranchError(self.base)
286
270
 
287
271
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
298
282
            return tree
299
283
        else:
300
284
            return self._create_heavyweight_checkout(to_location, revision_id,
301
 
            hardlink)
 
285
                hardlink)
302
286
 
303
287
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
304
288
                                     hardlink=False):
310
294
        :return: WorkingTree object of checkout.
311
295
        """
312
296
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
313
 
            to_location, force_new_tree=False, format=get_rich_root_format())
 
297
            to_location, force_new_tree=False)
314
298
        checkout = checkout_branch.bzrdir
315
299
        checkout_branch.bind(self)
316
300
        # pull up to the specified revision_id to set the initial
328
312
 
329
313
    def _get_head(self):
330
314
        try:
331
 
            return self.repository._git.ref(self.ref)
 
315
            return self.repository._git.ref(self.ref or "HEAD")
332
316
        except KeyError:
333
317
            return None
334
318
 
336
320
        self.set_last_revision(revid)
337
321
 
338
322
    def set_last_revision(self, revid):
339
 
        (newhead, self.mapping) = self.mapping.revision_id_bzr_to_foreign(
340
 
                revid)
 
323
        (newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)
341
324
        self.head = newhead
342
325
 
343
326
    def _set_head(self, value):
344
327
        self._head = value
345
 
        self.repository._git.refs[self.ref] = self._head
 
328
        self.repository._git.refs[self.ref or "HEAD"] = self._head
346
329
        self._clear_cached_state()
347
330
 
348
331
    head = property(_get_head, _set_head)
366
349
 
367
350
class GitBranchPullResult(branch.PullResult):
368
351
 
 
352
    def __init__(self):
 
353
        super(GitBranchPullResult, self).__init__()
 
354
        self.new_git_head = None
 
355
        self._old_revno = None
 
356
        self._new_revno = None
 
357
 
369
358
    def report(self, to_file):
370
359
        if not is_quiet():
371
360
            if self.old_revid == self.new_revid:
377
366
                to_file.write('Now on revision %d.\n' % (self.new_revno,))
378
367
        self._show_tag_conficts(to_file)
379
368
 
 
369
    def _lookup_revno(self, revid):
 
370
        assert isinstance(revid, str), "was %r" % revid
 
371
        # Try in source branch first, it'll be faster
 
372
        try:
 
373
            return self.source_branch.revision_id_to_revno(revid)
 
374
        except errors.NoSuchRevision:
 
375
            # FIXME: Check using graph.find_distance_to_null() ?
 
376
            return self.target_branch.revision_id_to_revno(revid)
 
377
 
 
378
    def _get_old_revno(self):
 
379
        if self._old_revno is not None:
 
380
            return self._old_revno
 
381
        return self._lookup_revno(self.old_revid)
 
382
 
 
383
    def _set_old_revno(self, revno):
 
384
        self._old_revno = revno
 
385
 
 
386
    old_revno = property(_get_old_revno, _set_old_revno)
 
387
 
 
388
    def _get_new_revno(self):
 
389
        if self._new_revno is not None:
 
390
            return self._new_revno
 
391
        return self._lookup_revno(self.new_revid)
 
392
 
 
393
    def _set_new_revno(self, revno):
 
394
        self._new_revno = revno
 
395
 
 
396
    new_revno = property(_get_new_revno, _set_new_revno)
 
397
 
380
398
 
381
399
class GitBranchPushResult(branch.BranchPushResult):
382
400
 
401
419
class InterFromGitBranch(branch.GenericInterBranch):
402
420
    """InterBranch implementation that pulls from Git into bzr."""
403
421
 
 
422
    @staticmethod
 
423
    def _get_branch_formats_to_test():
 
424
        return []
 
425
 
404
426
    @classmethod
405
427
    def _get_interrepo(self, source, target):
406
428
        return repository.InterRepository.get(source.repository,
422
444
        """
423
445
        interrepo = self._get_interrepo(self.source, self.target)
424
446
        def determine_wants(heads):
425
 
            if not self.source.ref in heads:
 
447
            if self.source.ref is not None and not self.source.ref in heads:
426
448
                raise NoSuchRef(self.source.ref, heads.keys())
427
449
            if stop_revision is not None:
428
450
                self._last_revid = stop_revision
429
451
                head, mapping = self.source.repository.lookup_bzr_revision_id(
430
452
                    stop_revision)
431
453
            else:
432
 
                head = heads[self.source.ref]
433
 
                self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(
434
 
                    head)
 
454
                if self.source.ref is not None:
 
455
                    head = heads[self.source.ref]
 
456
                else:
 
457
                    head = heads["HEAD"]
 
458
                self._last_revid = self.source.lookup_foreign_revision_id(head)
435
459
            if self.target.repository.has_revision(self._last_revid):
436
460
                return []
437
461
            return [head]
438
 
        pack_hint, head = interrepo.fetch_objects(
 
462
        pack_hint, head, refs = interrepo.fetch_objects(
439
463
            determine_wants, self.source.mapping, limit=limit)
440
 
        if pack_hint is not None and self.target.repository._format.pack_compresses:
 
464
        if (pack_hint is not None and
 
465
            self.target.repository._format.pack_compresses):
441
466
            self.target.repository.pack(hint=pack_hint)
442
467
        if head is not None:
443
 
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
 
468
            self._last_revid = self.source.lookup_foreign_revision_id(head)
444
469
        if overwrite:
445
470
            prev_last_revid = None
446
471
        else:
525
550
class InterGitLocalRemoteBranch(InterGitBranch):
526
551
    """InterBranch that copies from a local to a remote git branch."""
527
552
 
 
553
    @staticmethod
 
554
    def _get_branch_formats_to_test():
 
555
        return []
 
556
 
528
557
    @classmethod
529
558
    def is_compatible(self, source, target):
530
559
        from bzrlib.plugins.git.remote import RemoteGitBranch
532
561
                isinstance(target, RemoteGitBranch))
533
562
 
534
563
    def _basic_push(self, overwrite=False, stop_revision=None):
 
564
        from dulwich.protocol import ZERO_SHA
535
565
        result = GitBranchPushResult()
536
566
        result.source_branch = self.source
537
567
        result.target_branch = self.target
539
569
            stop_revision = self.source.last_revision()
540
570
        # FIXME: Check for diverged branches
541
571
        def get_changed_refs(old_refs):
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] }
 
572
            result.old_revid = self.target.lookup_foreign_revision_id(old_refs.get(self.target.ref, ZERO_SHA))
 
573
            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
544
574
            result.new_revid = stop_revision
545
575
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
546
 
                refs["refs/tags/%s" % name] = sha
 
576
                refs[tag_name_to_ref(name)] = sha
547
577
            return refs
548
578
        self.target.repository.send_pack(get_changed_refs,
549
579
            self.source.repository._git.object_store.generate_pack_contents)
553
583
class InterGitRemoteLocalBranch(InterGitBranch):
554
584
    """InterBranch that copies from a remote to a local git branch."""
555
585
 
 
586
    @staticmethod
 
587
    def _get_branch_formats_to_test():
 
588
        return []
 
589
 
556
590
    @classmethod
557
591
    def is_compatible(self, source, target):
558
592
        from bzrlib.plugins.git.remote import RemoteGitBranch
572
606
 
573
607
    def update_tags(self, refs):
574
608
        for name, v in extract_tags(refs).iteritems():
575
 
            revid = self.target.mapping.revision_id_foreign_to_bzr(v)
 
609
            revid = self.target.lookup_foreign_revision_id(v)
576
610
            self.target.tags.set_tag(name, revid)
577
611
 
578
612
    def update_refs(self, stop_revision=None):
579
613
        interrepo = repository.InterRepository.get(self.source.repository,
580
614
            self.target.repository)
581
615
        if stop_revision is None:
582
 
            refs = interrepo.fetch_refs(branches=["HEAD"])
583
 
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
 
616
            refs = interrepo.fetch(branches=["HEAD"])
 
617
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
584
618
        else:
585
 
            refs = interrepo.fetch_refs(revision_id=stop_revision)
 
619
            refs = interrepo.fetch(revision_id=stop_revision)
586
620
        return refs, stop_revision
587
621
 
588
622
    def pull(self, stop_revision=None, overwrite=False,
601
635
        return result
602
636
 
603
637
 
604
 
class InterToGitBranch(branch.InterBranch):
 
638
class InterToGitBranch(branch.GenericInterBranch):
605
639
    """InterBranch implementation that pulls from Git into bzr."""
606
640
 
 
641
    def __init__(self, source, target):
 
642
        super(InterToGitBranch, self).__init__(source, target)
 
643
        self.interrepo = repository.InterRepository.get(source.repository,
 
644
                                           target.repository)
 
645
 
607
646
    @staticmethod
608
647
    def _get_branch_formats_to_test():
609
 
        return None, None
 
648
        return []
610
649
 
611
650
    @classmethod
612
651
    def is_compatible(self, source, target):
616
655
    def update_revisions(self, *args, **kwargs):
617
656
        raise NoPushSupport()
618
657
 
619
 
    def push(self, overwrite=True, stop_revision=None,
 
658
    def _get_new_refs(self, stop_revision=None):
 
659
        if stop_revision is None:
 
660
            stop_revision = self.source.last_revision()
 
661
        assert type(stop_revision) is str
 
662
        main_ref = self.target.ref or "refs/heads/master"
 
663
        refs = { main_ref: (None, stop_revision) }
 
664
        for name, revid in self.source.tags.get_tag_dict().iteritems():
 
665
            if self.source.repository.has_revision(revid):
 
666
                refs[tag_name_to_ref(name)] = (None, revid)
 
667
        return refs, main_ref
 
668
 
 
669
    def pull(self, overwrite=False, stop_revision=None, local=False,
 
670
             possible_transports=None):
 
671
        from dulwich.protocol import ZERO_SHA
 
672
        result = GitBranchPullResult()
 
673
        result.source_branch = self.source
 
674
        result.target_branch = self.target
 
675
        new_refs, main_ref = self._get_new_refs(stop_revision)
 
676
        def update_refs(old_refs):
 
677
            refs = dict(old_refs)
 
678
            # FIXME: Check for diverged branches
 
679
            refs.update(new_refs)
 
680
            return refs
 
681
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
 
682
        result.old_revid = self.target.lookup_foreign_revision_id(
 
683
            old_refs.get(main_ref, ZERO_SHA))
 
684
        result.new_revid = new_refs[main_ref]
 
685
        return result
 
686
 
 
687
    def push(self, overwrite=False, stop_revision=None,
620
688
             _override_hook_source_branch=None):
621
 
        raise NoPushSupport()
 
689
        from dulwich.protocol import ZERO_SHA
 
690
        result = GitBranchPushResult()
 
691
        result.source_branch = self.source
 
692
        result.target_branch = self.target
 
693
        new_refs, main_ref = self._get_new_refs(stop_revision)
 
694
        def update_refs(old_refs):
 
695
            refs = dict(old_refs)
 
696
            # FIXME: Check for diverged branches
 
697
            refs.update(new_refs)
 
698
            return refs
 
699
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
 
700
        result.old_revid = self.target.lookup_foreign_revision_id(
 
701
            old_refs.get(main_ref, ZERO_SHA))
 
702
        result.new_revid = new_refs[main_ref]
 
703
        return result
622
704
 
623
705
    def lossy_push(self, stop_revision=None):
624
706
        result = GitBranchPushResult()
625
707
        result.source_branch = self.source
626
708
        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
631
 
        if stop_revision is None:
632
 
            stop_revision = self.source.last_revision()
633
 
        # FIXME: Check for diverged branches
634
 
        refs = { "refs/heads/master": stop_revision }
635
 
        for name, revid in self.source.tags.get_tag_dict().iteritems():
636
 
            if self.source.repository.has_revision(revid):
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
 
709
        new_refs, main_ref = self._get_new_refs(stop_revision)
 
710
        def update_refs(old_refs):
 
711
            refs = dict(old_refs)
 
712
            # FIXME: Check for diverged branches
 
713
            refs.update(new_refs)
 
714
            return refs
 
715
        result.revidmap, old_refs, new_refs = self.interrepo.dfetch_refs(
 
716
            update_refs)
 
717
        result.old_revid = old_refs.get(self.target.ref, (None, NULL_REVISION))[1]
 
718
        result.new_revid = new_refs[main_ref][1]
646
719
        return result
647
720
 
648
721