/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

Special-case NULL_REVISION when looking for Git shas.

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, default=None):
72
 
    """Map a branch name to a ref.
73
 
 
74
 
    :param name: Branch name
75
 
    :return: ref string
76
 
    """
77
 
    if name is None:
78
 
        return default
79
 
    if name == "HEAD":
80
 
        return "HEAD"
81
 
    if not name.startswith("refs/"):
82
 
        return "refs/heads/%s" % name
83
 
    else:
84
 
        return name
85
 
 
86
 
 
87
 
def ref_to_branch_name(ref):
88
 
    """Map a ref to a branch name
89
 
 
90
 
    :param ref: Ref
91
 
    :return: A branch name
92
 
    """
93
 
    if ref == "HEAD":
94
 
        return "HEAD"
95
 
    if ref.startswith("refs/heads/"):
96
 
        return ref[len("refs/heads/"):]
97
 
    raise ValueError("unable to map ref %s back to branch name")
98
 
 
99
 
 
100
62
class GitPullResult(branch.PullResult):
 
63
    """Result of a pull from a Git branch."""
101
64
 
102
65
    def _lookup_revno(self, revid):
103
66
        assert isinstance(revid, str), "was %r" % revid
135
98
                mutter("Tag %s points at object %r that is not a commit, "
136
99
                       "ignoring", k, obj)
137
100
                continue
138
 
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
101
            ret[k] = self.branch.lookup_foreign_revision_id(v)
139
102
        return ret
140
103
 
141
104
    def _set_tag_dict(self, to_dict):
142
105
        extra = set(self.repository._git.get_refs().keys())
143
106
        for k, revid in to_dict.iteritems():
144
 
            name = "refs/tags/%s" % k
 
107
            name = tag_name_to_ref(k)
145
108
            if name in extra:
146
109
                extra.remove(name)
147
110
            self.set_tag(k, revid)
148
111
        for name in extra:
149
112
            if name.startswith("refs/tags/"):
150
113
                del self.repository._git[name]
151
 
        
 
114
 
152
115
    def set_tag(self, name, revid):
153
 
        self.repository._git.refs["refs/tags/%s" % name], _ = \
 
116
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
154
117
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
155
118
 
156
119
 
187
150
            return LocalGitTagDict(branch)
188
151
 
189
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
 
190
165
class GitBranch(ForeignBranch):
191
166
    """An adapter to git repositories for bzr Branch objects."""
192
167
 
207
182
        """Return the most suitable metadir for a checkout of this branch.
208
183
        Weaves are used if this branch's repository uses weaves.
209
184
        """
210
 
        return get_rich_root_format()
 
185
        return bzrdir.format_registry.make_bzrdir("default")
211
186
 
212
187
    def get_child_submit_format(self):
213
188
        """Return the preferred format of submissions to this branch."""
221
196
 
222
197
        :return: Branch nick
223
198
        """
224
 
        return self.name
 
199
        return self.name or "HEAD"
225
200
 
226
201
    def _set_nick(self, nick):
227
202
        raise NotImplementedError
230
205
 
231
206
    def __repr__(self):
232
207
        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
233
 
            self.ref)
 
208
            self.ref or "HEAD")
234
209
 
235
210
    def generate_revision_history(self, revid, old_revid=None):
236
211
        # FIXME: Check that old_revid is in the ancestry of revid
239
214
 
240
215
    def lock_write(self):
241
216
        self.control_files.lock_write()
 
217
        return GitWriteLock(self.unlock)
242
218
 
243
219
    def get_stacked_on_url(self):
244
220
        # Git doesn't do stacking (yet...)
255
231
 
256
232
    def lock_read(self):
257
233
        self.control_files.lock_read()
 
234
        return GitReadLock(self.unlock)
258
235
 
259
236
    def is_locked(self):
260
237
        return self.control_files.is_locked()
270
247
        # perhaps should escape this ?
271
248
        if self.head is None:
272
249
            return revision.NULL_REVISION
273
 
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
250
        return self.lookup_foreign_revision_id(self.head)
274
251
 
275
252
    def _basic_push(self, target, overwrite=False, stop_revision=None):
276
253
        return branch.InterBranch.get(self, target)._basic_push(
277
254
            overwrite, stop_revision)
278
255
 
 
256
    def lookup_foreign_revision_id(self, foreign_revid):
 
257
        return self.repository.lookup_foreign_revision_id(foreign_revid,
 
258
            self.mapping)
 
259
 
279
260
 
280
261
class LocalGitBranch(GitBranch):
281
262
    """A local Git branch."""
282
263
 
283
264
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
284
 
        super(LocalGitBranch, self).__init__(bzrdir, repository, name, 
 
265
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
285
266
              lockfiles, tagsdict)
286
 
        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()):
287
269
            raise errors.NotBranchError(self.base)
288
270
 
289
271
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
300
282
            return tree
301
283
        else:
302
284
            return self._create_heavyweight_checkout(to_location, revision_id,
303
 
            hardlink)
 
285
                hardlink)
304
286
 
305
287
    def _create_heavyweight_checkout(self, to_location, revision_id=None,
306
288
                                     hardlink=False):
312
294
        :return: WorkingTree object of checkout.
313
295
        """
314
296
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
315
 
            to_location, force_new_tree=False, format=get_rich_root_format())
 
297
            to_location, force_new_tree=False)
316
298
        checkout = checkout_branch.bzrdir
317
299
        checkout_branch.bind(self)
318
300
        # pull up to the specified revision_id to set the initial
330
312
 
331
313
    def _get_head(self):
332
314
        try:
333
 
            return self.repository._git.ref(self.ref)
 
315
            return self.repository._git.ref(self.ref or "HEAD")
334
316
        except KeyError:
335
317
            return None
336
318
 
338
320
        self.set_last_revision(revid)
339
321
 
340
322
    def set_last_revision(self, revid):
341
 
        (newhead, self.mapping) = self.mapping.revision_id_bzr_to_foreign(
342
 
                revid)
 
323
        (newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)
343
324
        self.head = newhead
344
325
 
345
326
    def _set_head(self, value):
346
327
        self._head = value
347
 
        self.repository._git.refs[self.ref] = self._head
 
328
        self.repository._git.refs[self.ref or "HEAD"] = self._head
348
329
        self._clear_cached_state()
349
330
 
350
331
    head = property(_get_head, _set_head)
368
349
 
369
350
class GitBranchPullResult(branch.PullResult):
370
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
 
371
358
    def report(self, to_file):
372
359
        if not is_quiet():
373
360
            if self.old_revid == self.new_revid:
379
366
                to_file.write('Now on revision %d.\n' % (self.new_revno,))
380
367
        self._show_tag_conficts(to_file)
381
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
 
382
398
 
383
399
class GitBranchPushResult(branch.BranchPushResult):
384
400
 
424
440
        """
425
441
        interrepo = self._get_interrepo(self.source, self.target)
426
442
        def determine_wants(heads):
427
 
            if not self.source.ref in heads:
 
443
            if self.source.ref is not None and not self.source.ref in heads:
428
444
                raise NoSuchRef(self.source.ref, heads.keys())
429
445
            if stop_revision is not None:
430
446
                self._last_revid = stop_revision
431
447
                head, mapping = self.source.repository.lookup_bzr_revision_id(
432
448
                    stop_revision)
433
449
            else:
434
 
                head = heads[self.source.ref]
435
 
                self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(
436
 
                    head)
 
450
                if self.source.ref is not None:
 
451
                    head = heads[self.source.ref]
 
452
                else:
 
453
                    head = heads["HEAD"]
 
454
                self._last_revid = self.source.lookup_foreign_revision_id(head)
437
455
            if self.target.repository.has_revision(self._last_revid):
438
456
                return []
439
457
            return [head]
440
458
        pack_hint, head = interrepo.fetch_objects(
441
459
            determine_wants, self.source.mapping, limit=limit)
442
 
        if pack_hint is not None and self.target.repository._format.pack_compresses:
 
460
        if (pack_hint is not None and
 
461
            self.target.repository._format.pack_compresses):
443
462
            self.target.repository.pack(hint=pack_hint)
444
463
        if head is not None:
445
 
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
 
464
            self._last_revid = self.source.lookup_foreign_revision_id(head)
446
465
        if overwrite:
447
466
            prev_last_revid = None
448
467
        else:
534
553
                isinstance(target, RemoteGitBranch))
535
554
 
536
555
    def _basic_push(self, overwrite=False, stop_revision=None):
 
556
        from dulwich.protocol import ZERO_SHA
537
557
        result = GitBranchPushResult()
538
558
        result.source_branch = self.source
539
559
        result.target_branch = self.target
541
561
            stop_revision = self.source.last_revision()
542
562
        # FIXME: Check for diverged branches
543
563
        def get_changed_refs(old_refs):
544
 
            result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs.get(self.target.ref, "0" * 40))
 
564
            result.old_revid = self.target.lookup_foreign_revision_id(old_refs.get(self.target.ref, ZERO_SHA))
545
565
            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
546
566
            result.new_revid = stop_revision
547
567
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
548
 
                refs["refs/tags/%s" % name] = sha
 
568
                refs[tag_name_to_ref(name)] = sha
549
569
            return refs
550
570
        self.target.repository.send_pack(get_changed_refs,
551
571
            self.source.repository._git.object_store.generate_pack_contents)
574
594
 
575
595
    def update_tags(self, refs):
576
596
        for name, v in extract_tags(refs).iteritems():
577
 
            revid = self.target.mapping.revision_id_foreign_to_bzr(v)
 
597
            revid = self.target.lookup_foreign_revision_id(v)
578
598
            self.target.tags.set_tag(name, revid)
579
599
 
580
600
    def update_refs(self, stop_revision=None):
581
601
        interrepo = repository.InterRepository.get(self.source.repository,
582
602
            self.target.repository)
583
603
        if stop_revision is None:
584
 
            refs = interrepo.fetch_refs(branches=["HEAD"])
585
 
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
 
604
            refs = interrepo.fetch(branches=["HEAD"])
 
605
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
586
606
        else:
587
 
            refs = interrepo.fetch_refs(revision_id=stop_revision)
 
607
            refs = interrepo.fetch(revision_id=stop_revision)
588
608
        return refs, stop_revision
589
609
 
590
610
    def pull(self, stop_revision=None, overwrite=False,
603
623
        return result
604
624
 
605
625
 
606
 
class InterToGitBranch(branch.InterBranch):
 
626
class InterToGitBranch(branch.GenericInterBranch):
607
627
    """InterBranch implementation that pulls from Git into bzr."""
608
628
 
 
629
    def __init__(self, source, target):
 
630
        super(InterToGitBranch, self).__init__(source, target)
 
631
        self.interrepo = repository.InterRepository.get(source.repository,
 
632
                                           target.repository)
 
633
 
609
634
    @staticmethod
610
635
    def _get_branch_formats_to_test():
611
 
        return None, None
 
636
        return []
612
637
 
613
638
    @classmethod
614
639
    def is_compatible(self, source, target):
618
643
    def update_revisions(self, *args, **kwargs):
619
644
        raise NoPushSupport()
620
645
 
621
 
    def push(self, overwrite=True, stop_revision=None,
 
646
    def _get_new_refs(self, stop_revision=None):
 
647
        if stop_revision is None:
 
648
            stop_revision = self.source.last_revision()
 
649
        assert type(stop_revision) is str
 
650
        main_ref = self.target.ref or "refs/heads/master"
 
651
        refs = { main_ref: (None, stop_revision) }
 
652
        for name, revid in self.source.tags.get_tag_dict().iteritems():
 
653
            if self.source.repository.has_revision(revid):
 
654
                refs[tag_name_to_ref(name)] = (None, revid)
 
655
        return refs, main_ref
 
656
 
 
657
    def pull(self, overwrite=False, stop_revision=None, local=False,
 
658
             possible_transports=None):
 
659
        from dulwich.protocol import ZERO_SHA
 
660
        result = GitBranchPullResult()
 
661
        result.source_branch = self.source
 
662
        result.target_branch = self.target
 
663
        new_refs, main_ref = self._get_new_refs(stop_revision)
 
664
        def update_refs(old_refs):
 
665
            refs = dict(old_refs)
 
666
            # FIXME: Check for diverged branches
 
667
            refs.update(new_refs)
 
668
            return refs
 
669
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
 
670
        result.old_revid = self.target.lookup_foreign_revision_id(
 
671
            old_refs.get(main_ref, ZERO_SHA))
 
672
        result.new_revid = new_refs[main_ref]
 
673
        return result
 
674
 
 
675
    def push(self, overwrite=False, stop_revision=None,
622
676
             _override_hook_source_branch=None):
623
 
        raise NoPushSupport()
 
677
        from dulwich.protocol import ZERO_SHA
 
678
        result = GitBranchPushResult()
 
679
        result.source_branch = self.source
 
680
        result.target_branch = self.target
 
681
        new_refs, main_ref = self._get_new_refs(stop_revision)
 
682
        def update_refs(old_refs):
 
683
            refs = dict(old_refs)
 
684
            # FIXME: Check for diverged branches
 
685
            refs.update(new_refs)
 
686
            return refs
 
687
        old_refs, new_refs = self.interrepo.fetch_refs(update_refs)
 
688
        result.old_revid = self.target.lookup_foreign_revision_id(
 
689
            old_refs.get(main_ref, ZERO_SHA))
 
690
        result.new_revid = new_refs[main_ref]
 
691
        return result
624
692
 
625
693
    def lossy_push(self, stop_revision=None):
626
694
        result = GitBranchPushResult()
627
695
        result.source_branch = self.source
628
696
        result.target_branch = self.target
629
 
        if stop_revision is None:
630
 
            stop_revision = self.source.last_revision()
631
 
        # FIXME: Check for diverged branches
632
 
        refs = { self.target.ref: stop_revision }
633
 
        for name, revid in self.source.tags.get_tag_dict().iteritems():
634
 
            if self.source.repository.has_revision(revid):
635
 
                refs["refs/tags/%s" % name] = revid
636
 
        revidmap, old_refs, new_refs = self.target.repository.dfetch_refs(
637
 
            self.source.repository, refs)
638
 
        result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(
639
 
            old_refs.get(self.target.ref, "0" * 40))
640
 
        result.new_revid = self.target.mapping.revision_id_foreign_to_bzr(
641
 
            new_refs[self.target.ref])
642
 
        result.revidmap = revidmap
 
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
        result.revidmap, old_refs, new_refs = self.interrepo.dfetch_refs(
 
704
            update_refs)
 
705
        result.old_revid = old_refs.get(self.target.ref, (None, NULL_REVISION))[1]
 
706
        result.new_revid = new_refs[main_ref][1]
643
707
        return result
644
708
 
645
709