92
95
:param blob: A git blob
93
96
:return: Inventory delta for this file
98
if mapping.is_control_file(path):
95
100
if base_hexsha == hexsha and base_mode == mode:
96
101
# If nothing has changed since the base revision, we're done
98
file_id = mapping.generate_file_id(path)
103
file_id = lookup_file_id(path)
99
104
if stat.S_ISLNK(mode):
100
105
cls = InventoryLink
102
107
cls = InventoryFile
103
108
ie = cls(file_id, name.decode("utf-8"), parent_id)
104
ie.executable = mode_is_executable(mode)
109
if ie.kind == "file":
110
ie.executable = mode_is_executable(mode)
105
111
if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
106
112
base_ie = base_inv[base_inv.path2id(path)]
107
113
ie.text_size = base_ie.text_size
108
114
ie.text_sha1 = base_ie.text_sha1
109
ie.symlink_target = base_ie.symlink_target
115
if ie.kind == "symlink":
116
ie.symlink_target = base_ie.symlink_target
110
117
if ie.executable == base_ie.executable:
111
118
ie.revision = base_ie.revision
116
123
if ie.kind == "symlink":
117
124
ie.revision = None
118
125
ie.symlink_target = blob.data
122
127
ie.text_size = sum(imap(len, blob.chunked))
123
128
ie.text_sha1 = osutils.sha_strings(blob.chunked)
124
129
# Check what revision we should store
126
for pinv in parent_invs[1:]:
131
for pinv in parent_invs:
128
133
pie = pinv[file_id]
131
if pie.text_sha1 == ie.text_sha1 and pie.executable == ie.executable and pie.symlink_target == ie.symlink_target:
136
if (pie.text_sha1 == ie.text_sha1 and
137
pie.executable == ie.executable and
138
pie.symlink_target == ie.symlink_target):
132
139
# found a revision in one of the parents to use
133
140
ie.revision = pie.revision
135
parent_keys.append((file_id, pie.revision))
142
parent_key = (file_id, pie.revision)
143
if not parent_key in parent_keys:
144
parent_keys.append(parent_key)
136
145
if ie.revision is None:
137
146
# Need to store a new revision
138
147
ie.revision = revision_id
143
152
chunks = blob.chunked
144
texts.insert_record_stream([ChunkedContentFactory((file_id, ie.revision), tuple(parent_keys), ie.text_sha1, chunks)])
153
texts.insert_record_stream([
154
ChunkedContentFactory((file_id, ie.revision),
155
tuple(parent_keys), ie.text_sha1, chunks)])
146
157
if base_hexsha is not None:
147
old_path = path # Renames are not supported yet
158
old_path = path.decode("utf-8") # Renames are not supported yet
148
159
if stat.S_ISDIR(base_mode):
149
160
invdelta.extend(remove_disappeared_children(base_inv, old_path,
150
161
lookup_object(base_hexsha), [], lookup_object))
153
invdelta.append((old_path, path, file_id, ie))
164
new_path = path.decode("utf-8")
165
invdelta.append((old_path, new_path, file_id, ie))
154
166
if base_hexsha != hexsha:
155
store_updater.add_object(blob, ie)
167
store_updater.add_object(blob, ie, path)
164
176
def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),
165
177
base_inv, parent_id, revision_id, parent_invs, lookup_object,
166
(base_mode, mode), store_updater):
178
(base_mode, mode), store_updater, lookup_file_id):
167
179
if base_hexsha == hexsha and base_mode == mode:
169
file_id = mapping.generate_file_id(path)
181
file_id = lookup_file_id(path)
170
182
ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
171
183
ie.revision = revision_id
172
184
if base_hexsha is None:
176
188
ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
177
texts.insert_record_stream([ChunkedContentFactory((file_id, ie.revision), (), None, [])])
189
texts.insert_record_stream([
190
ChunkedContentFactory((file_id, ie.revision), (), None, [])])
178
191
invdelta = [(oldpath, path, file_id, ie)]
179
192
return invdelta, {}
182
195
def remove_disappeared_children(base_inv, path, base_tree, existing_children,
197
"""Generate an inventory delta for removed children.
199
:param base_inv: Base inventory against which to generate the
201
:param path: Path to process (unicode)
202
:param base_tree: Git Tree base object
203
:param existing_children: Children that still exist
204
:param lookup_object: Lookup a git object by its SHA1
205
:return: Inventory delta, as list
207
assert type(path) is unicode
185
209
for name, mode, hexsha in base_tree.iteritems():
186
210
if name in existing_children:
188
212
c_path = posixpath.join(path, name.decode("utf-8"))
189
ret.append((c_path, None, base_inv.path2id(c_path), None))
213
file_id = base_inv.path2id(c_path)
214
assert file_id is not None
215
ret.append((c_path, None, file_id, None))
190
216
if stat.S_ISDIR(mode):
191
217
ret.extend(remove_disappeared_children(
192
218
base_inv, c_path, lookup_object(hexsha), [], lookup_object))
196
222
def import_git_tree(texts, mapping, path, name, (base_hexsha, hexsha),
197
223
base_inv, parent_id, revision_id, parent_invs,
198
lookup_object, (base_mode, mode), store_updater, allow_submodules=False):
224
lookup_object, (base_mode, mode), store_updater,
225
lookup_file_id, allow_submodules=False):
199
226
"""Import a git tree object into a bzr repository.
201
228
:param texts: VersionedFiles object to add to
202
:param path: Path in the tree
229
:param path: Path in the tree (str)
230
:param name: Name of the tree (str)
203
231
:param tree: A git tree object
204
232
:param base_inv: Base inventory against which to return inventory delta
205
233
:return: Inventory delta for this subtree
235
assert type(path) is str
236
assert type(name) is str
207
237
if base_hexsha == hexsha and base_mode == mode:
208
238
# If nothing has changed since the base revision, we're done
211
file_id = mapping.generate_file_id(path)
241
file_id = lookup_file_id(path)
212
242
# We just have to hope this is indeed utf-8:
213
243
ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
214
244
tree = lookup_object(hexsha)
217
247
old_path = None # Newly appeared here
219
249
base_tree = lookup_object(base_hexsha)
220
old_path = path # Renames aren't supported yet
250
old_path = path.decode("utf-8") # Renames aren't supported yet
251
new_path = path.decode("utf-8")
221
252
if base_tree is None or type(base_tree) is not Tree:
222
253
ie.revision = revision_id
223
invdelta.append((old_path, path, ie.file_id, ie))
224
texts.insert_record_stream([ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
254
invdelta.append((old_path, new_path, ie.file_id, ie))
255
texts.insert_record_stream([
256
ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
225
257
# Remember for next time
226
258
existing_children = set()
238
270
child_base_hexsha = None
239
271
child_base_mode = 0
240
272
if stat.S_ISDIR(child_mode):
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)
273
subinvdelta, grandchildmodes = import_git_tree(texts, mapping,
274
child_path, name, (child_base_hexsha, child_hexsha), base_inv,
275
file_id, revision_id, parent_invs, lookup_object,
276
(child_base_mode, child_mode), store_updater, lookup_file_id,
277
allow_submodules=allow_submodules)
247
278
elif S_ISGITLINK(child_mode): # submodule
248
279
if not allow_submodules:
249
280
raise SubmodulesRequireSubtrees()
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)
281
subinvdelta, grandchildmodes = import_git_submodule(texts, mapping,
282
child_path, name, (child_base_hexsha, child_hexsha), base_inv,
283
file_id, revision_id, parent_invs, lookup_object,
284
(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)
286
subinvdelta = import_git_blob(texts, mapping, child_path, name,
287
(child_base_hexsha, child_hexsha), base_inv, file_id,
288
revision_id, parent_invs, lookup_object,
289
(child_base_mode, child_mode), store_updater, lookup_file_id)
260
290
grandchildmodes = {}
261
291
child_modes.update(grandchildmodes)
262
292
invdelta.extend(subinvdelta)
265
295
child_modes[child_path] = child_mode
266
296
# Remove any children that have disappeared
267
297
if base_tree is not None and type(base_tree) is Tree:
268
invdelta.extend(remove_disappeared_children(base_inv, old_path,
298
invdelta.extend(remove_disappeared_children(base_inv, old_path,
269
299
base_tree, existing_children, lookup_object))
270
store_updater.add_object(tree, ie)
300
store_updater.add_object(tree, ie, path)
271
301
return invdelta, child_modes
304
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
305
o, rev, ret_tree, parent_trees, mapping, unusual_modes):
306
new_unusual_modes = mapping.export_unusual_file_modes(rev)
307
if new_unusual_modes != unusual_modes:
308
raise AssertionError("unusual modes don't match: %r != %r" % (
309
unusual_modes, new_unusual_modes))
310
# Verify that we can reconstruct the commit properly
311
rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True)
313
raise AssertionError("Reconstructed commit differs: %r != %r" % (
317
for path, obj, ie in _tree_to_objects(ret_tree, parent_trees,
318
target_git_object_retriever._cache.idmap, unusual_modes, mapping.BZR_DUMMY_FILE):
319
old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
321
if obj.id != old_obj_id:
322
diff.append((path, lookup_object(old_obj_id), obj))
323
for (path, old_obj, new_obj) in diff:
324
while (old_obj.type_name == "tree" and
325
new_obj.type_name == "tree" and
326
sorted(old_obj) == sorted(new_obj)):
328
if old_obj[name][0] != new_obj[name][0]:
329
raise AssertionError("Modes for %s differ: %o != %o" %
330
(path, old_obj[name][0], new_obj[name][0]))
331
if old_obj[name][1] != new_obj[name][1]:
332
# Found a differing child, delve deeper
333
path = posixpath.join(path, name)
334
old_obj = lookup_object(old_obj[name][1])
335
new_obj = new_objs[path]
337
raise AssertionError("objects differ for %s: %r != %r" % (path,
274
341
def import_git_commit(repo, mapping, head, lookup_object,
275
target_git_object_retriever, parent_invs_cache):
342
target_git_object_retriever, trees_cache):
276
343
o = lookup_object(head)
277
rev = mapping.import_commit(o)
344
rev = mapping.import_commit(o,
345
lambda x: target_git_object_retriever.lookup_git_sha(x)[1][0])
278
346
# We have to do this here, since we have to walk the tree and
279
347
# we need to make sure to import the blobs / trees with the right
280
348
# path; this may involve adding them more than once.
281
parent_invs = parent_invs_cache.get_inventories(rev.parent_ids)
282
if parent_invs == []:
349
parent_trees = trees_cache.revision_trees(rev.parent_ids)
350
if parent_trees == []:
283
351
base_inv = Inventory(root_id=None)
287
base_inv = parent_invs[0]
355
base_inv = parent_trees[0].inventory
288
356
base_tree = lookup_object(o.parents[0]).tree
289
357
base_mode = stat.S_IFDIR
290
358
store_updater = target_git_object_retriever._get_updater(rev)
291
store_updater.add_object(o, None)
359
store_updater.add_object(o, None, None)
360
fileid_map = mapping.get_fileid_map(lookup_object, o.tree)
292
361
inv_delta, unusual_modes = import_git_tree(repo.texts,
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,
362
mapping, "", "", (base_tree, o.tree), base_inv,
363
None, rev.revision_id, [p.inventory for p in parent_trees],
364
lookup_object, (base_mode, stat.S_IFDIR), store_updater,
365
fileid_map.lookup_file_id,
296
366
allow_submodules=getattr(repo._format, "supports_tree_reference", False))
297
367
store_updater.finish()
298
368
if unusual_modes != {}:
305
375
basis_id = NULL_REVISION
307
377
rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
308
inv_delta, rev.revision_id, rev.parent_ids,
310
parent_invs_cache.add(rev.revision_id, inv)
378
inv_delta, rev.revision_id, rev.parent_ids, base_inv)
379
ret_tree = RevisionTree(repo, inv, rev.revision_id)
380
trees_cache.add(ret_tree)
311
381
repo.add_revision(rev.revision_id, rev)
312
382
if "verify" in debug.debug_flags:
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))
383
verify_commit_reconstruction(target_git_object_retriever,
384
lookup_object, o, rev, ret_tree, parent_trees, mapping,
327
388
def import_git_objects(repo, mapping, object_iter,
415
474
"""See InterRepository.copy_content."""
416
475
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)
424
478
class InterGitNonGitRepository(InterGitRepository):
425
479
"""Base InterRepository that copies revisions from a Git into a non-Git
428
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
482
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
429
483
mapping=None, fetch_spec=None):
430
484
if mapping is None:
431
485
mapping = self.source.get_mapping()
441
495
if interesting_heads is None:
442
496
ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
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))]
498
ret = [self.source.lookup_bzr_revision_id(revid)[0] for revid in interesting_heads if revid not in (None, NULL_REVISION)]
499
return [rev for rev in ret if not self.target.has_revision(self.source.lookup_foreign_revision_id(rev))]
446
500
(pack_hint, _) = self.fetch_objects(determine_wants, mapping, pb)
447
501
if pack_hint is not None and self.target._format.pack_compresses:
448
502
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)
454
503
return self._refs