/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

cope with branch argument to _warn_if_deprecated

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