/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

Fix revision_history test when no DeprecationWarning is printed and bzr 2.5
is used.

Older prereleases of bzr 2.5 didn't deprecate Branch.revision_history.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch.py
18
18
    Commit,
19
19
    Tag,
20
20
    Tree,
 
21
    S_IFGITLINK,
21
22
    S_ISGITLINK,
 
23
    ZERO_SHA,
22
24
    )
23
25
from dulwich.object_store import (
24
26
    tree_lookup_path,
25
27
    )
 
28
from dulwich.walk import Walker
26
29
from itertools import (
27
30
    imap,
28
31
    )
32
35
 
33
36
from bzrlib import (
34
37
    debug,
 
38
    errors,
35
39
    osutils,
36
40
    trace,
37
41
    ui,
53
57
from bzrlib.revision import (
54
58
    NULL_REVISION,
55
59
    )
56
 
from bzrlib.revisiontree import (
57
 
    RevisionTree,
58
 
    )
 
60
try:
 
61
    from bzrlib.revisiontree import InventoryRevisionTree
 
62
except ImportError: # bzr < 2.4
 
63
    from bzrlib.revisiontree import RevisionTree as InventoryRevisionTree
59
64
from bzrlib.testament import (
60
65
    StrictTestament3,
61
66
    )
66
71
    ChunkedContentFactory,
67
72
    )
68
73
 
 
74
from bzrlib.plugins.git.errors import (
 
75
    NotCommitError,
 
76
    )
69
77
from bzrlib.plugins.git.mapping import (
70
78
    DEFAULT_FILE_MODE,
71
79
    mode_is_executable,
77
85
    LRUTreeCache,
78
86
    _tree_to_objects,
79
87
    )
 
88
from bzrlib.plugins.git.refs import (
 
89
    extract_tags,
 
90
    gather_peeled,
 
91
    )
80
92
from bzrlib.plugins.git.remote import (
81
93
    RemoteGitRepository,
82
94
    )
125
137
        blob = lookup_object(hexsha)
126
138
        if ie.kind == "symlink":
127
139
            ie.revision = None
128
 
            ie.symlink_target = blob.data
 
140
            ie.symlink_target = blob.data.decode("utf-8")
129
141
        else:
130
142
            ie.text_size = sum(imap(len, blob.chunked))
131
143
            ie.text_sha1 = osutils.sha_strings(blob.chunked)
151
163
        assert ie.revision is not None
152
164
        if ie.kind == 'symlink':
153
165
            chunks = []
154
 
        else: 
 
166
        else:
155
167
            chunks = blob.chunked
156
168
        texts.insert_record_stream([
157
169
            ChunkedContentFactory((file_id, ie.revision),
172
184
 
173
185
 
174
186
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'."""
 
187
    _fmt = ("The repository you are fetching from contains submodules. "
 
188
            "To continue, upgrade your Bazaar repository to a format that "
 
189
            "supports nested trees, such as 'development-subtree'.")
176
190
    internal = False
177
191
 
178
192
 
179
193
def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),
180
194
    base_inv, parent_id, revision_id, parent_invs, lookup_object,
181
195
    (base_mode, mode), store_updater, lookup_file_id):
 
196
    """Import a git submodule."""
182
197
    if base_hexsha == hexsha and base_mode == mode:
183
198
        return [], {}
184
199
    file_id = lookup_file_id(path)
 
200
    invdelta = []
185
201
    ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
186
202
    ie.revision = revision_id
187
 
    if base_hexsha is None:
188
 
        oldpath = None
 
203
    if base_hexsha is not None:
 
204
        old_path = path.decode("utf-8") # Renames are not supported yet
 
205
        if stat.S_ISDIR(base_mode):
 
206
            invdelta.extend(remove_disappeared_children(base_inv, old_path,
 
207
                lookup_object(base_hexsha), [], lookup_object))
189
208
    else:
190
 
        oldpath = path
 
209
        old_path = None
191
210
    ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
192
211
    texts.insert_record_stream([
193
212
        ChunkedContentFactory((file_id, ie.revision), (), None, [])])
194
 
    invdelta = [(oldpath, path, file_id, ie)]
 
213
    invdelta.append((old_path, path, file_id, ie))
195
214
    return invdelta, {}
196
215
 
197
216
 
260
279
    # Remember for next time
261
280
    existing_children = set()
262
281
    child_modes = {}
263
 
    for child_mode, name, child_hexsha in tree.entries():
 
282
    for name, child_mode, child_hexsha in tree.iteritems():
264
283
        existing_children.add(name)
265
284
        child_path = posixpath.join(path, name)
266
285
        if type(base_tree) is Tree:
275
294
        if stat.S_ISDIR(child_mode):
276
295
            subinvdelta, grandchildmodes = import_git_tree(texts, mapping,
277
296
                child_path, name, (child_base_hexsha, child_hexsha), base_inv,
278
 
                file_id, revision_id, parent_invs, lookup_object, 
 
297
                file_id, revision_id, parent_invs, lookup_object,
279
298
                (child_base_mode, child_mode), store_updater, lookup_file_id,
280
299
                allow_submodules=allow_submodules)
281
300
        elif S_ISGITLINK(child_mode): # submodule
286
305
                file_id, revision_id, parent_invs, lookup_object,
287
306
                (child_base_mode, child_mode), store_updater, lookup_file_id)
288
307
        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)
 
308
            if not mapping.is_special_file(name):
 
309
                subinvdelta = import_git_blob(texts, mapping, child_path, name,
 
310
                    (child_base_hexsha, child_hexsha), base_inv, file_id,
 
311
                    revision_id, parent_invs, lookup_object,
 
312
                    (child_base_mode, child_mode), store_updater, lookup_file_id)
 
313
            else:
 
314
                subinvdelta = []
293
315
            grandchildmodes = {}
294
316
        child_modes.update(grandchildmodes)
295
317
        invdelta.extend(subinvdelta)
296
318
        if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
297
 
                        stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
 
319
                        stat.S_IFLNK, DEFAULT_FILE_MODE|0111,
 
320
                        S_IFGITLINK):
298
321
            child_modes[child_path] = child_mode
299
322
    # Remove any children that have disappeared
300
323
    if base_tree is not None and type(base_tree) is Tree:
305
328
 
306
329
 
307
330
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
308
 
    o, rev, ret_tree, parent_trees, mapping, unusual_modes):
 
331
    o, rev, ret_tree, parent_trees, mapping, unusual_modes, verifiers):
309
332
    new_unusual_modes = mapping.export_unusual_file_modes(rev)
310
333
    if new_unusual_modes != unusual_modes:
311
334
        raise AssertionError("unusual modes don't match: %r != %r" % (
312
335
            unusual_modes, new_unusual_modes))
313
336
    # Verify that we can reconstruct the commit properly
314
 
    rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True)
 
337
    rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True,
 
338
        verifiers)
315
339
    if rec_o != o:
316
340
        raise AssertionError("Reconstructed commit differs: %r != %r" % (
317
341
            rec_o, o))
318
342
    diff = []
319
343
    new_objs = {}
320
344
    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):
 
345
        target_git_object_retriever._cache.idmap, unusual_modes,
 
346
        mapping.BZR_DUMMY_FILE):
322
347
        old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
323
348
        new_objs[path] = obj
324
349
        if obj.id != old_obj_id:
341
366
            old_obj, new_obj))
342
367
 
343
368
 
 
369
def ensure_inventories_in_repo(repo, trees):
 
370
    real_inv_vf = repo.inventories.without_fallbacks()
 
371
    for t in trees:
 
372
        revid = t.get_revision_id()
 
373
        if not real_inv_vf.get_parent_map([(revid, )]):
 
374
            repo.add_inventory(revid, t.inventory, t.get_parent_ids())
 
375
 
 
376
 
344
377
def import_git_commit(repo, mapping, head, lookup_object,
345
378
                      target_git_object_retriever, trees_cache):
346
379
    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])
 
380
    # Note that this uses mapping.revision_id_foreign_to_bzr. If the parents
 
381
    # were bzr roundtripped revisions they would be specified in the
 
382
    # roundtrip data.
 
383
    rev, roundtrip_revid, verifiers = mapping.import_commit(
 
384
        o, mapping.revision_id_foreign_to_bzr)
 
385
    if roundtrip_revid is not None:
 
386
        original_revid = rev.revision_id
 
387
        rev.revision_id = roundtrip_revid
349
388
    # We have to do this here, since we have to walk the tree and
350
389
    # we need to make sure to import the blobs / trees with the right
351
390
    # path; this may involve adding them more than once.
352
391
    parent_trees = trees_cache.revision_trees(rev.parent_ids)
 
392
    ensure_inventories_in_repo(repo, parent_trees)
353
393
    if parent_trees == []:
354
394
        base_inv = Inventory(root_id=None)
355
395
        base_tree = None
359
399
        base_tree = lookup_object(o.parents[0]).tree
360
400
        base_mode = stat.S_IFDIR
361
401
    store_updater = target_git_object_retriever._get_updater(rev)
362
 
    fileid_map = mapping.get_fileid_map(lookup_object, o.tree)
 
402
    tree_supplement = mapping.get_fileid_map(lookup_object, o.tree)
363
403
    inv_delta, unusual_modes = import_git_tree(repo.texts,
364
404
            mapping, "", "", (base_tree, o.tree), base_inv,
365
405
            None, rev.revision_id, [p.inventory for p in parent_trees],
366
406
            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))
 
407
            tree_supplement.lookup_file_id,
 
408
            allow_submodules=getattr(repo._format, "supports_tree_reference",
 
409
                False))
369
410
    if unusual_modes != {}:
370
411
        for path, mode in unusual_modes.iteritems():
371
412
            warn_unusual_mode(rev.foreign_revid, path, mode)
377
418
        base_inv = None
378
419
    rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
379
420
              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
 
421
    ret_tree = InventoryRevisionTree(repo, inv, rev.revision_id)
 
422
    # Check verifiers
 
423
    if verifiers and roundtrip_revid is not None:
 
424
        if getattr(StrictTestament3, "from_revision_tree", None):
 
425
            testament = StrictTestament3(rev, ret_tree)
 
426
        else: # bzr < 2.4
 
427
            testament = StrictTestament3(rev, inv)
 
428
        calculated_verifiers = { "testament3-sha1": testament.as_sha1() }
386
429
        if calculated_verifiers != verifiers:
387
430
            trace.mutter("Testament SHA1 %r for %r did not match %r.",
388
431
                         calculated_verifiers["testament3-sha1"],
389
432
                         rev.revision_id, verifiers["testament3-sha1"])
390
433
            rev.revision_id = original_revid
 
434
            rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
 
435
              inv_delta, rev.revision_id, rev.parent_ids, base_inv)
 
436
            ret_tree = InventoryRevisionTree(repo, inv, rev.revision_id)
 
437
    else:
 
438
        calculated_verifiers = {}
391
439
    store_updater.add_object(o, calculated_verifiers, None)
392
440
    store_updater.finish()
393
 
    ret_tree = RevisionTree(repo, inv, rev.revision_id)
394
441
    trees_cache.add(ret_tree)
395
442
    repo.add_revision(rev.revision_id, rev)
396
443
    if "verify" in debug.debug_flags:
397
444
        verify_commit_reconstruction(target_git_object_retriever, 
398
445
            lookup_object, o, rev, ret_tree, parent_trees, mapping,
399
 
            unusual_modes)
 
446
            unusual_modes, verifiers)
400
447
 
401
448
 
402
449
def import_git_objects(repo, mapping, object_iter,
422
469
        if pb is not None:
423
470
            pb.update("finding revisions to fetch", len(graph), None)
424
471
        head = heads.pop()
425
 
        assert isinstance(head, str)
 
472
        if head == ZERO_SHA:
 
473
            continue
 
474
        assert isinstance(head, str), "head is %r" % (head,)
426
475
        try:
427
476
            o = lookup_object(head)
428
477
        except KeyError:
429
478
            continue
430
479
        if isinstance(o, Commit):
431
480
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
432
 
                lambda x: None)
 
481
                mapping.revision_id_foreign_to_bzr)
433
482
            if (repo.has_revision(rev.revision_id) or
434
483
                (roundtrip_revid and repo.has_revision(roundtrip_revid))):
435
484
                continue
478
527
    return pack_hints, last_imported
479
528
 
480
529
 
481
 
class InterGitRepository(InterRepository):
 
530
class InterFromGitRepository(InterRepository):
482
531
 
483
532
    _matching_repo_format = GitRepositoryFormat()
484
533
 
 
534
    def _target_has_shas(self, shas):
 
535
        raise NotImplementedError(self._target_has_shas)
 
536
 
 
537
    def get_determine_wants_heads(self, wants, include_tags=False):
 
538
        wants = set(wants)
 
539
        def determine_wants(refs):
 
540
            potential = set(wants)
 
541
            if include_tags:
 
542
                potential.update(
 
543
                    [v[1] or v[0] for v in extract_tags(refs).itervalues()])
 
544
            return list(potential - self._target_has_shas(potential))
 
545
        return determine_wants
 
546
 
 
547
    def determine_wants_all(self, refs):
 
548
        potential = set([peeled for (peeled, unpeeled) in
 
549
            gather_peeled(refs).itervalues()])
 
550
        return list(potential - self._target_has_shas(potential))
 
551
 
485
552
    @staticmethod
486
553
    def _get_repo_format_to_test():
487
554
        return None
490
557
        """See InterRepository.copy_content."""
491
558
        self.fetch(revision_id, pb, find_ghosts=False)
492
559
 
493
 
 
494
 
class InterGitNonGitRepository(InterGitRepository):
 
560
    def search_missing_revision_ids(self,
 
561
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
562
            limit=None):
 
563
        git_shas = []
 
564
        todo = []
 
565
        if revision_ids:
 
566
            todo.extend(revision_ids)
 
567
        if if_present_ids:
 
568
            todo.extend(revision_ids)
 
569
        for revid in revision_ids:
 
570
            if revid == NULL_REVISION:
 
571
                continue
 
572
            git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
 
573
            git_shas.append(git_sha)
 
574
        walker = Walker(self.source._git.object_store,
 
575
            include=git_shas, exclude=[sha for sha in self.target.bzrdir.get_refs().values() if sha != ZERO_SHA])
 
576
        missing_revids = set()
 
577
        for entry in walker:
 
578
            missing_revids.add(self.source.lookup_foreign_revision_id(entry.commit.id))
 
579
        return self.source.revision_ids_to_search_result(missing_revids)
 
580
 
 
581
 
 
582
class InterGitNonGitRepository(InterFromGitRepository):
495
583
    """Base InterRepository that copies revisions from a Git into a non-Git
496
584
    repository."""
497
585
 
 
586
    def _target_has_shas(self, shas):
 
587
        revids = {}
 
588
        for sha in shas:
 
589
            try:
 
590
                revid = self.source.lookup_foreign_revision_id(sha)
 
591
            except NotCommitError:
 
592
                # Commit is definitely not present
 
593
                continue
 
594
            else:
 
595
                revids[revid] = sha
 
596
        return set([revids[r] for r in self.target.has_revisions(revids)])
 
597
 
 
598
    def get_determine_wants_revids(self, revids, include_tags=False):
 
599
        wants = set()
 
600
        for revid in set(revids):
 
601
            if self.target.has_revision(revid):
 
602
                continue
 
603
            git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
 
604
            wants.add(git_sha)
 
605
        return self.get_determine_wants_heads(wants,
 
606
            include_tags=include_tags)
 
607
 
498
608
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
499
609
        """Fetch objects from a remote server.
500
610
 
513
623
        if revision_id is not None:
514
624
            interesting_heads = [revision_id]
515
625
        elif fetch_spec is not None:
516
 
            interesting_heads = fetch_spec.heads
 
626
            recipe = fetch_spec.get_recipe()
 
627
            if recipe[0] in ("search", "proxy-search"):
 
628
                interesting_heads = recipe[1]
 
629
            else:
 
630
                raise AssertionError("Unsupported search result type %s" %
 
631
                        recipe[0])
517
632
        else:
518
633
            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)
 
634
 
 
635
        if interesting_heads is not None:
 
636
            determine_wants = self.get_determine_wants_revids(
 
637
                interesting_heads, include_tags=False)
 
638
        else:
 
639
            determine_wants = self.determine_wants_all
 
640
 
 
641
        (pack_hint, _, remote_refs) = self.fetch_objects(determine_wants,
 
642
            mapping, pb)
526
643
        if pack_hint is not None and self.target._format.pack_compresses:
527
644
            self.target.pack(hint=pack_hint)
 
645
        assert isinstance(remote_refs, dict)
528
646
        return remote_refs
529
647
 
530
648
 
569
687
        def progress(text):
570
688
            report_git_progress(pb, text)
571
689
        store = BazaarObjectStore(self.target, mapping)
572
 
        self.target.lock_write()
 
690
        store.lock_write()
573
691
        try:
574
692
            heads = self.get_target_heads()
575
693
            graph_walker = store.get_graph_walker(
583
701
                objects_iter = self.source.fetch_objects(
584
702
                    wants_recorder, graph_walker, store.get_raw,
585
703
                    progress)
586
 
                (pack_hint, last_rev) = import_git_objects(self.target, mapping,
587
 
                    objects_iter, store, wants_recorder.wants, pb, limit)
 
704
                trace.mutter("Importing %d new revisions",
 
705
                             len(wants_recorder.wants))
 
706
                (pack_hint, last_rev) = import_git_objects(self.target,
 
707
                    mapping, objects_iter, store, wants_recorder.wants, pb,
 
708
                    limit)
588
709
                return (pack_hint, last_rev, wants_recorder.remote_refs)
589
710
            finally:
590
711
                if create_pb:
591
712
                    create_pb.finished()
592
713
        finally:
593
 
            self.target.unlock()
 
714
            store.unlock()
594
715
 
595
716
    @staticmethod
596
717
    def is_compatible(source, target):
597
718
        """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)
 
719
        if not isinstance(source, RemoteGitRepository):
 
720
            return False
 
721
        if not target.supports_rich_root():
 
722
            return False
 
723
        if isinstance(target, GitRepository):
 
724
            return False
 
725
        if not getattr(target._format, "supports_full_versioned_files", True):
 
726
            return False
 
727
        return True
602
728
 
603
729
 
604
730
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
607
733
 
608
734
    def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
609
735
        """See `InterGitNonGitRepository`."""
610
 
        remote_refs = self.source._git.get_refs()
 
736
        remote_refs = self.source.bzrdir.get_refs()
611
737
        wants = determine_wants(remote_refs)
612
738
        create_pb = None
613
739
        if pb is None:
614
740
            create_pb = pb = ui.ui_factory.nested_progress_bar()
615
741
        target_git_object_retriever = BazaarObjectStore(self.target, mapping)
616
742
        try:
617
 
            self.target.lock_write()
 
743
            target_git_object_retriever.lock_write()
618
744
            try:
619
 
                (pack_hint, last_rev) = import_git_objects(self.target, mapping,
620
 
                    self.source._git.object_store,
 
745
                (pack_hint, last_rev) = import_git_objects(self.target,
 
746
                    mapping, self.source._git.object_store,
621
747
                    target_git_object_retriever, wants, pb, limit)
622
748
                return (pack_hint, last_rev, remote_refs)
623
749
            finally:
624
 
                self.target.unlock()
 
750
                target_git_object_retriever.unlock()
625
751
        finally:
626
752
            if create_pb:
627
753
                create_pb.finished()
629
755
    @staticmethod
630
756
    def is_compatible(source, target):
631
757
        """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)
636
 
 
637
 
 
638
 
class InterGitGitRepository(InterGitRepository):
 
758
        if not isinstance(source, LocalGitRepository):
 
759
            return False
 
760
        if not target.supports_rich_root():
 
761
            return False
 
762
        if isinstance(target, GitRepository):
 
763
            return False
 
764
        if not getattr(target._format, "supports_full_versioned_files", True):
 
765
            return False
 
766
        return True
 
767
 
 
768
 
 
769
class InterGitGitRepository(InterFromGitRepository):
639
770
    """InterRepository that copies between Git repositories."""
640
771
 
641
 
    def fetch_objects(self, determine_wants, mapping, pb=None):
 
772
    def fetch_refs(self, update_refs, lossy=False):
 
773
        if lossy:
 
774
            raise errors.LossyPushToSameVCS(self.source, self.target)
 
775
        old_refs = self.target.bzrdir.get_refs()
 
776
        ref_changes = {}
 
777
        def determine_wants(heads):
 
778
            old_refs = dict([(k, (v, None)) for (k, v) in heads.iteritems()])
 
779
            new_refs = update_refs(old_refs)
 
780
            ref_changes.update(new_refs)
 
781
            return [sha1 for (sha1, bzr_revid) in new_refs.itervalues()]
 
782
        self.fetch_objects(determine_wants)
 
783
        for k, (git_sha, bzr_revid) in ref_changes.iteritems():
 
784
            self.target._git.refs[k] = git_sha
 
785
        new_refs = self.target.bzrdir.get_refs()
 
786
        return None, old_refs, new_refs
 
787
 
 
788
    def fetch_objects(self, determine_wants, mapping=None, pb=None):
642
789
        def progress(text):
643
790
            trace.note("git: %s", text)
644
791
        graphwalker = self.target._git.get_graph_walker()
652
799
            raise NotImplementedError
653
800
        elif (isinstance(self.source, RemoteGitRepository) and
654
801
              isinstance(self.target, LocalGitRepository)):
655
 
            f, commit = self.target._git.object_store.add_thin_pack()
 
802
            f, commit = self.target._git.object_store.add_pack()
656
803
            try:
657
 
                refs = self.source.bzrdir.root_transport.fetch_pack(
 
804
                refs = self.source.bzrdir.fetch_pack(
658
805
                    determine_wants, graphwalker, f.write, progress)
659
806
                commit()
660
807
                return (None, None, refs)
662
809
                f.close()
663
810
                raise
664
811
        else:
665
 
            raise AssertionError
 
812
            raise AssertionError("fetching between %r and %r not supported" %
 
813
                    (self.source, self.target))
 
814
 
 
815
    def _target_has_shas(self, shas):
 
816
        return set([sha for sha in shas if self.target._git.object_store])
666
817
 
667
818
    def fetch(self, revision_id=None, pb=None, find_ghosts=False,
668
819
              mapping=None, fetch_spec=None, branches=None):
670
821
            mapping = self.source.get_mapping()
671
822
        r = self.target._git
672
823
        if revision_id is not None:
673
 
            args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
 
824
            args = [self.source.lookup_bzr_revision_id(revision_id)[0]]
674
825
        elif fetch_spec is not None:
675
 
            args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in fetch_spec.heads]
 
826
            recipe = fetch_spec.get_recipe()
 
827
            if recipe[0] in ("search", "proxy-search"):
 
828
                heads = recipe[1]
 
829
            else:
 
830
                raise AssertionError(
 
831
                    "Unsupported search result type %s" % recipe[0])
 
832
            args = [self.source.lookup_bzr_revision_id(revid)[0] for revid in heads]
676
833
        if branches is not None:
677
 
            determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store]
 
834
            determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store and x[y] != ZERO_SHA]
678
835
        elif fetch_spec is None and revision_id is None:
679
 
            determine_wants = r.object_store.determine_wants_all
 
836
            determine_wants = self.determine_wants_all
680
837
        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)
 
838
            determine_wants = lambda x: [y for y in args if not y in r.object_store and y != ZERO_SHA]
 
839
        wants_recorder = DetermineWantsRecorder(determine_wants)
 
840
        self.fetch_objects(wants_recorder, mapping)
 
841
        return wants_recorder.remote_refs
683
842
 
684
843
    @staticmethod
685
844
    def is_compatible(source, target):
686
845
        """Be compatible with GitRepository."""
687
846
        return (isinstance(source, GitRepository) and
688
847
                isinstance(target, GitRepository))
 
848
 
 
849
    def get_determine_wants_revids(self, revids, include_tags=False):
 
850
        wants = set()
 
851
        for revid in set(revids):
 
852
            if self.target.has_revision(revid):
 
853
                continue
 
854
            git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
 
855
            wants.add(git_sha)
 
856
        return self.get_determine_wants_heads(wants,
 
857
            include_tags=include_tags)