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
158
155
tuple(parent_keys), ie.text_sha1, chunks)])
160
157
if base_hexsha is not None:
161
old_path = path.decode("utf-8") # Renames are not supported yet
158
old_path = path # Renames are not supported yet
162
159
if stat.S_ISDIR(base_mode):
163
160
invdelta.extend(remove_disappeared_children(base_inv, old_path,
164
161
lookup_object(base_hexsha), [], lookup_object))
167
new_path = path.decode("utf-8")
168
invdelta.append((old_path, new_path, file_id, ie))
164
invdelta.append((old_path, path, file_id, ie))
169
165
if base_hexsha != hexsha:
170
store_updater.add_object(blob, ie, path)
166
store_updater.add_object(blob, ie)
198
194
def remove_disappeared_children(base_inv, path, base_tree, existing_children,
200
"""Generate an inventory delta for removed children.
202
:param base_inv: Base inventory against which to generate the
204
:param path: Path to process (unicode)
205
:param base_tree: Git Tree base object
206
:param existing_children: Children that still exist
207
:param lookup_object: Lookup a git object by its SHA1
208
:return: Inventory delta, as list
210
assert type(path) is unicode
212
197
for name, mode, hexsha in base_tree.iteritems():
213
198
if name in existing_children:
215
200
c_path = posixpath.join(path, name.decode("utf-8"))
216
file_id = base_inv.path2id(c_path)
217
assert file_id is not None
218
ret.append((c_path, None, file_id, None))
201
ret.append((c_path, None, base_inv.path2id(c_path), None))
219
202
if stat.S_ISDIR(mode):
220
203
ret.extend(remove_disappeared_children(
221
204
base_inv, c_path, lookup_object(hexsha), [], lookup_object))
229
212
"""Import a git tree object into a bzr repository.
231
214
:param texts: VersionedFiles object to add to
232
:param path: Path in the tree (str)
233
:param name: Name of the tree (str)
215
:param path: Path in the tree
234
216
:param tree: A git tree object
235
217
:param base_inv: Base inventory against which to return inventory delta
236
218
:return: Inventory delta for this subtree
238
assert type(path) is str
239
assert type(name) is str
240
220
if base_hexsha == hexsha and base_mode == mode:
241
221
# If nothing has changed since the base revision, we're done
250
230
old_path = None # Newly appeared here
252
232
base_tree = lookup_object(base_hexsha)
253
old_path = path.decode("utf-8") # Renames aren't supported yet
254
new_path = path.decode("utf-8")
233
old_path = path # Renames aren't supported yet
255
234
if base_tree is None or type(base_tree) is not Tree:
256
235
ie.revision = revision_id
257
invdelta.append((old_path, new_path, ie.file_id, ie))
236
invdelta.append((old_path, path, ie.file_id, ie))
258
237
texts.insert_record_stream([
259
238
ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
260
239
# Remember for next time
298
277
child_modes[child_path] = child_mode
299
278
# Remove any children that have disappeared
300
279
if base_tree is not None and type(base_tree) is Tree:
301
invdelta.extend(remove_disappeared_children(base_inv, old_path,
280
invdelta.extend(remove_disappeared_children(base_inv, old_path,
302
281
base_tree, existing_children, lookup_object))
303
store_updater.add_object(tree, ie, path)
282
store_updater.add_object(tree, ie)
304
283
return invdelta, child_modes
311
290
raise AssertionError("unusual modes don't match: %r != %r" % (
312
291
unusual_modes, new_unusual_modes))
313
292
# Verify that we can reconstruct the commit properly
314
rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True)
293
rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree)
316
295
raise AssertionError("Reconstructed commit differs: %r != %r" % (
344
323
def import_git_commit(repo, mapping, head, lookup_object,
345
324
target_git_object_retriever, trees_cache):
346
325
o = lookup_object(head)
347
rev, roundtrip_revid, verifiers = mapping.import_commit(o,
326
rev = mapping.import_commit(o,
348
327
lambda x: target_git_object_retriever.lookup_git_sha(x)[1][0])
349
328
# We have to do this here, since we have to walk the tree and
350
329
# we need to make sure to import the blobs / trees with the right
359
338
base_tree = lookup_object(o.parents[0]).tree
360
339
base_mode = stat.S_IFDIR
361
340
store_updater = target_git_object_retriever._get_updater(rev)
362
fileid_map = mapping.get_fileid_map(lookup_object, o.tree)
341
store_updater.add_object(o, None)
342
lookup_file_id = mapping.get_fileid_map(lookup_object, o.tree).lookup_file_id
363
343
inv_delta, unusual_modes = import_git_tree(repo.texts,
364
mapping, "", "", (base_tree, o.tree), base_inv,
344
mapping, "", u"", (base_tree, o.tree), base_inv,
365
345
None, rev.revision_id, [p.inventory for p in parent_trees],
366
346
lookup_object, (base_mode, stat.S_IFDIR), store_updater,
367
fileid_map.lookup_file_id,
368
348
allow_submodules=getattr(repo._format, "supports_tree_reference", False))
349
store_updater.finish()
369
350
if unusual_modes != {}:
370
351
for path, mode in unusual_modes.iteritems():
371
352
warn_unusual_mode(rev.foreign_revid, path, mode)
376
357
basis_id = NULL_REVISION
378
359
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()
360
inv_delta, rev.revision_id, rev.parent_ids,
393
362
ret_tree = RevisionTree(repo, inv, rev.revision_id)
394
363
trees_cache.add(ret_tree)
395
364
repo.add_revision(rev.revision_id, rev)
430
399
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))):
400
rev = mapping.import_commit(o, lambda x: None)
401
if repo.has_revision(rev.revision_id):
436
403
graph.append((o.id, o.parents))
437
404
heads.extend([p for p in o.parents if p not in checked])
490
457
"""See InterRepository.copy_content."""
491
458
self.fetch(revision_id, pb, find_ghosts=False)
460
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
461
mapping=None, fetch_spec=None):
462
self.fetch_refs(revision_id=revision_id, pb=pb,
463
find_ghosts=find_ghosts, mapping=mapping, fetch_spec=fetch_spec)
494
466
class InterGitNonGitRepository(InterGitRepository):
495
467
"""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
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
470
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
510
471
mapping=None, fetch_spec=None):
511
472
if mapping is None:
512
473
mapping = self.source.get_mapping()
516
477
interesting_heads = fetch_spec.heads
518
479
interesting_heads = None
519
481
def determine_wants(refs):
520
483
if interesting_heads is None:
521
484
ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
523
486
ret = [self.source.lookup_bzr_revision_id(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]
524
487
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)
488
(pack_hint, _) = self.fetch_objects(determine_wants, mapping, pb)
526
489
if pack_hint is not None and self.target._format.pack_compresses:
527
490
self.target.pack(hint=pack_hint)
531
494
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
539
502
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
505
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
556
506
"""InterRepository that copies revisions from a remote Git into a non-Git
565
515
return set(all_revs) - all_parents
567
517
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
568
"""See `InterGitNonGitRepository`."""
569
518
def progress(text):
570
519
report_git_progress(pb, text)
571
520
store = BazaarObjectStore(self.target, mapping)
574
523
heads = self.get_target_heads()
575
524
graph_walker = store.get_graph_walker(
576
525
[store._lookup_revision_sha1(head) for head in heads])
577
wants_recorder = DetermineWantsRecorder(determine_wants)
528
def record_determine_wants(heads):
529
wants = determine_wants(heads)
530
recorded_wants.extend(wants)
581
535
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)
537
objects_iter = self.source.fetch_objects(record_determine_wants,
538
graph_walker, store.get_raw, progress)
539
return import_git_objects(self.target, mapping,
540
objects_iter, store, recorded_wants, pb, limit)
591
543
create_pb.finished()
608
560
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)
563
wants = determine_wants(self.source._git.get_refs())
614
566
create_pb = pb = ui.ui_factory.nested_progress_bar()
617
569
self.target.lock_write()
619
(pack_hint, last_rev) = import_git_objects(self.target, mapping,
571
return import_git_objects(self.target, mapping,
620
572
self.source._git.object_store,
621
573
target_git_object_retriever, wants, pb, limit)
622
return (pack_hint, last_rev, remote_refs)
624
575
self.target.unlock()
644
595
graphwalker = self.target._git.get_graph_walker()
645
596
if (isinstance(self.source, LocalGitRepository) and
646
597
isinstance(self.target, LocalGitRepository)):
647
refs = self.source._git.fetch(self.target._git, determine_wants,
598
return self.source._git.fetch(self.target._git, determine_wants,
649
return (None, None, refs)
650
600
elif (isinstance(self.source, LocalGitRepository) and
651
601
isinstance(self.target, RemoteGitRepository)):
652
602
raise NotImplementedError
654
604
isinstance(self.target, LocalGitRepository)):
655
605
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)
607
refs = self.source._git.fetch_pack(determine_wants,
608
graphwalker, f.write, progress)
660
return (None, None, refs)
665
615
raise AssertionError
667
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
617
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
668
618
mapping=None, fetch_spec=None, branches=None):
669
619
if mapping is None:
670
620
mapping = self.source.get_mapping()
679
629
determine_wants = r.object_store.determine_wants_all
681
631
determine_wants = lambda x: [y for y in args if not y in r.object_store]
682
self.fetch_objects(determine_wants, mapping)
632
return self.fetch_objects(determine_wants, mapping)[0]
685
636
def is_compatible(source, target):