/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
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
 
    ret = {}
59
 
    for k,v in refs.iteritems():
60
 
        if k.startswith("refs/tags/") and not k.endswith("^{}"):
61
 
            v = refs.get(k+"^{}", v)
62
 
            ret[k[len("refs/tags/"):]] = v
63
 
    return ret
64
 
 
65
 
 
66
62
class GitPullResult(branch.PullResult):
 
63
    """Result of a pull from a Git branch."""
67
64
 
68
65
    def _lookup_revno(self, revid):
69
66
        assert isinstance(revid, str), "was %r" % revid
101
98
                mutter("Tag %s points at object %r that is not a commit, "
102
99
                       "ignoring", k, obj)
103
100
                continue
104
 
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
101
            ret[k] = self.branch.lookup_foreign_revision_id(v)
105
102
        return ret
106
103
 
107
104
    def _set_tag_dict(self, to_dict):
108
105
        extra = set(self.repository._git.get_refs().keys())
109
106
        for k, revid in to_dict.iteritems():
110
 
            name = "refs/tags/%s" % k
 
107
            name = tag_name_to_ref(k)
111
108
            if name in extra:
112
109
                extra.remove(name)
113
110
            self.set_tag(k, revid)
114
111
        for name in extra:
115
112
            if name.startswith("refs/tags/"):
116
113
                del self.repository._git[name]
117
 
        
 
114
 
118
115
    def set_tag(self, name, revid):
119
 
        self.repository._git.refs["refs/tags/%s" % name], _ = \
120
 
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
 
116
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
 
117
            self.branch.lookup_bzr_revision_id(revid)
121
118
 
122
119
 
123
120
class DictTagDict(LocalGitTagDict):
124
121
 
125
 
 
126
122
    def __init__(self, branch, tags):
127
123
        super(DictTagDict, self).__init__(branch)
128
124
        self._tags = tags
131
127
        return self._tags
132
128
 
133
129
 
134
 
 
135
130
class GitBranchFormat(branch.BranchFormat):
136
131
 
137
132
    def get_format_description(self):
155
150
            return LocalGitTagDict(branch)
156
151
 
157
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
 
158
165
class GitBranch(ForeignBranch):
159
166
    """An adapter to git repositories for bzr Branch objects."""
160
167
 
161
 
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
 
168
    def __init__(self, bzrdir, repository, ref, lockfiles, tagsdict=None):
162
169
        self.repository = repository
163
170
        self._format = GitBranchFormat()
164
171
        self.control_files = lockfiles
166
173
        super(GitBranch, self).__init__(repository.get_mapping())
167
174
        if tagsdict is not None:
168
175
            self.tags = DictTagDict(self, tagsdict)
169
 
        self.name = name
 
176
        self.ref = ref
 
177
        self.name = ref_to_branch_name(ref)
170
178
        self._head = None
171
179
        self.base = bzrdir.root_transport.base
172
 
        if self.name != "HEAD":
173
 
            self.base += ",%s" % self.name
174
180
 
175
181
    def _get_checkout_format(self):
176
182
        """Return the most suitable metadir for a checkout of this branch.
177
183
        Weaves are used if this branch's repository uses weaves.
178
184
        """
179
 
        return get_rich_root_format()
 
185
        return bzrdir.format_registry.make_bzrdir("default")
180
186
 
181
187
    def get_child_submit_format(self):
182
188
        """Return the preferred format of submissions to this branch."""
190
196
 
191
197
        :return: Branch nick
192
198
        """
193
 
        return self.name
 
199
        return self.name or "HEAD"
194
200
 
195
201
    def _set_nick(self, nick):
196
202
        raise NotImplementedError
198
204
    nick = property(_get_nick, _set_nick)
199
205
 
200
206
    def __repr__(self):
201
 
        return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name)
 
207
        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
 
208
            self.ref or "HEAD")
202
209
 
203
210
    def generate_revision_history(self, revid, old_revid=None):
204
211
        # FIXME: Check that old_revid is in the ancestry of revid
207
214
 
208
215
    def lock_write(self):
209
216
        self.control_files.lock_write()
 
217
        return GitWriteLock(self.unlock)
210
218
 
211
219
    def get_stacked_on_url(self):
212
220
        # Git doesn't do stacking (yet...)
223
231
 
224
232
    def lock_read(self):
225
233
        self.control_files.lock_read()
 
234
        return GitReadLock(self.unlock)
226
235
 
227
236
    def is_locked(self):
228
237
        return self.control_files.is_locked()
238
247
        # perhaps should escape this ?
239
248
        if self.head is None:
240
249
            return revision.NULL_REVISION
241
 
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
250
        return self.lookup_foreign_revision_id(self.head)
242
251
 
243
252
    def _basic_push(self, target, overwrite=False, stop_revision=None):
244
253
        return branch.InterBranch.get(self, target)._basic_push(
245
254
            overwrite, stop_revision)
246
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
 
247
264
 
248
265
class LocalGitBranch(GitBranch):
249
266
    """A local Git branch."""
250
267
 
 
268
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
 
269
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
 
270
              lockfiles, tagsdict)
 
271
        refs = repository._git.get_refs()
 
272
        if not (name in refs.keys() or "HEAD" in refs.keys()):
 
273
            raise errors.NotBranchError(self.base)
 
274
 
251
275
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
252
276
        accelerator_tree=None, hardlink=False):
253
277
        if lightweight:
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.name)
 
319
            return self.repository._git.ref(self.ref or "HEAD")
296
320
        except KeyError:
297
321
            return None
298
322
 
300
324
        self.set_last_revision(revid)
301
325
 
302
326
    def set_last_revision(self, revid):
303
 
        (newhead, self.mapping) = self.mapping.revision_id_bzr_to_foreign(
304
 
                revid)
 
327
        (newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)
305
328
        self.head = newhead
306
329
 
307
330
    def _set_head(self, value):
308
331
        self._head = value
309
 
        self.repository._git.refs[self.name] = self._head
 
332
        self.repository._git.refs[self.ref or "HEAD"] = self._head
310
333
        self._clear_cached_state()
311
334
 
312
335
    head = property(_get_head, _set_head)
330
353
 
331
354
class GitBranchPullResult(branch.PullResult):
332
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
 
333
362
    def report(self, to_file):
334
363
        if not is_quiet():
335
364
            if self.old_revid == self.new_revid:
336
365
                to_file.write('No revisions to pull.\n')
337
 
            else:
 
366
            elif self.new_git_head is not None:
338
367
                to_file.write('Now on revision %d (git sha: %s).\n' %
339
368
                        (self.new_revno, self.new_git_head))
 
369
            else:
 
370
                to_file.write('Now on revision %d.\n' % (self.new_revno,))
340
371
        self._show_tag_conficts(to_file)
341
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
 
342
402
 
343
403
class GitBranchPushResult(branch.BranchPushResult):
344
404
 
363
423
class InterFromGitBranch(branch.GenericInterBranch):
364
424
    """InterBranch implementation that pulls from Git into bzr."""
365
425
 
 
426
    @staticmethod
 
427
    def _get_branch_formats_to_test():
 
428
        return []
 
429
 
366
430
    @classmethod
367
431
    def _get_interrepo(self, source, target):
368
432
        return repository.InterRepository.get(source.repository,
384
448
        """
385
449
        interrepo = self._get_interrepo(self.source, self.target)
386
450
        def determine_wants(heads):
387
 
            if not self.source.name in heads:
388
 
                raise NoSuchRef(self.source.name, heads.keys())
 
451
            if self.source.ref is not None and not self.source.ref in heads:
 
452
                raise NoSuchRef(self.source.ref, heads.keys())
389
453
            if stop_revision is not None:
390
 
                last_revid = stop_revision
 
454
                self._last_revid = stop_revision
391
455
                head, mapping = self.source.repository.lookup_bzr_revision_id(
392
456
                    stop_revision)
393
457
            else:
394
 
                head = heads[self.source.name]
395
 
                last_revid = self.source.mapping.revision_id_foreign_to_bzr(
396
 
                    head)
397
 
            if self.target.repository.has_revision(last_revid):
 
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)
 
463
            if self.target.repository.has_revision(self._last_revid):
398
464
                return []
399
465
            return [head]
400
 
        _, head = interrepo.fetch_objects(
 
466
        pack_hint, head, refs = interrepo.fetch_objects(
401
467
            determine_wants, self.source.mapping, limit=limit)
402
 
        if head is None:
403
 
            last_revid = self.target.last_revision()
404
 
        else:
405
 
            last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
 
468
        if (pack_hint is not None and
 
469
            self.target.repository._format.pack_compresses):
 
470
            self.target.repository.pack(hint=pack_hint)
 
471
        if head is not None:
 
472
            self._last_revid = self.source.lookup_foreign_revision_id(head)
406
473
        if overwrite:
407
474
            prev_last_revid = None
408
475
        else:
409
476
            prev_last_revid = self.target.last_revision()
410
 
        self.target.generate_revision_history(last_revid, prev_last_revid)
 
477
        self.target.generate_revision_history(self._last_revid,
 
478
            prev_last_revid)
411
479
        return head
412
480
 
413
 
    def update_revisions(self, stop_revision=None, overwrite=False, graph=None):
 
481
    def update_revisions(self, stop_revision=None, overwrite=False,
 
482
                         graph=None):
414
483
        """See InterBranch.update_revisions()."""
415
484
        self._update_revisions(stop_revision, overwrite, graph)
416
485
 
443
512
            # We assume that during 'pull' the target repository is closer than
444
513
            # the source one.
445
514
            graph = self.target.repository.get_graph(self.source.repository)
446
 
            result.old_revno, result.old_revid = self.target.last_revision_info()
 
515
            (result.old_revno, result.old_revid) = \
 
516
                self.target.last_revision_info()
447
517
            result.new_git_head = self._update_revisions(
448
518
                stop_revision, overwrite=overwrite, graph=graph, limit=limit)
449
519
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
450
520
                overwrite)
451
 
            result.new_revno, result.new_revid = self.target.last_revision_info()
 
521
            (result.new_revno, result.new_revid) = \
 
522
                self.target.last_revision_info()
452
523
            if _hook_master:
453
524
                result.master_branch = _hook_master
454
525
                result.local_branch = result.target_branch
483
554
class InterGitLocalRemoteBranch(InterGitBranch):
484
555
    """InterBranch that copies from a local to a remote git branch."""
485
556
 
 
557
    @staticmethod
 
558
    def _get_branch_formats_to_test():
 
559
        return []
 
560
 
486
561
    @classmethod
487
562
    def is_compatible(self, source, target):
488
563
        from bzrlib.plugins.git.remote import RemoteGitBranch
490
565
                isinstance(target, RemoteGitBranch))
491
566
 
492
567
    def _basic_push(self, overwrite=False, stop_revision=None):
 
568
        from dulwich.protocol import ZERO_SHA
493
569
        result = GitBranchPushResult()
494
570
        result.source_branch = self.source
495
571
        result.target_branch = self.target
497
573
            stop_revision = self.source.last_revision()
498
574
        # FIXME: Check for diverged branches
499
575
        def get_changed_refs(old_refs):
500
 
            result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs.get("refs/heads/master", "0" * 40))
501
 
            refs = { "refs/heads/master": self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
 
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] }
502
578
            result.new_revid = stop_revision
503
579
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
504
 
                refs["refs/tags/%s" % name] = sha
 
580
                refs[tag_name_to_ref(name)] = sha
505
581
            return refs
506
582
        self.target.repository.send_pack(get_changed_refs,
507
 
                self.source.repository._git.object_store.generate_pack_contents)
 
583
            self.source.repository._git.object_store.generate_pack_contents)
508
584
        return result
509
585
 
510
586
 
511
587
class InterGitRemoteLocalBranch(InterGitBranch):
512
588
    """InterBranch that copies from a remote to a local git branch."""
513
589
 
 
590
    @staticmethod
 
591
    def _get_branch_formats_to_test():
 
592
        return []
 
593
 
514
594
    @classmethod
515
595
    def is_compatible(self, source, target):
516
596
        from bzrlib.plugins.git.remote import RemoteGitBranch
530
610
 
531
611
    def update_tags(self, refs):
532
612
        for name, v in extract_tags(refs).iteritems():
533
 
            revid = self.target.mapping.revision_id_foreign_to_bzr(v)
 
613
            revid = self.target.lookup_foreign_revision_id(v)
534
614
            self.target.tags.set_tag(name, revid)
535
615
 
536
616
    def update_refs(self, stop_revision=None):
537
617
        interrepo = repository.InterRepository.get(self.source.repository,
538
618
            self.target.repository)
539
619
        if stop_revision is None:
540
 
            refs = interrepo.fetch_refs(branches=["HEAD"])
541
 
            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"])
542
622
        else:
543
 
            refs = interrepo.fetch_refs(revision_id=stop_revision)
 
623
            refs = interrepo.fetch(revision_id=stop_revision)
544
624
        return refs, stop_revision
545
625
 
546
626
    def pull(self, stop_revision=None, overwrite=False,
547
 
        possible_transports=None, local=False):
 
627
        possible_transports=None, run_hooks=True,local=False):
548
628
        # This type of branch can't be bound.
549
629
        if local:
550
630
            raise errors.LocalRequiresBoundBranch()
559
639
        return result
560
640
 
561
641
 
562
 
class InterToGitBranch(branch.InterBranch):
 
642
class InterToGitBranch(branch.GenericInterBranch):
563
643
    """InterBranch implementation that pulls from Git into bzr."""
564
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
 
565
650
    @staticmethod
566
651
    def _get_branch_formats_to_test():
567
 
        return None, None
 
652
        return []
568
653
 
569
654
    @classmethod
570
655
    def is_compatible(self, source, target):
574
659
    def update_revisions(self, *args, **kwargs):
575
660
        raise NoPushSupport()
576
661
 
577
 
    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,
578
692
             _override_hook_source_branch=None):
579
 
        raise NoPushSupport()
 
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
580
709
 
581
710
    def lossy_push(self, stop_revision=None):
582
711
        result = GitBranchPushResult()
583
712
        result.source_branch = self.source
584
713
        result.target_branch = self.target
585
 
        try:
586
 
            result.old_revid = self.target.last_revision()
587
 
        except NoSuchRef:
588
 
            result.old_revid = revision.NULL_REVISION
589
 
        if stop_revision is None:
590
 
            stop_revision = self.source.last_revision()
591
 
        # FIXME: Check for diverged branches
592
 
        refs = { "refs/heads/master": stop_revision }
593
 
        for name, revid in self.source.tags.get_tag_dict().iteritems():
594
 
            if self.source.repository.has_revision(revid):
595
 
                refs["refs/tags/%s" % name] = revid
596
 
        revidmap, new_refs = self.target.repository.dfetch_refs(
597
 
            self.source.repository, refs)
598
 
        if revidmap != {}:
599
 
            self.target.generate_revision_history(revidmap[stop_revision])
600
 
            result.new_revid = revidmap[stop_revision]
601
 
        else:
602
 
            result.new_revid = result.old_revid
603
 
        result.revidmap = revidmap
 
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]
604
724
        return result
605
725
 
606
726