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)
202
198
:param base_inv: Base inventory against which to generate the
204
:param path: Path to process (unicode)
200
:param path: Path to process
205
201
:param base_tree: Git Tree base object
206
202
:param existing_children: Children that still exist
207
203
:param lookup_object: Lookup a git object by its SHA1
208
204
:return: Inventory delta, as list
210
assert type(path) is unicode
212
207
for name, mode, hexsha in base_tree.iteritems():
213
208
if name in existing_children:
229
224
"""Import a git tree object into a bzr repository.
231
226
:param texts: VersionedFiles object to add to
232
:param path: Path in the tree (str)
233
:param name: Name of the tree (str)
227
:param path: Path in the tree
234
228
:param tree: A git tree object
235
229
:param base_inv: Base inventory against which to return inventory delta
236
230
:return: Inventory delta for this subtree
238
assert type(path) is str
239
assert type(name) is str
240
232
if base_hexsha == hexsha and base_mode == mode:
241
233
# If nothing has changed since the base revision, we're done
250
242
old_path = None # Newly appeared here
252
244
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")
245
old_path = path # Renames aren't supported yet
255
246
if base_tree is None or type(base_tree) is not Tree:
256
247
ie.revision = revision_id
257
invdelta.append((old_path, new_path, ie.file_id, ie))
248
invdelta.append((old_path, path, ie.file_id, ie))
258
249
texts.insert_record_stream([
259
250
ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
260
251
# Remember for next time
298
289
child_modes[child_path] = child_mode
299
290
# Remove any children that have disappeared
300
291
if base_tree is not None and type(base_tree) is Tree:
301
invdelta.extend(remove_disappeared_children(base_inv, old_path,
292
invdelta.extend(remove_disappeared_children(base_inv, old_path,
302
293
base_tree, existing_children, lookup_object))
303
store_updater.add_object(tree, ie, path)
294
store_updater.add_object(tree, ie)
304
295
return invdelta, child_modes
344
335
def import_git_commit(repo, mapping, head, lookup_object,
345
336
target_git_object_retriever, trees_cache):
346
337
o = lookup_object(head)
347
rev, roundtrip_revid, verifiers = mapping.import_commit(o,
338
rev = mapping.import_commit(o,
348
339
lambda x: target_git_object_retriever.lookup_git_sha(x)[1][0])
349
340
# We have to do this here, since we have to walk the tree and
350
341
# we need to make sure to import the blobs / trees with the right
359
350
base_tree = lookup_object(o.parents[0]).tree
360
351
base_mode = stat.S_IFDIR
361
352
store_updater = target_git_object_retriever._get_updater(rev)
362
fileid_map = mapping.get_fileid_map(lookup_object, o.tree)
353
store_updater.add_object(o, None)
354
lookup_file_id = mapping.get_fileid_map(lookup_object, o.tree).lookup_file_id
363
355
inv_delta, unusual_modes = import_git_tree(repo.texts,
364
mapping, "", "", (base_tree, o.tree), base_inv,
356
mapping, "", u"", (base_tree, o.tree), base_inv,
365
357
None, rev.revision_id, [p.inventory for p in parent_trees],
366
358
lookup_object, (base_mode, stat.S_IFDIR), store_updater,
367
fileid_map.lookup_file_id,
368
360
allow_submodules=getattr(repo._format, "supports_tree_reference", False))
361
store_updater.finish()
369
362
if unusual_modes != {}:
370
363
for path, mode in unusual_modes.iteritems():
371
364
warn_unusual_mode(rev.foreign_revid, path, mode)
376
369
basis_id = NULL_REVISION
378
371
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()
372
inv_delta, rev.revision_id, rev.parent_ids,
393
374
ret_tree = RevisionTree(repo, inv, rev.revision_id)
394
375
trees_cache.add(ret_tree)
395
376
repo.add_revision(rev.revision_id, rev)
430
411
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))):
412
rev = mapping.import_commit(o, lambda x: None)
413
if repo.has_revision(rev.revision_id):
436
415
graph.append((o.id, o.parents))
437
416
heads.extend([p for p in o.parents if p not in checked])
490
469
"""See InterRepository.copy_content."""
491
470
self.fetch(revision_id, pb, find_ghosts=False)
472
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
473
mapping=None, fetch_spec=None):
474
self.fetch_refs(revision_id=revision_id, pb=pb,
475
find_ghosts=find_ghosts, mapping=mapping, fetch_spec=fetch_spec)
494
478
class InterGitNonGitRepository(InterGitRepository):
495
479
"""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,
482
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
510
483
mapping=None, fetch_spec=None):
511
484
if mapping is None:
512
485
mapping = self.source.get_mapping()
516
489
interesting_heads = fetch_spec.heads
518
491
interesting_heads = None
519
493
def determine_wants(refs):
520
495
if interesting_heads is None:
521
496
ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
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)
531
506
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
539
514
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
517
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
556
518
"""InterRepository that copies revisions from a remote Git into a non-Git
565
527
return set(all_revs) - all_parents
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)
540
def record_determine_wants(heads):
541
wants = determine_wants(heads)
542
recorded_wants.extend(wants)
581
547
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)
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)
591
555
create_pb.finished()
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)
575
wants = determine_wants(self.source._git.get_refs())
614
578
create_pb = pb = ui.ui_factory.nested_progress_bar()
617
581
self.target.lock_write()
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)
624
587
self.target.unlock()
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,
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()
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)
660
return (None, None, refs)
665
627
raise AssertionError
667
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
629
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
668
630
mapping=None, fetch_spec=None, branches=None):
669
631
if mapping is None:
670
632
mapping = self.source.get_mapping()
679
641
determine_wants = r.object_store.determine_wants_all
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]
685
648
def is_compatible(source, target):