98
92
:param blob: A git blob
99
93
:return: Inventory delta for this file
101
if mapping.is_control_file(path):
103
95
if base_hexsha == hexsha and base_mode == mode:
104
96
# If nothing has changed since the base revision, we're done
106
file_id = lookup_file_id(path)
98
file_id = mapping.generate_file_id(path)
107
99
if stat.S_ISLNK(mode):
108
100
cls = InventoryLink
110
102
cls = InventoryFile
111
103
ie = cls(file_id, name.decode("utf-8"), parent_id)
112
if ie.kind == "file":
113
ie.executable = mode_is_executable(mode)
104
ie.executable = mode_is_executable(mode)
114
105
if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
115
106
base_ie = base_inv[base_inv.path2id(path)]
116
107
ie.text_size = base_ie.text_size
117
108
ie.text_sha1 = base_ie.text_sha1
118
if ie.kind == "symlink":
119
ie.symlink_target = base_ie.symlink_target
109
ie.symlink_target = base_ie.symlink_target
120
110
if ie.executable == base_ie.executable:
121
111
ie.revision = base_ie.revision
126
116
if ie.kind == "symlink":
127
117
ie.revision = None
128
118
ie.symlink_target = blob.data
130
122
ie.text_size = sum(imap(len, blob.chunked))
131
123
ie.text_sha1 = osutils.sha_strings(blob.chunked)
132
124
# Check what revision we should store
134
for pinv in parent_invs:
126
for pinv in parent_invs[1:]:
136
128
pie = pinv[file_id]
139
if (pie.text_sha1 == ie.text_sha1 and
140
pie.executable == ie.executable and
141
pie.symlink_target == ie.symlink_target):
131
if pie.text_sha1 == ie.text_sha1 and pie.executable == ie.executable and pie.symlink_target == ie.symlink_target:
142
132
# found a revision in one of the parents to use
143
133
ie.revision = pie.revision
145
parent_key = (file_id, pie.revision)
146
if not parent_key in parent_keys:
147
parent_keys.append(parent_key)
135
parent_keys.append((file_id, pie.revision))
148
136
if ie.revision is None:
149
137
# Need to store a new revision
150
138
ie.revision = revision_id
155
143
chunks = blob.chunked
156
texts.insert_record_stream([
157
ChunkedContentFactory((file_id, ie.revision),
158
tuple(parent_keys), ie.text_sha1, chunks)])
144
texts.insert_record_stream([ChunkedContentFactory((file_id, ie.revision), tuple(parent_keys), ie.text_sha1, chunks)])
160
146
if base_hexsha is not None:
161
old_path = path.decode("utf-8") # Renames are not supported yet
147
old_path = path # Renames are not supported yet
162
148
if stat.S_ISDIR(base_mode):
163
149
invdelta.extend(remove_disappeared_children(base_inv, old_path,
164
150
lookup_object(base_hexsha), [], lookup_object))
167
new_path = path.decode("utf-8")
168
invdelta.append((old_path, new_path, file_id, ie))
153
invdelta.append((old_path, path, file_id, ie))
169
154
if base_hexsha != hexsha:
170
store_updater.add_object(blob, ie, path)
155
store_updater.add_object(blob, ie)
179
164
def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),
180
165
base_inv, parent_id, revision_id, parent_invs, lookup_object,
181
(base_mode, mode), store_updater, lookup_file_id):
166
(base_mode, mode), store_updater):
182
167
if base_hexsha == hexsha and base_mode == mode:
184
file_id = lookup_file_id(path)
169
file_id = mapping.generate_file_id(path)
185
170
ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
186
171
ie.revision = revision_id
187
172
if base_hexsha is None:
191
176
ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
192
texts.insert_record_stream([
193
ChunkedContentFactory((file_id, ie.revision), (), None, [])])
177
texts.insert_record_stream([ChunkedContentFactory((file_id, ie.revision), (), None, [])])
194
178
invdelta = [(oldpath, path, file_id, ie)]
195
179
return invdelta, {}
198
182
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
185
for name, mode, hexsha in base_tree.iteritems():
213
186
if name in existing_children:
215
188
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))
189
ret.append((c_path, None, base_inv.path2id(c_path), None))
219
190
if stat.S_ISDIR(mode):
220
191
ret.extend(remove_disappeared_children(
221
192
base_inv, c_path, lookup_object(hexsha), [], lookup_object))
225
196
def import_git_tree(texts, mapping, path, name, (base_hexsha, hexsha),
226
197
base_inv, parent_id, revision_id, parent_invs,
227
lookup_object, (base_mode, mode), store_updater,
228
lookup_file_id, allow_submodules=False):
198
lookup_object, (base_mode, mode), store_updater, allow_submodules=False):
229
199
"""Import a git tree object into a bzr repository.
231
201
:param texts: VersionedFiles object to add to
232
:param path: Path in the tree (str)
233
:param name: Name of the tree (str)
202
:param path: Path in the tree
234
203
:param tree: A git tree object
235
204
:param base_inv: Base inventory against which to return inventory delta
236
205
:return: Inventory delta for this subtree
238
assert type(path) is str
239
assert type(name) is str
240
207
if base_hexsha == hexsha and base_mode == mode:
241
208
# If nothing has changed since the base revision, we're done
244
file_id = lookup_file_id(path)
211
file_id = mapping.generate_file_id(path)
245
212
# We just have to hope this is indeed utf-8:
246
213
ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
247
214
tree = lookup_object(hexsha)
250
217
old_path = None # Newly appeared here
252
219
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")
220
old_path = path # Renames aren't supported yet
255
221
if base_tree is None or type(base_tree) is not Tree:
256
222
ie.revision = revision_id
257
invdelta.append((old_path, new_path, ie.file_id, ie))
258
texts.insert_record_stream([
259
ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
223
invdelta.append((old_path, path, ie.file_id, ie))
224
texts.insert_record_stream([ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
260
225
# Remember for next time
261
226
existing_children = set()
273
238
child_base_hexsha = None
274
239
child_base_mode = 0
275
240
if stat.S_ISDIR(child_mode):
276
subinvdelta, grandchildmodes = import_git_tree(texts, mapping,
277
child_path, name, (child_base_hexsha, child_hexsha), base_inv,
278
file_id, revision_id, parent_invs, lookup_object,
279
(child_base_mode, child_mode), store_updater, lookup_file_id,
280
allow_submodules=allow_submodules)
241
subinvdelta, grandchildmodes = import_git_tree(
242
texts, mapping, child_path, name,
243
(child_base_hexsha, child_hexsha),
244
base_inv, file_id, revision_id, parent_invs, lookup_object,
245
(child_base_mode, child_mode), store_updater,
246
allow_submodules=allow_submodules)
281
247
elif S_ISGITLINK(child_mode): # submodule
282
248
if not allow_submodules:
283
249
raise SubmodulesRequireSubtrees()
284
subinvdelta, grandchildmodes = import_git_submodule(texts, mapping,
285
child_path, name, (child_base_hexsha, child_hexsha), base_inv,
286
file_id, revision_id, parent_invs, lookup_object,
287
(child_base_mode, child_mode), store_updater, lookup_file_id)
250
subinvdelta, grandchildmodes = import_git_submodule(
251
texts, mapping, child_path, name,
252
(child_base_hexsha, child_hexsha),
253
base_inv, file_id, revision_id, parent_invs, lookup_object,
254
(child_base_mode, child_mode), store_updater)
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)
256
subinvdelta = import_git_blob(texts, mapping,
257
child_path, name, (child_base_hexsha, child_hexsha),
258
base_inv, file_id, revision_id, parent_invs, lookup_object,
259
(child_base_mode, child_mode), store_updater)
293
260
grandchildmodes = {}
294
261
child_modes.update(grandchildmodes)
295
262
invdelta.extend(subinvdelta)
298
265
child_modes[child_path] = child_mode
299
266
# Remove any children that have disappeared
300
267
if base_tree is not None and type(base_tree) is Tree:
301
invdelta.extend(remove_disappeared_children(base_inv, old_path,
268
invdelta.extend(remove_disappeared_children(base_inv, old_path,
302
269
base_tree, existing_children, lookup_object))
303
store_updater.add_object(tree, ie, path)
270
store_updater.add_object(tree, ie)
304
271
return invdelta, child_modes
307
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
308
o, rev, ret_tree, parent_trees, mapping, unusual_modes):
309
new_unusual_modes = mapping.export_unusual_file_modes(rev)
310
if new_unusual_modes != unusual_modes:
311
raise AssertionError("unusual modes don't match: %r != %r" % (
312
unusual_modes, new_unusual_modes))
313
# Verify that we can reconstruct the commit properly
314
rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True)
316
raise AssertionError("Reconstructed commit differs: %r != %r" % (
320
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):
322
old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
324
if obj.id != old_obj_id:
325
diff.append((path, lookup_object(old_obj_id), obj))
326
for (path, old_obj, new_obj) in diff:
327
while (old_obj.type_name == "tree" and
328
new_obj.type_name == "tree" and
329
sorted(old_obj) == sorted(new_obj)):
331
if old_obj[name][0] != new_obj[name][0]:
332
raise AssertionError("Modes for %s differ: %o != %o" %
333
(path, old_obj[name][0], new_obj[name][0]))
334
if old_obj[name][1] != new_obj[name][1]:
335
# Found a differing child, delve deeper
336
path = posixpath.join(path, name)
337
old_obj = lookup_object(old_obj[name][1])
338
new_obj = new_objs[path]
340
raise AssertionError("objects differ for %s: %r != %r" % (path,
344
274
def import_git_commit(repo, mapping, head, lookup_object,
345
target_git_object_retriever, trees_cache):
275
target_git_object_retriever, parent_invs_cache):
346
276
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])
277
rev = mapping.import_commit(o)
349
278
# We have to do this here, since we have to walk the tree and
350
279
# we need to make sure to import the blobs / trees with the right
351
280
# path; this may involve adding them more than once.
352
parent_trees = trees_cache.revision_trees(rev.parent_ids)
353
if parent_trees == []:
281
parent_invs = parent_invs_cache.get_inventories(rev.parent_ids)
282
if parent_invs == []:
354
283
base_inv = Inventory(root_id=None)
358
base_inv = parent_trees[0].inventory
287
base_inv = parent_invs[0]
359
288
base_tree = lookup_object(o.parents[0]).tree
360
289
base_mode = stat.S_IFDIR
361
290
store_updater = target_git_object_retriever._get_updater(rev)
362
fileid_map = mapping.get_fileid_map(lookup_object, o.tree)
291
store_updater.add_object(o, None)
363
292
inv_delta, unusual_modes = import_git_tree(repo.texts,
364
mapping, "", "", (base_tree, o.tree), base_inv,
365
None, rev.revision_id, [p.inventory for p in parent_trees],
366
lookup_object, (base_mode, stat.S_IFDIR), store_updater,
367
fileid_map.lookup_file_id,
293
mapping, "", u"", (base_tree, o.tree), base_inv,
294
None, rev.revision_id, parent_invs, lookup_object,
295
(base_mode, stat.S_IFDIR), store_updater,
368
296
allow_submodules=getattr(repo._format, "supports_tree_reference", False))
297
store_updater.finish()
369
298
if unusual_modes != {}:
370
299
for path, mode in unusual_modes.iteritems():
371
300
warn_unusual_mode(rev.foreign_revid, path, mode)
376
305
basis_id = NULL_REVISION
378
307
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()
393
ret_tree = RevisionTree(repo, inv, rev.revision_id)
394
trees_cache.add(ret_tree)
308
inv_delta, rev.revision_id, rev.parent_ids,
310
parent_invs_cache.add(rev.revision_id, inv)
395
311
repo.add_revision(rev.revision_id, rev)
396
312
if "verify" in debug.debug_flags:
397
verify_commit_reconstruction(target_git_object_retriever,
398
lookup_object, o, rev, ret_tree, parent_trees, mapping,
313
new_unusual_modes = mapping.export_unusual_file_modes(rev)
314
if new_unusual_modes != unusual_modes:
315
raise AssertionError("unusual modes don't match: %r != %r" % (unusual_modes, new_unusual_modes))
316
objs = inventory_to_tree_and_blobs(inv, repo.texts, mapping, unusual_modes)
317
for newsha1, newobj, path in objs:
318
assert path is not None
322
(oldmode, oldsha1) = tree_lookup_path(lookup_object, o.tree, path)
323
if oldsha1 != newsha1:
324
raise AssertionError("%r != %r in %s" % (oldsha1, newsha1, path))
402
327
def import_git_objects(repo, mapping, object_iter,
490
415
"""See InterRepository.copy_content."""
491
416
self.fetch(revision_id, pb, find_ghosts=False)
418
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
419
mapping=None, fetch_spec=None):
420
self.fetch_refs(revision_id=revision_id, pb=pb,
421
find_ghosts=find_ghosts, mapping=mapping, fetch_spec=fetch_spec)
494
424
class InterGitNonGitRepository(InterGitRepository):
495
425
"""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,
428
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
510
429
mapping=None, fetch_spec=None):
511
430
if mapping is None:
512
431
mapping = self.source.get_mapping()
516
435
interesting_heads = fetch_spec.heads
518
437
interesting_heads = None
519
439
def determine_wants(refs):
520
441
if interesting_heads is None:
521
442
ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
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)
444
ret = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]
445
return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))]
446
(pack_hint, _) = self.fetch_objects(determine_wants, mapping, pb)
526
447
if pack_hint is not None and self.target._format.pack_compresses:
527
448
self.target.pack(hint=pack_hint)
449
if interesting_heads is not None:
450
present_interesting_heads = self.target.has_revisions(interesting_heads)
451
missing_interesting_heads = set(interesting_heads) - present_interesting_heads
452
if missing_interesting_heads:
453
raise AssertionError("Missing interesting heads: %r" % missing_interesting_heads)
531
457
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
574
486
heads = self.get_target_heads()
575
487
graph_walker = store.get_graph_walker(
576
488
[store._lookup_revision_sha1(head) for head in heads])
577
wants_recorder = DetermineWantsRecorder(determine_wants)
491
def record_determine_wants(heads):
492
wants = determine_wants(heads)
493
recorded_wants.extend(wants)
581
498
create_pb = pb = ui.ui_factory.nested_progress_bar()
583
500
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)
501
record_determine_wants, graph_walker,
502
store.get_raw, progress)
503
return import_git_objects(self.target, mapping,
504
objects_iter, store, recorded_wants, pb, limit)
591
507
create_pb.finished()
654
568
isinstance(self.target, LocalGitRepository)):
655
569
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)
571
refs = self.source._git.fetch_pack(determine_wants,
572
graphwalker, f.write, progress)
660
return (None, None, refs)
665
579
raise AssertionError
667
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
581
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
668
582
mapping=None, fetch_spec=None, branches=None):
669
583
if mapping is None:
670
584
mapping = self.source.get_mapping()