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
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)
362
fileid_map = mapping.get_fileid_map(lookup_object, o.tree)
359
store_updater.add_object(o, None, None)
360
lookup_file_id = mapping.get_fileid_map(lookup_object, o.tree).lookup_file_id
363
361
inv_delta, unusual_modes = import_git_tree(repo.texts,
364
mapping, "", "", (base_tree, o.tree), base_inv,
362
mapping, "", "", (base_tree, o.tree), base_inv,
365
363
None, rev.revision_id, [p.inventory for p in parent_trees],
366
364
lookup_object, (base_mode, stat.S_IFDIR), store_updater,
367
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)
376
375
basis_id = NULL_REVISION
378
377
rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
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()
378
inv_delta, rev.revision_id, rev.parent_ids,
393
380
ret_tree = RevisionTree(repo, inv, rev.revision_id)
394
381
trees_cache.add(ret_tree)
395
382
repo.add_revision(rev.revision_id, rev)
430
417
if isinstance(o, Commit):
431
rev, roundtrip_revid, verifiers = mapping.import_commit(o,
433
if (repo.has_revision(rev.revision_id) or
434
(roundtrip_revid and repo.has_revision(roundtrip_revid))):
418
rev = mapping.import_commit(o, lambda x: None)
419
if repo.has_revision(rev.revision_id):
436
421
graph.append((o.id, o.parents))
437
422
heads.extend([p for p in o.parents if p not in checked])
495
480
"""Base InterRepository that copies revisions from a Git into a non-Git
498
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
499
"""Fetch objects from a remote server.
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
507
raise NotImplementedError(self.fetch_objects)
509
483
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
510
484
mapping=None, fetch_spec=None):
511
485
if mapping is None:
516
490
interesting_heads = fetch_spec.heads
518
492
interesting_heads = None
519
494
def determine_wants(refs):
520
496
if interesting_heads is None:
521
497
ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
523
499
ret = [self.source.lookup_bzr_revision_id(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]
524
500
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)
501
(pack_hint, _) = self.fetch_objects(determine_wants, mapping, pb)
526
502
if pack_hint is not None and self.target._format.pack_compresses:
527
503
self.target.pack(hint=pack_hint)
531
507
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
539
515
pb.update(text, 0, 0)
542
class DetermineWantsRecorder(object):
544
def __init__(self, actual):
547
self.remote_refs = {}
549
def __call__(self, refs):
550
self.remote_refs = refs
551
self.wants = self.actual(refs)
555
518
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
556
519
"""InterRepository that copies revisions from a remote Git into a non-Git
565
528
return set(all_revs) - all_parents
567
530
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
568
"""See `InterGitNonGitRepository`."""
569
531
def progress(text):
570
532
report_git_progress(pb, text)
571
533
store = BazaarObjectStore(self.target, mapping)
574
536
heads = self.get_target_heads()
575
537
graph_walker = store.get_graph_walker(
576
538
[store._lookup_revision_sha1(head) for head in heads])
577
wants_recorder = DetermineWantsRecorder(determine_wants)
541
def record_determine_wants(heads):
542
wants = determine_wants(heads)
543
recorded_wants.extend(wants)
581
548
create_pb = pb = ui.ui_factory.nested_progress_bar()
583
objects_iter = self.source.fetch_objects(
584
wants_recorder, graph_walker, store.get_raw,
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)
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)
591
556
create_pb.finished()
608
573
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)
576
wants = determine_wants(self.source._git.get_refs())
614
579
create_pb = pb = ui.ui_factory.nested_progress_bar()
617
582
self.target.lock_write()
619
(pack_hint, last_rev) = import_git_objects(self.target, mapping,
584
return import_git_objects(self.target, mapping,
620
585
self.source._git.object_store,
621
586
target_git_object_retriever, wants, pb, limit)
622
return (pack_hint, last_rev, remote_refs)
624
588
self.target.unlock()
644
608
graphwalker = self.target._git.get_graph_walker()
645
609
if (isinstance(self.source, LocalGitRepository) and
646
610
isinstance(self.target, LocalGitRepository)):
647
refs = self.source._git.fetch(self.target._git, determine_wants,
611
return self.source._git.fetch(self.target._git, determine_wants,
649
return (None, None, refs)
650
613
elif (isinstance(self.source, LocalGitRepository) and
651
614
isinstance(self.target, RemoteGitRepository)):
652
615
raise NotImplementedError
654
617
isinstance(self.target, LocalGitRepository)):
655
618
f, commit = self.target._git.object_store.add_thin_pack()
657
refs = self.source.bzrdir.root_transport.fetch_pack(
658
determine_wants, graphwalker, f.write, progress)
620
refs = self.source._git.fetch_pack(determine_wants,
621
graphwalker, f.write, progress)
660
return (None, None, refs)
679
642
determine_wants = r.object_store.determine_wants_all
681
644
determine_wants = lambda x: [y for y in args if not y in r.object_store]
682
self.fetch_objects(determine_wants, mapping)
645
return self.fetch_objects(determine_wants, mapping)[0]
685
648
def is_compatible(source, target):