/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

Support 'add' in empty directory.

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