/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 fetch.py

More test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch.py
19
19
    Tag,
20
20
    Tree,
21
21
    S_ISGITLINK,
 
22
    ZERO_SHA,
22
23
    )
23
24
from dulwich.object_store import (
24
25
    tree_lookup_path,
53
54
from bzrlib.revision import (
54
55
    NULL_REVISION,
55
56
    )
56
 
from bzrlib.revisiontree import (
57
 
    RevisionTree,
58
 
    )
 
57
try:
 
58
    from bzrlib.revisiontree import InventoryRevisionTree
 
59
except ImportError: # bzr < 2.4
 
60
    from bzrlib.revisiontree import RevisionTree as InventoryRevisionTree
59
61
from bzrlib.testament import (
60
62
    StrictTestament3,
61
63
    )
77
79
    LRUTreeCache,
78
80
    _tree_to_objects,
79
81
    )
 
82
from bzrlib.plugins.git.refs import extract_tags
80
83
from bzrlib.plugins.git.remote import (
81
84
    RemoteGitRepository,
82
85
    )
151
154
        assert ie.revision is not None
152
155
        if ie.kind == 'symlink':
153
156
            chunks = []
154
 
        else: 
 
157
        else:
155
158
            chunks = blob.chunked
156
159
        texts.insert_record_stream([
157
160
            ChunkedContentFactory((file_id, ie.revision),
172
175
 
173
176
 
174
177
class SubmodulesRequireSubtrees(BzrError):
175
 
    _fmt = """The repository you are fetching from contains submodules. To continue, upgrade your Bazaar repository to a format that supports nested trees, such as 'development-subtree'."""
 
178
    _fmt = ("The repository you are fetching from contains submodules. "
 
179
            "To continue, upgrade your Bazaar repository to a format that "
 
180
            "supports nested trees, such as 'development-subtree'.")
176
181
    internal = False
177
182
 
178
183
 
179
184
def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),
180
185
    base_inv, parent_id, revision_id, parent_invs, lookup_object,
181
186
    (base_mode, mode), store_updater, lookup_file_id):
 
187
    """Import a git submodule."""
182
188
    if base_hexsha == hexsha and base_mode == mode:
183
189
        return [], {}
184
190
    file_id = lookup_file_id(path)
260
266
    # Remember for next time
261
267
    existing_children = set()
262
268
    child_modes = {}
263
 
    for child_mode, name, child_hexsha in tree.entries():
 
269
    for name, child_mode, child_hexsha in tree.iteritems():
264
270
        existing_children.add(name)
265
271
        child_path = posixpath.join(path, name)
266
272
        if type(base_tree) is Tree:
275
281
        if stat.S_ISDIR(child_mode):
276
282
            subinvdelta, grandchildmodes = import_git_tree(texts, mapping,
277
283
                child_path, name, (child_base_hexsha, child_hexsha), base_inv,
278
 
                file_id, revision_id, parent_invs, lookup_object, 
 
284
                file_id, revision_id, parent_invs, lookup_object,
279
285
                (child_base_mode, child_mode), store_updater, lookup_file_id,
280
286
                allow_submodules=allow_submodules)
281
287
        elif S_ISGITLINK(child_mode): # submodule
286
292
                file_id, revision_id, parent_invs, lookup_object,
287
293
                (child_base_mode, child_mode), store_updater, lookup_file_id)
288
294
        else:
289
 
            subinvdelta = import_git_blob(texts, mapping, child_path, name,
290
 
                (child_base_hexsha, child_hexsha), base_inv, file_id,
291
 
                revision_id, parent_invs, lookup_object,
292
 
                (child_base_mode, child_mode), store_updater, lookup_file_id)
 
295
            if not mapping.is_special_file(name):
 
296
                subinvdelta = import_git_blob(texts, mapping, child_path, name,
 
297
                    (child_base_hexsha, child_hexsha), base_inv, file_id,
 
298
                    revision_id, parent_invs, lookup_object,
 
299
                    (child_base_mode, child_mode), store_updater, lookup_file_id)
 
300
            else:
 
301
                subinvdelta = []
293
302
            grandchildmodes = {}
294
303
        child_modes.update(grandchildmodes)
295
304
        invdelta.extend(subinvdelta)
305
314
 
306
315
 
307
316
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
308
 
    o, rev, ret_tree, parent_trees, mapping, unusual_modes):
 
317
    o, rev, ret_tree, parent_trees, mapping, unusual_modes, verifiers):
309
318
    new_unusual_modes = mapping.export_unusual_file_modes(rev)
310
319
    if new_unusual_modes != unusual_modes:
311
320
        raise AssertionError("unusual modes don't match: %r != %r" % (
312
321
            unusual_modes, new_unusual_modes))
313
322
    # Verify that we can reconstruct the commit properly
314
 
    rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True)
 
323
    rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True,
 
324
        verifiers)
315
325
    if rec_o != o:
316
326
        raise AssertionError("Reconstructed commit differs: %r != %r" % (
317
327
            rec_o, o))
318
328
    diff = []
319
329
    new_objs = {}
320
330
    for path, obj, ie in _tree_to_objects(ret_tree, parent_trees,
321
 
        target_git_object_retriever._cache.idmap, unusual_modes, mapping.BZR_DUMMY_FILE):
 
331
        target_git_object_retriever._cache.idmap, unusual_modes,
 
332
        mapping.BZR_DUMMY_FILE):
322
333
        old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
323
334
        new_objs[path] = obj
324
335
        if obj.id != old_obj_id:
344
355
def import_git_commit(repo, mapping, head, lookup_object,
345
356
                      target_git_object_retriever, trees_cache):
346
357
    o = lookup_object(head)
347
 
    rev, roundtrip_revid, verifiers = mapping.import_commit(o,
348
 
            lambda x: target_git_object_retriever.lookup_git_sha(x)[1][0])
 
358
    # Note that this uses mapping.revision_id_foreign_to_bzr. If the parents
 
359
    # were bzr roundtripped revisions they would be specified in the
 
360
    # roundtrip data.
 
361
    rev, roundtrip_revid, verifiers = mapping.import_commit(
 
362
        o, mapping.revision_id_foreign_to_bzr)
349
363
    # We have to do this here, since we have to walk the tree and
350
364
    # we need to make sure to import the blobs / trees with the right
351
365
    # path; this may involve adding them more than once.
359
373
        base_tree = lookup_object(o.parents[0]).tree
360
374
        base_mode = stat.S_IFDIR
361
375
    store_updater = target_git_object_retriever._get_updater(rev)
362
 
    fileid_map = mapping.get_fileid_map(lookup_object, o.tree)
 
376
    tree_supplement = mapping.get_fileid_map(lookup_object, o.tree)
363
377
    inv_delta, unusual_modes = import_git_tree(repo.texts,
364
378
            mapping, "", "", (base_tree, o.tree), base_inv,
365
379
            None, rev.revision_id, [p.inventory for p in parent_trees],
366
380
            lookup_object, (base_mode, stat.S_IFDIR), store_updater,
367
 
            fileid_map.lookup_file_id,
368
 
            allow_submodules=getattr(repo._format, "supports_tree_reference", False))
 
381
            tree_supplement.lookup_file_id,
 
382
            allow_submodules=getattr(repo._format, "supports_tree_reference",
 
383
                False))
369
384
    if unusual_modes != {}:
370
385
        for path, mode in unusual_modes.iteritems():
371
386
            warn_unusual_mode(rev.foreign_revid, path, mode)
377
392
        base_inv = None
378
393
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
379
394
              inv_delta, rev.revision_id, rev.parent_ids, base_inv)
380
 
    # FIXME: Check verifiers
381
 
    testament = StrictTestament3(rev, inv)
382
 
    calculated_verifiers = { "testament3-sha1": testament.as_sha1() }
 
395
    ret_tree = InventoryRevisionTree(repo, inv, rev.revision_id)
383
396
    if roundtrip_revid is not None:
384
397
        original_revid = rev.revision_id
385
398
        rev.revision_id = roundtrip_revid
386
 
        if calculated_verifiers != verifiers:
387
 
            trace.mutter("Testament SHA1 %r for %r did not match %r.",
388
 
                         calculated_verifiers["testament3-sha1"],
389
 
                         rev.revision_id, verifiers["testament3-sha1"])
390
 
            rev.revision_id = original_revid
 
399
        # Check verifiers
 
400
        if verifiers:
 
401
            if getattr(StrictTestament3, "from_revision_tree", None):
 
402
                testament = StrictTestament3(rev, ret_tree)
 
403
            else: # bzr < 2.4
 
404
                testament = StrictTestament3(rev, inv)
 
405
            calculated_verifiers = { "testament3-sha1": testament.as_sha1() }
 
406
            if calculated_verifiers != verifiers:
 
407
                trace.mutter("Testament SHA1 %r for %r did not match %r.",
 
408
                             calculated_verifiers["testament3-sha1"],
 
409
                             rev.revision_id, verifiers["testament3-sha1"])
 
410
                rev.revision_id = original_revid
 
411
        else:
 
412
            calculated_verifiers = {}
 
413
    else:
 
414
        calculated_verifiers = {}
391
415
    store_updater.add_object(o, calculated_verifiers, None)
392
416
    store_updater.finish()
393
 
    ret_tree = RevisionTree(repo, inv, rev.revision_id)
394
417
    trees_cache.add(ret_tree)
395
418
    repo.add_revision(rev.revision_id, rev)
396
419
    if "verify" in debug.debug_flags:
397
420
        verify_commit_reconstruction(target_git_object_retriever, 
398
421
            lookup_object, o, rev, ret_tree, parent_trees, mapping,
399
 
            unusual_modes)
 
422
            unusual_modes, verifiers)
400
423
 
401
424
 
402
425
def import_git_objects(repo, mapping, object_iter,
429
452
            continue
430
453
        if isinstance(o, Commit):
431
454
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
432
 
                lambda x: None)
 
455
                mapping.revision_id_foreign_to_bzr)
433
456
            if (repo.has_revision(rev.revision_id) or
434
457
                (roundtrip_revid and repo.has_revision(roundtrip_revid))):
435
458
                continue
482
505
 
483
506
    _matching_repo_format = GitRepositoryFormat()
484
507
 
 
508
    def _target_has_shas(self, shas):
 
509
        raise NotImplementedError(self._target_has_shas)
 
510
 
 
511
    def get_determine_wants_heads(self, wants, include_tags=False):
 
512
        wants = set(wants)
 
513
        def determine_wants(refs):
 
514
            potential = set(wants)
 
515
            if include_tags:
 
516
                potential.update(
 
517
                    [v[1] or v[0] for v in extract_tags(refs).itervalues()])
 
518
            return list(potential - self._target_has_shas(potential))
 
519
        return determine_wants
 
520
 
 
521
    def determine_wants_all(self, refs):
 
522
        potential = set([sha for (ref, sha) in refs.iteritems() if not
 
523
            ref.endswith("^{}")])
 
524
        return list(potential - self._target_has_shas(potential))
 
525
 
485
526
    @staticmethod
486
527
    def _get_repo_format_to_test():
487
528
        return None
495
536
    """Base InterRepository that copies revisions from a Git into a non-Git
496
537
    repository."""
497
538
 
 
539
    def _target_has_shas(self, shas):
 
540
        revids = [self.source.lookup_foreign_revision_id(sha) for sha in shas]
 
541
        return self.target.has_revisions(revids)
 
542
 
 
543
    def get_determine_wants_revids(self, revids, include_tags=False):
 
544
        wants = set()
 
545
        for revid in set(revids):
 
546
            git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
 
547
            wants.add(git_sha)
 
548
        return self.get_determine_wants_heads(wants,
 
549
            include_tags=include_tags)
 
550
 
498
551
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
499
552
        """Fetch objects from a remote server.
500
553
 
513
566
        if revision_id is not None:
514
567
            interesting_heads = [revision_id]
515
568
        elif fetch_spec is not None:
516
 
            interesting_heads = fetch_spec.heads
 
569
            recipe = fetch_spec.get_recipe()
 
570
            if recipe[0] in ("search", "proxy-search"):
 
571
                interesting_heads = recipe[1]
 
572
            else:
 
573
                raise AssertionError("Unsupported search result type %s" %
 
574
                        recipe[0])
517
575
        else:
518
576
            interesting_heads = None
519
 
        def determine_wants(refs):
520
 
            if interesting_heads is None:
521
 
                ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
522
 
            else:
523
 
                ret = [self.source.lookup_bzr_revision_id(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]
524
 
            return [rev for rev in ret if not self.target.has_revision(self.source.lookup_foreign_revision_id(rev))]
525
 
        (pack_hint, _, remote_refs) = self.fetch_objects(determine_wants, mapping, pb)
 
577
 
 
578
        if interesting_heads is not None:
 
579
            determine_wants = self.get_determine_wants_revids(
 
580
                interesting_heads, include_tags=False)
 
581
        else:
 
582
            determine_wants = self.determine_wants_all
 
583
 
 
584
        (pack_hint, _, remote_refs) = self.fetch_objects(determine_wants,
 
585
            mapping, pb)
526
586
        if pack_hint is not None and self.target._format.pack_compresses:
527
587
            self.target.pack(hint=pack_hint)
 
588
        assert isinstance(remote_refs, dict)
528
589
        return remote_refs
529
590
 
530
591
 
569
630
        def progress(text):
570
631
            report_git_progress(pb, text)
571
632
        store = BazaarObjectStore(self.target, mapping)
572
 
        self.target.lock_write()
 
633
        store.lock_write()
573
634
        try:
574
635
            heads = self.get_target_heads()
575
636
            graph_walker = store.get_graph_walker(
583
644
                objects_iter = self.source.fetch_objects(
584
645
                    wants_recorder, graph_walker, store.get_raw,
585
646
                    progress)
586
 
                (pack_hint, last_rev) = import_git_objects(self.target, mapping,
587
 
                    objects_iter, store, wants_recorder.wants, pb, limit)
 
647
                trace.mutter("Importing %d new revisions",
 
648
                             len(wants_recorder.wants))
 
649
                (pack_hint, last_rev) = import_git_objects(self.target,
 
650
                    mapping, objects_iter, store, wants_recorder.wants, pb,
 
651
                    limit)
588
652
                return (pack_hint, last_rev, wants_recorder.remote_refs)
589
653
            finally:
590
654
                if create_pb:
591
655
                    create_pb.finished()
592
656
        finally:
593
 
            self.target.unlock()
 
657
            store.unlock()
594
658
 
595
659
    @staticmethod
596
660
    def is_compatible(source, target):
597
661
        """Be compatible with GitRepository."""
598
 
        return (isinstance(source, RemoteGitRepository) and
599
 
                target.supports_rich_root() and
600
 
                not isinstance(target, GitRepository) and
601
 
                target.texts is not None)
 
662
        if not isinstance(source, RemoteGitRepository):
 
663
            return False
 
664
        if not target.supports_rich_root():
 
665
            return False
 
666
        if isinstance(target, GitRepository):
 
667
            return False
 
668
        if not getattr(target._format, "supports_full_versioned_files", True):
 
669
            return False
 
670
        return True
602
671
 
603
672
 
604
673
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
614
683
            create_pb = pb = ui.ui_factory.nested_progress_bar()
615
684
        target_git_object_retriever = BazaarObjectStore(self.target, mapping)
616
685
        try:
617
 
            self.target.lock_write()
 
686
            target_git_object_retriever.lock_write()
618
687
            try:
619
 
                (pack_hint, last_rev) = import_git_objects(self.target, mapping,
620
 
                    self.source._git.object_store,
 
688
                (pack_hint, last_rev) = import_git_objects(self.target,
 
689
                    mapping, self.source._git.object_store,
621
690
                    target_git_object_retriever, wants, pb, limit)
622
691
                return (pack_hint, last_rev, remote_refs)
623
692
            finally:
624
 
                self.target.unlock()
 
693
                target_git_object_retriever.unlock()
625
694
        finally:
626
695
            if create_pb:
627
696
                create_pb.finished()
629
698
    @staticmethod
630
699
    def is_compatible(source, target):
631
700
        """Be compatible with GitRepository."""
632
 
        return (isinstance(source, LocalGitRepository) and
633
 
                target.supports_rich_root() and
634
 
                not isinstance(target, GitRepository) and
635
 
                target.texts is not None)
 
701
        if not isinstance(source, LocalGitRepository):
 
702
            return False
 
703
        if not target.supports_rich_root():
 
704
            return False
 
705
        if isinstance(target, GitRepository):
 
706
            return False
 
707
        if not getattr(target._format, "supports_full_versioned_files", True):
 
708
            return False
 
709
        return True
636
710
 
637
711
 
638
712
class InterGitGitRepository(InterGitRepository):
664
738
        else:
665
739
            raise AssertionError
666
740
 
 
741
    def _target_has_shas(self, shas):
 
742
        return set([sha for sha in shas if self.target._git.object_store])
 
743
 
667
744
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
668
745
              mapping=None, fetch_spec=None, branches=None):
669
746
        if mapping is None:
670
747
            mapping = self.source.get_mapping()
671
748
        r = self.target._git
672
749
        if revision_id is not None:
673
 
            args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
 
750
            args = [self.source.lookup_bzr_revision_id(revision_id)[0]]
674
751
        elif fetch_spec is not None:
675
 
            args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in fetch_spec.heads]
 
752
            recipe = fetch_spec.get_recipe()
 
753
            if recipe[0] in ("search", "proxy-search"):
 
754
                heads = recipe[1]
 
755
            else:
 
756
                raise AssertionError(
 
757
                    "Unsupported search result type %s" % recipe[0])
 
758
            args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in
 
759
                    heads]
676
760
        if branches is not None:
677
 
            determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store]
 
761
            determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store and x[y] != ZERO_SHA]
678
762
        elif fetch_spec is None and revision_id is None:
679
 
            determine_wants = r.object_store.determine_wants_all
 
763
            determine_wants = self.determine_wants_all
680
764
        else:
681
 
            determine_wants = lambda x: [y for y in args if not y in r.object_store]
682
 
        self.fetch_objects(determine_wants, mapping)
 
765
            determine_wants = lambda x: [y for y in args if not y in r.object_store and y != ZERO_SHA]
 
766
        wants_recorder = DetermineWantsRecorder(determine_wants)
 
767
        self.fetch_objects(wants_recorder, mapping)
 
768
        return wants_recorder.remote_refs
683
769
 
684
770
    @staticmethod
685
771
    def is_compatible(source, target):
686
772
        """Be compatible with GitRepository."""
687
773
        return (isinstance(source, GitRepository) and
688
774
                isinstance(target, GitRepository))
 
775
 
 
776
    def get_determine_wants_revids(self, revids, include_tags=False):
 
777
        wants = set()
 
778
        for revid in set(revids):
 
779
            git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
 
780
            wants.add(git_sha)
 
781
        return self.get_determine_wants_heads(wants,
 
782
            include_tags=include_tags)