/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 work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
56
56
from bzrlib.revisiontree import (
57
57
    RevisionTree,
58
58
    )
 
59
from bzrlib.testament import (
 
60
    StrictTestament3,
 
61
    )
59
62
from bzrlib.tsort import (
60
63
    topo_sort,
61
64
    )
106
109
    else:
107
110
        cls = InventoryFile
108
111
    ie = cls(file_id, name.decode("utf-8"), parent_id)
109
 
    ie.executable = mode_is_executable(mode)
 
112
    if ie.kind == "file":
 
113
        ie.executable = mode_is_executable(mode)
110
114
    if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
111
115
        base_ie = base_inv[base_inv.path2id(path)]
112
116
        ie.text_size = base_ie.text_size
113
117
        ie.text_sha1 = base_ie.text_sha1
114
 
        ie.symlink_target = base_ie.symlink_target
 
118
        if ie.kind == "symlink":
 
119
            ie.symlink_target = base_ie.symlink_target
115
120
        if ie.executable == base_ie.executable:
116
121
            ie.revision = base_ie.revision
117
122
        else:
121
126
        if ie.kind == "symlink":
122
127
            ie.revision = None
123
128
            ie.symlink_target = blob.data
124
 
            ie.text_size = None
125
 
            ie.text_sha1 = None
126
129
        else:
127
130
            ie.text_size = sum(imap(len, blob.chunked))
128
131
            ie.text_sha1 = osutils.sha_strings(blob.chunked)
341
344
def import_git_commit(repo, mapping, head, lookup_object,
342
345
                      target_git_object_retriever, trees_cache):
343
346
    o = lookup_object(head)
344
 
    rev = mapping.import_commit(o,
 
347
    rev, roundtrip_revid, verifiers = mapping.import_commit(o,
345
348
            lambda x: target_git_object_retriever.lookup_git_sha(x)[1][0])
346
349
    # We have to do this here, since we have to walk the tree and
347
350
    # we need to make sure to import the blobs / trees with the right
356
359
        base_tree = lookup_object(o.parents[0]).tree
357
360
        base_mode = stat.S_IFDIR
358
361
    store_updater = target_git_object_retriever._get_updater(rev)
359
 
    store_updater.add_object(o, None, None)
360
 
    lookup_file_id = mapping.get_fileid_map(lookup_object, o.tree).lookup_file_id
 
362
    fileid_map = mapping.get_fileid_map(lookup_object, o.tree)
361
363
    inv_delta, unusual_modes = import_git_tree(repo.texts,
362
 
            mapping, "", "", (base_tree, o.tree), base_inv, 
 
364
            mapping, "", "", (base_tree, o.tree), base_inv,
363
365
            None, rev.revision_id, [p.inventory for p in parent_trees],
364
366
            lookup_object, (base_mode, stat.S_IFDIR), store_updater,
365
 
            lookup_file_id,
 
367
            fileid_map.lookup_file_id,
366
368
            allow_submodules=getattr(repo._format, "supports_tree_reference", False))
367
 
    store_updater.finish()
368
369
    if unusual_modes != {}:
369
370
        for path, mode in unusual_modes.iteritems():
370
371
            warn_unusual_mode(rev.foreign_revid, path, mode)
375
376
        basis_id = NULL_REVISION
376
377
        base_inv = None
377
378
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
378
 
              inv_delta, rev.revision_id, rev.parent_ids,
379
 
              base_inv)
 
379
              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() }
 
383
    if roundtrip_revid is not None:
 
384
        original_revid = rev.revision_id
 
385
        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
 
391
    store_updater.add_object(o, calculated_verifiers, None)
 
392
    store_updater.finish()
380
393
    ret_tree = RevisionTree(repo, inv, rev.revision_id)
381
394
    trees_cache.add(ret_tree)
382
395
    repo.add_revision(rev.revision_id, rev)
415
428
        except KeyError:
416
429
            continue
417
430
        if isinstance(o, Commit):
418
 
            rev = mapping.import_commit(o, lambda x: None)
419
 
            if repo.has_revision(rev.revision_id):
 
431
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
 
432
                lambda x: None)
 
433
            if (repo.has_revision(rev.revision_id) or
 
434
                (roundtrip_revid and repo.has_revision(roundtrip_revid))):
420
435
                continue
421
436
            graph.append((o.id, o.parents))
422
437
            heads.extend([p for p in o.parents if p not in checked])
480
495
    """Base InterRepository that copies revisions from a Git into a non-Git
481
496
    repository."""
482
497
 
 
498
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
 
499
        """Fetch objects from a remote server.
 
500
 
 
501
        :param determine_wants: determine_wants callback
 
502
        :param mapping: BzrGitMapping to use
 
503
        :param pb: Optional progress bar
 
504
        :param limit: Maximum number of commits to import.
 
505
        :return: Tuple with pack hint, last imported revision id and remote refs
 
506
        """
 
507
        raise NotImplementedError(self.fetch_objects)
 
508
 
483
509
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
484
510
              mapping=None, fetch_spec=None):
485
511
        if mapping is None:
490
516
            interesting_heads = fetch_spec.heads
491
517
        else:
492
518
            interesting_heads = None
493
 
        self._refs = {}
494
519
        def determine_wants(refs):
495
 
            self._refs = refs
496
520
            if interesting_heads is None:
497
521
                ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
498
522
            else:
499
523
                ret = [self.source.lookup_bzr_revision_id(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]
500
524
            return [rev for rev in ret if not self.target.has_revision(self.source.lookup_foreign_revision_id(rev))]
501
 
        (pack_hint, _) = self.fetch_objects(determine_wants, mapping, pb)
 
525
        (pack_hint, _, remote_refs) = self.fetch_objects(determine_wants, mapping, pb)
502
526
        if pack_hint is not None and self.target._format.pack_compresses:
503
527
            self.target.pack(hint=pack_hint)
504
 
        return self._refs
 
528
        return remote_refs
505
529
 
506
530
 
507
531
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
515
539
        pb.update(text, 0, 0)
516
540
 
517
541
 
 
542
class DetermineWantsRecorder(object):
 
543
 
 
544
    def __init__(self, actual):
 
545
        self.actual = actual
 
546
        self.wants = []
 
547
        self.remote_refs = {}
 
548
 
 
549
    def __call__(self, refs):
 
550
        self.remote_refs = refs
 
551
        self.wants = self.actual(refs)
 
552
        return self.wants
 
553
 
 
554
 
518
555
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
519
556
    """InterRepository that copies revisions from a remote Git into a non-Git
520
557
    repository."""
528
565
        return set(all_revs) - all_parents
529
566
 
530
567
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
 
568
        """See `InterGitNonGitRepository`."""
531
569
        def progress(text):
532
570
            report_git_progress(pb, text)
533
571
        store = BazaarObjectStore(self.target, mapping)
536
574
            heads = self.get_target_heads()
537
575
            graph_walker = store.get_graph_walker(
538
576
                    [store._lookup_revision_sha1(head) for head in heads])
539
 
            recorded_wants = []
540
 
 
541
 
            def record_determine_wants(heads):
542
 
                wants = determine_wants(heads)
543
 
                recorded_wants.extend(wants)
544
 
                return wants
 
577
            wants_recorder = DetermineWantsRecorder(determine_wants)
545
578
 
546
579
            create_pb = None
547
580
            if pb is None:
548
581
                create_pb = pb = ui.ui_factory.nested_progress_bar()
549
582
            try:
550
 
                objects_iter = self.source.fetch_objects(record_determine_wants,
551
 
                    graph_walker, store.get_raw, progress)
552
 
                return import_git_objects(self.target, mapping,
553
 
                    objects_iter, store, recorded_wants, pb, limit)
 
583
                objects_iter = self.source.fetch_objects(
 
584
                    wants_recorder, graph_walker, store.get_raw,
 
585
                    progress)
 
586
                (pack_hint, last_rev) = import_git_objects(self.target, mapping,
 
587
                    objects_iter, store, wants_recorder.wants, pb, limit)
 
588
                return (pack_hint, last_rev, wants_recorder.remote_refs)
554
589
            finally:
555
590
                if create_pb:
556
591
                    create_pb.finished()
571
606
    repository."""
572
607
 
573
608
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
574
 
        """Fetch objects.
575
 
        """
576
 
        wants = determine_wants(self.source._git.get_refs())
 
609
        """See `InterGitNonGitRepository`."""
 
610
        remote_refs = self.source._git.get_refs()
 
611
        wants = determine_wants(remote_refs)
577
612
        create_pb = None
578
613
        if pb is None:
579
614
            create_pb = pb = ui.ui_factory.nested_progress_bar()
581
616
        try:
582
617
            self.target.lock_write()
583
618
            try:
584
 
                return import_git_objects(self.target, mapping,
 
619
                (pack_hint, last_rev) = import_git_objects(self.target, mapping,
585
620
                    self.source._git.object_store,
586
621
                    target_git_object_retriever, wants, pb, limit)
 
622
                return (pack_hint, last_rev, remote_refs)
587
623
            finally:
588
624
                self.target.unlock()
589
625
        finally:
608
644
        graphwalker = self.target._git.get_graph_walker()
609
645
        if (isinstance(self.source, LocalGitRepository) and
610
646
            isinstance(self.target, LocalGitRepository)):
611
 
            return self.source._git.fetch(self.target._git, determine_wants,
 
647
            refs = self.source._git.fetch(self.target._git, determine_wants,
612
648
                progress)
 
649
            return (None, None, refs)
613
650
        elif (isinstance(self.source, LocalGitRepository) and
614
651
              isinstance(self.target, RemoteGitRepository)):
615
652
            raise NotImplementedError
617
654
              isinstance(self.target, LocalGitRepository)):
618
655
            f, commit = self.target._git.object_store.add_thin_pack()
619
656
            try:
620
 
                refs = self.source._git.fetch_pack(determine_wants,
621
 
                    graphwalker, f.write, progress)
 
657
                refs = self.source.bzrdir.root_transport.fetch_pack(
 
658
                    determine_wants, graphwalker, f.write, progress)
622
659
                commit()
623
 
                return refs
 
660
                return (None, None, refs)
624
661
            except:
625
662
                f.close()
626
663
                raise
642
679
            determine_wants = r.object_store.determine_wants_all
643
680
        else:
644
681
            determine_wants = lambda x: [y for y in args if not y in r.object_store]
645
 
        return self.fetch_objects(determine_wants, mapping)[0]
 
682
        self.fetch_objects(determine_wants, mapping)
646
683
 
647
684
    @staticmethod
648
685
    def is_compatible(source, target):