/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

  • Committer: Jelmer Vernooij
  • Date: 2010-05-05 09:58:55 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100505095855-i0165hooflvk9chy
Ignore control files in inventories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
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
    )
60
60
 
61
61
 
62
62
class GitPullResult(branch.PullResult):
63
 
    """Result of a pull from a Git branch."""
64
63
 
65
64
    def _lookup_revno(self, revid):
66
65
        assert isinstance(revid, str), "was %r" % revid
98
97
                mutter("Tag %s points at object %r that is not a commit, "
99
98
                       "ignoring", k, obj)
100
99
                continue
101
 
            ret[k] = self.branch.lookup_foreign_revision_id(v)
 
100
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
102
101
        return ret
103
102
 
104
103
    def _set_tag_dict(self, to_dict):
111
110
        for name in extra:
112
111
            if name.startswith("refs/tags/"):
113
112
                del self.repository._git[name]
114
 
 
 
113
        
115
114
    def set_tag(self, name, revid):
116
115
        self.repository._git.refs[tag_name_to_ref(name)], _ = \
117
 
            self.branch.lookup_bzr_revision_id(revid)
 
116
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
118
117
 
119
118
 
120
119
class DictTagDict(LocalGitTagDict):
150
149
            return LocalGitTagDict(branch)
151
150
 
152
151
 
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
152
class GitBranch(ForeignBranch):
166
153
    """An adapter to git repositories for bzr Branch objects."""
167
154
 
182
169
        """Return the most suitable metadir for a checkout of this branch.
183
170
        Weaves are used if this branch's repository uses weaves.
184
171
        """
185
 
        return bzrdir.format_registry.make_bzrdir("default")
 
172
        return get_rich_root_format()
186
173
 
187
174
    def get_child_submit_format(self):
188
175
        """Return the preferred format of submissions to this branch."""
196
183
 
197
184
        :return: Branch nick
198
185
        """
199
 
        return self.name or "HEAD"
 
186
        return self.name
200
187
 
201
188
    def _set_nick(self, nick):
202
189
        raise NotImplementedError
205
192
 
206
193
    def __repr__(self):
207
194
        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
208
 
            self.ref or "HEAD")
 
195
            self.ref)
209
196
 
210
197
    def generate_revision_history(self, revid, old_revid=None):
211
198
        # FIXME: Check that old_revid is in the ancestry of revid
214
201
 
215
202
    def lock_write(self):
216
203
        self.control_files.lock_write()
217
 
        return GitWriteLock(self.unlock)
218
204
 
219
205
    def get_stacked_on_url(self):
220
206
        # Git doesn't do stacking (yet...)
231
217
 
232
218
    def lock_read(self):
233
219
        self.control_files.lock_read()
234
 
        return GitReadLock(self.unlock)
235
220
 
236
221
    def is_locked(self):
237
222
        return self.control_files.is_locked()
247
232
        # perhaps should escape this ?
248
233
        if self.head is None:
249
234
            return revision.NULL_REVISION
250
 
        return self.lookup_foreign_revision_id(self.head)
 
235
        return self.mapping.revision_id_foreign_to_bzr(self.head)
251
236
 
252
237
    def _basic_push(self, target, overwrite=False, stop_revision=None):
253
238
        return branch.InterBranch.get(self, target)._basic_push(
254
239
            overwrite, stop_revision)
255
240
 
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
241
 
265
242
class LocalGitBranch(GitBranch):
266
243
    """A local Git branch."""
267
244
 
268
245
    def __init__(self, bzrdir, repository, name, lockfiles, tagsdict=None):
269
 
        super(LocalGitBranch, self).__init__(bzrdir, repository, name,
 
246
        super(LocalGitBranch, self).__init__(bzrdir, repository, name, 
270
247
              lockfiles, tagsdict)
271
 
        refs = repository._git.get_refs()
272
 
        if not (name in refs.keys() or "HEAD" in refs.keys()):
 
248
        if not name in repository._git.get_refs().keys():
273
249
            raise errors.NotBranchError(self.base)
274
250
 
275
251
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
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.ref)
320
296
        except KeyError:
321
297
            return None
322
298
 
329
305
 
330
306
    def _set_head(self, value):
331
307
        self._head = value
332
 
        self.repository._git.refs[self.ref or "HEAD"] = self._head
 
308
        self.repository._git.refs[self.ref] = self._head
333
309
        self._clear_cached_state()
334
310
 
335
311
    head = property(_get_head, _set_head)
353
329
 
354
330
class GitBranchPullResult(branch.PullResult):
355
331
 
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
332
    def report(self, to_file):
363
333
        if not is_quiet():
364
334
            if self.old_revid == self.new_revid:
370
340
                to_file.write('Now on revision %d.\n' % (self.new_revno,))
371
341
        self._show_tag_conficts(to_file)
372
342
 
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
343
 
403
344
class GitBranchPushResult(branch.BranchPushResult):
404
345
 
423
364
class InterFromGitBranch(branch.GenericInterBranch):
424
365
    """InterBranch implementation that pulls from Git into bzr."""
425
366
 
426
 
    @staticmethod
427
 
    def _get_branch_formats_to_test():
428
 
        return []
429
 
 
430
367
    @classmethod
431
368
    def _get_interrepo(self, source, target):
432
369
        return repository.InterRepository.get(source.repository,
448
385
        """
449
386
        interrepo = self._get_interrepo(self.source, self.target)
450
387
        def determine_wants(heads):
451
 
            if self.source.ref is not None and not self.source.ref in heads:
 
388
            if not self.source.ref in heads:
452
389
                raise NoSuchRef(self.source.ref, heads.keys())
453
390
            if stop_revision is not None:
454
391
                self._last_revid = stop_revision
455
392
                head, mapping = self.source.repository.lookup_bzr_revision_id(
456
393
                    stop_revision)
457
394
            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)
 
395
                head = heads[self.source.ref]
 
396
                self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(
 
397
                    head)
463
398
            if self.target.repository.has_revision(self._last_revid):
464
399
                return []
465
400
            return [head]
466
 
        pack_hint, head, refs = interrepo.fetch_objects(
 
401
        pack_hint, head = interrepo.fetch_objects(
467
402
            determine_wants, self.source.mapping, limit=limit)
468
 
        if (pack_hint is not None and
469
 
            self.target.repository._format.pack_compresses):
 
403
        if pack_hint is not None and self.target.repository._format.pack_compresses:
470
404
            self.target.repository.pack(hint=pack_hint)
471
405
        if head is not None:
472
 
            self._last_revid = self.source.lookup_foreign_revision_id(head)
 
406
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
473
407
        if overwrite:
474
408
            prev_last_revid = None
475
409
        else:
554
488
class InterGitLocalRemoteBranch(InterGitBranch):
555
489
    """InterBranch that copies from a local to a remote git branch."""
556
490
 
557
 
    @staticmethod
558
 
    def _get_branch_formats_to_test():
559
 
        return []
560
 
 
561
491
    @classmethod
562
492
    def is_compatible(self, source, target):
563
493
        from bzrlib.plugins.git.remote import RemoteGitBranch
573
503
            stop_revision = self.source.last_revision()
574
504
        # FIXME: Check for diverged branches
575
505
        def get_changed_refs(old_refs):
576
 
            result.old_revid = self.target.lookup_foreign_revision_id(old_refs.get(self.target.ref, ZERO_SHA))
 
506
            result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs.get(self.target.ref, ZERO_SHA))
577
507
            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
578
508
            result.new_revid = stop_revision
579
509
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
587
517
class InterGitRemoteLocalBranch(InterGitBranch):
588
518
    """InterBranch that copies from a remote to a local git branch."""
589
519
 
590
 
    @staticmethod
591
 
    def _get_branch_formats_to_test():
592
 
        return []
593
 
 
594
520
    @classmethod
595
521
    def is_compatible(self, source, target):
596
522
        from bzrlib.plugins.git.remote import RemoteGitBranch
610
536
 
611
537
    def update_tags(self, refs):
612
538
        for name, v in extract_tags(refs).iteritems():
613
 
            revid = self.target.lookup_foreign_revision_id(v)
 
539
            revid = self.target.mapping.revision_id_foreign_to_bzr(v)
614
540
            self.target.tags.set_tag(name, revid)
615
541
 
616
542
    def update_refs(self, stop_revision=None):
617
543
        interrepo = repository.InterRepository.get(self.source.repository,
618
544
            self.target.repository)
619
545
        if stop_revision is None:
620
 
            refs = interrepo.fetch(branches=["HEAD"])
621
 
            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
 
546
            refs = interrepo.fetch_refs(branches=["HEAD"])
 
547
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
622
548
        else:
623
 
            refs = interrepo.fetch(revision_id=stop_revision)
 
549
            refs = interrepo.fetch_refs(revision_id=stop_revision)
624
550
        return refs, stop_revision
625
551
 
626
552
    def pull(self, stop_revision=None, overwrite=False,
639
565
        return result
640
566
 
641
567
 
642
 
class InterToGitBranch(branch.GenericInterBranch):
 
568
class InterToGitBranch(branch.InterBranch):
643
569
    """InterBranch implementation that pulls from Git into bzr."""
644
570
 
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
571
    @staticmethod
651
572
    def _get_branch_formats_to_test():
652
 
        return []
 
573
        return None, None
653
574
 
654
575
    @classmethod
655
576
    def is_compatible(self, source, target):
659
580
    def update_revisions(self, *args, **kwargs):
660
581
        raise NoPushSupport()
661
582
 
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,
 
583
    def push(self, overwrite=True, stop_revision=None,
692
584
             _override_hook_source_branch=None):
693
585
        from dulwich.protocol import ZERO_SHA
694
586
        result = GitBranchPushResult()
695
587
        result.source_branch = self.source
696
588
        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]
 
589
        if stop_revision is None:
 
590
            stop_revision = self.source.last_revision()
 
591
        # FIXME: Check for diverged branches
 
592
        refs = { self.target.ref: stop_revision }
 
593
        for name, revid in self.source.tags.get_tag_dict().iteritems():
 
594
            if self.source.repository.has_revision(revid):
 
595
                refs[tag_name_to_ref(name)] = revid
 
596
        old_refs = self.target.repository._git.get_refs()
 
597
        self.target.repository.fetch_refs(self.source.repository, refs)
 
598
        result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(
 
599
            old_refs.get(self.target.ref, ZERO_SHA))
 
600
        result.new_revid = refs[self.target.ref]
708
601
        return result
709
602
 
710
603
    def lossy_push(self, stop_revision=None):
 
604
        return self._push(stop_revision=stop_revision, roundtrip=False)
 
605
        from dulwich.protocol import ZERO_SHA
711
606
        result = GitBranchPushResult()
712
607
        result.source_branch = self.source
713
608
        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]
 
609
        if stop_revision is None:
 
610
            stop_revision = self.source.last_revision()
 
611
        # FIXME: Check for diverged branches
 
612
        refs = { self.target.ref: stop_revision }
 
613
        for name, revid in self.source.tags.get_tag_dict().iteritems():
 
614
            if self.source.repository.has_revision(revid):
 
615
                refs[tag_name_to_ref(name)] = revid
 
616
        revidmap, old_refs, new_refs = self.target.repository.dfetch_refs(
 
617
            self.source.repository, refs)
 
618
        result.revidmap = revidmap
 
619
        result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(
 
620
            old_refs.get(self.target.ref, ZERO_SHA))
 
621
        result.new_revid = self.target.mapping.revision_id_foreign_to_bzr(
 
622
            new_refs[self.target.ref])
724
623
        return result
725
624
 
726
625