14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from cStringIO import (
21
from dulwich.client import (
22
SimpleFetchGraphWalker,
24
from dulwich.objects import (
28
from dulwich.object_store import (
40
from bzrlib.errors import (
45
from bzrlib.inventory import (
51
from bzrlib.lru_cache import (
54
from bzrlib.repository import (
57
from bzrlib.revision import (
60
from bzrlib.tsort import (
63
from bzrlib.versionedfile import (
64
FulltextContentFactory,
67
from bzrlib.plugins.git.converter import (
70
from bzrlib.plugins.git.mapping import (
72
inventory_to_tree_and_blobs,
75
from bzrlib.plugins.git.remote import (
17
from bzrlib import osutils, ui, urlutils
18
from bzrlib.errors import InvalidRevisionId
19
from bzrlib.inventory import Inventory
20
from bzrlib.repository import InterRepository
21
from bzrlib.trace import info
22
from bzrlib.tsort import topo_sort
24
from bzrlib.plugins.git import git
78
25
from bzrlib.plugins.git.repository import (
30
from bzrlib.plugins.git.remote import RemoteGitRepository
32
from dulwich.objects import Commit
34
from cStringIO import StringIO
85
37
class BzrFetchGraphWalker(object):
86
"""GraphWalker implementation that uses a Bazaar repository."""
88
39
def __init__(self, repository, mapping):
89
40
self.repository = repository
115
63
self.heads.update([p for p in ps if not p in self.done])
117
65
self.done.add(ret)
118
return self.mapping.revision_id_bzr_to_foreign(ret)[0]
66
return self.mapping.revision_id_bzr_to_foreign(ret)
119
67
except InvalidRevisionId:
124
def import_git_blob(texts, mapping, path, hexsha, base_inv, parent_id,
125
revision_id, parent_invs, shagitmap, lookup_object, executable, symlink):
72
def import_git_blob(repo, mapping, path, blob, inv, parent_invs, executable):
126
73
"""Import a git blob object into a bzr repository.
128
:param texts: VersionedFiles to add to
75
:param repo: bzr repository
129
76
:param path: Path in the tree
130
77
:param blob: A git blob
131
:return: Inventory delta for this file
133
79
file_id = mapping.generate_file_id(path)
138
# We just have to hope this is indeed utf-8:
139
ie = cls(file_id, urlutils.basename(path).decode("utf-8"), parent_id)
80
text_revision = inv.revision_id
81
repo.texts.add_lines((file_id, text_revision),
82
[(file_id, p[file_id].revision) for p in parent_invs if file_id in p],
83
osutils.split_lines(blob.data))
84
ie = inv.add_path(path, "file", file_id)
85
ie.revision = text_revision
86
ie.text_size = len(blob.data)
87
ie.text_sha1 = osutils.sha_string(blob.data)
140
88
ie.executable = executable
142
# See if this has changed at all
144
base_ie = base_inv[file_id]
149
base_sha = base_ie.text_id
152
base_sha = shagitmap.lookup_blob(file_id, base_ie.revision)
156
if (base_sha == hexsha and base_ie.executable == ie.executable
157
and base_ie.kind == ie.kind):
158
# If nothing has changed since the base revision, we're done
160
if base_sha == hexsha:
161
ie.text_size = base_ie.text_size
162
ie.text_sha1 = base_ie.text_sha1
163
ie.symlink_target = base_ie.symlink_target
164
ie.revision = base_ie.revision
166
blob = lookup_object(hexsha)
167
if ie.kind == "symlink":
168
ie.symlink_target = blob.data
172
ie.text_size = len(blob.data)
173
ie.text_sha1 = osutils.sha_string(blob.data)
174
# Check what revision we should store
176
for pinv in parent_invs:
177
if pinv.revision_id == base_inv.revision_id:
186
if pie.text_sha1 == ie.text_sha1:
187
# found a revision in one of the parents to use
188
ie.revision = pie.revision
190
parent_keys.append((file_id, pie.revision))
191
if ie.revision is None:
192
# Need to store a new revision
193
ie.revision = revision_id
194
assert file_id is not None
195
assert ie.revision is not None
196
texts.insert_record_stream([FulltextContentFactory((file_id, ie.revision), tuple(parent_keys), ie.text_sha1, blob.data)])
197
shamap = [(hexsha, "blob", (ie.file_id, ie.revision))]
200
if file_id in base_inv:
201
old_path = base_inv.id2path(file_id)
204
return ([(old_path, path, file_id, ie)], shamap)
207
def import_git_tree(texts, mapping, path, hexsha, base_inv, parent_id,
208
revision_id, parent_invs, shagitmap, lookup_object):
91
def import_git_tree(repo, mapping, path, tree, inv, parent_invs, lookup_object):
209
92
"""Import a git tree object into a bzr repository.
211
:param texts: VersionedFiles object to add to
94
:param repo: A Bzr repository object
212
95
:param path: Path in the tree
213
96
:param tree: A git tree object
214
:param base_inv: Base inventory against which to return inventory delta
215
:return: Inventory delta for this subtree
97
:param inv: Inventory object
218
99
file_id = mapping.generate_file_id(path)
219
# We just have to hope this is indeed utf-8:
220
ie = InventoryDirectory(file_id, urlutils.basename(path.decode("utf-8")),
224
base_ie = base_inv[file_id]
226
# Newly appeared here
228
ie.revision = revision_id
229
texts.add_lines((file_id, ie.revision), (), [])
230
invdelta.append((None, path, file_id, ie))
232
base_sha = base_ie.text_id
233
# See if this has changed at all
236
base_sha = shagitmap.lookup_tree(file_id, base_inv.revision_id)
240
if base_sha == hexsha:
241
# If nothing has changed since the base revision, we're done
243
# Remember for next time
244
existing_children = set()
247
tree = lookup_object(hexsha)
248
for mode, name, child_hexsha in tree.entries():
100
text_revision = inv.revision_id
101
repo.texts.add_lines((file_id, text_revision),
102
[(file_id, p[file_id].revision) for p in parent_invs if file_id in p],
104
ie = inv.add_path(path, "directory", file_id)
105
ie.revision = text_revision
106
for mode, name, hexsha in tree.entries():
107
entry_kind = (mode & 0700000) / 0100000
249
108
basename = name.decode("utf-8")
250
existing_children.add(basename)
251
child_path = osutils.pathjoin(path, name)
252
if stat.S_ISDIR(mode):
253
subinvdelta, grandchildmodes, subshamap = import_git_tree(texts,
254
mapping, child_path, child_hexsha, base_inv, file_id,
255
revision_id, parent_invs, shagitmap, lookup_object)
256
invdelta.extend(subinvdelta)
257
child_modes.update(grandchildmodes)
258
shamap.extend(subshamap)
260
fs_mode = stat.S_IMODE(mode)
261
symlink = stat.S_ISLNK(mode)
262
subinvdelta, subshamap = import_git_blob(texts, mapping,
263
child_path, child_hexsha, base_inv, file_id, revision_id,
264
parent_invs, shagitmap, lookup_object,
265
bool(fs_mode & 0111), symlink)
266
invdelta.extend(subinvdelta)
267
shamap.extend(subshamap)
268
if mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
269
stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
270
child_modes[child_path] = mode
271
# Remove any children that have disappeared
272
if base_ie is not None:
273
deletable = [v for k,v in base_ie.children.iteritems() if k not in existing_children]
276
invdelta.append((base_inv.id2path(ie.file_id), None, ie.file_id, None))
277
if ie.kind == "directory":
278
deletable.extend(ie.children.values())
279
shamap.append((hexsha, "tree", (file_id, revision_id)))
280
return invdelta, child_modes, shamap
283
def import_git_objects(repo, mapping, object_iter, target_git_object_retriever,
112
child_path = urlutils.join(path, name)
114
tree = lookup_object(hexsha)
115
import_git_tree(repo, mapping, child_path, tree, inv, parent_invs, lookup_object)
116
elif entry_kind == 1:
117
blob = lookup_object(hexsha)
118
fs_mode = mode & 0777
119
import_git_blob(repo, mapping, child_path, blob, inv, parent_invs, bool(fs_mode & 0111))
121
raise AssertionError("Unknown blob kind, perms=%r." % (mode,))
124
def import_git_objects(repo, mapping, object_iter, pb=None):
285
125
"""Import a set of git objects into a bzr repository.
287
127
:param repo: Bazaar repository
289
129
:param object_iter: Iterator over Git objects.
291
131
# TODO: a more (memory-)efficient implementation of this
133
for i, o in enumerate(object_iter):
135
pb.update("fetching objects", i)
297
parent_invs_cache = LRUCache(50)
298
140
# Find and convert commit objects
301
pb.update("finding revisions to fetch", len(graph), None)
303
assert isinstance(head, str)
305
o = object_iter[head]
141
for o in objects.itervalues():
308
142
if isinstance(o, Commit):
309
143
rev = mapping.import_commit(o)
310
if repo.has_revision(rev.revision_id):
312
root_trees[rev.revision_id] = o.tree
144
root_trees[rev.revision_id] = objects[o.tree]
313
145
revisions[rev.revision_id] = rev
314
146
graph.append((rev.revision_id, rev.parent_ids))
315
target_git_object_retriever._idmap.add_entry(o.id, "commit",
316
(rev.revision_id, o.tree))
317
heads.extend([p for p in o.parents if p not in checked])
318
elif isinstance(o, Tag):
319
heads.append(o.object[1])
321
trace.warning("Unable to import head object %r" % o)
323
147
# Order the revisions
324
148
# Create the inventory objects
325
149
for i, revid in enumerate(topo_sort(graph)):
326
150
if pb is not None:
327
151
pb.update("fetching revisions", i, len(graph))
152
root_tree = root_trees[revid]
328
153
rev = revisions[revid]
329
154
# We have to do this here, since we have to walk the tree and
330
# we need to make sure to import the blobs / trees with the right
155
# we need to make sure to import the blobs / trees with the riht
331
156
# path; this may involve adding them more than once.
158
inv.revision_id = rev.revision_id
332
159
def lookup_object(sha):
334
return object_iter[sha]
336
return target_git_object_retriever[sha]
338
for parent_id in rev.parent_ids:
340
parent_invs.append(parent_invs_cache[parent_id])
342
parent_inv = repo.get_inventory(parent_id)
343
parent_invs.append(parent_inv)
344
parent_invs_cache[parent_id] = parent_inv
345
if parent_invs == []:
346
base_inv = Inventory(root_id=None)
348
base_inv = parent_invs[0]
349
inv_delta, unusual_modes, shamap = import_git_tree(repo.texts,
350
mapping, "", root_trees[revid], base_inv, None, revid,
351
parent_invs, target_git_object_retriever._idmap, lookup_object)
352
target_git_object_retriever._idmap.add_entries(shamap)
353
if unusual_modes != {}:
354
ret = "unusual modes: \n"
355
for item in unusual_modes.iteritems():
356
ret += "\t%s: %o\n" % item
357
raise AssertionError(ret)
359
basis_id = rev.parent_ids[0]
361
basis_id = NULL_REVISION
362
rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
363
inv_delta, rev.revision_id, rev.parent_ids)
364
parent_invs_cache[rev.revision_id] = inv
365
repo.add_revision(rev.revision_id, rev)
366
if "verify" in debug.debug_flags:
367
objs = inventory_to_tree_and_blobs(inv, repo.texts, mapping)
368
for sha1, newobj, path in objs:
369
assert path is not None
370
oldobj = tree_lookup_path(lookup_object, root_trees[revid], path)
371
assert oldobj == newobj, "%r != %r in %s" % (oldobj, newobj, path)
373
target_git_object_retriever._idmap.commit()
376
class InterGitNonGitRepository(InterRepository):
377
"""Base InterRepository that copies revisions from a Git into a non-Git
380
_matching_repo_format = GitRepositoryFormat()
162
return reconstruct_git_object(repo, mapping, sha)
163
parent_invs = [repo.get_inventory(r) for r in rev.parent_ids]
164
import_git_tree(repo, mapping, "", root_tree, inv, parent_invs, lookup_object)
165
repo.add_revision(rev.revision_id, rev, inv)
168
def reconstruct_git_commit(repo, rev):
169
raise NotImplementedError(self.reconstruct_git_commit)
172
def reconstruct_git_object(repo, mapping, sha):
174
revid = mapping.revision_id_foreign_to_bzr(sha)
176
rev = repo.get_revision(revid)
177
except NoSuchRevision:
180
return reconstruct_git_commit(rev)
184
raise KeyError("No such object %s" % sha)
187
class InterGitRepository(InterRepository):
189
_matching_repo_format = GitFormat()
383
192
def _get_repo_format_to_test():
387
196
"""See InterRepository.copy_content."""
388
197
self.fetch(revision_id, pb, find_ghosts=False)
390
def fetch(self, revision_id=None, pb=None, find_ghosts=False, mapping=None,
392
self.fetch_refs(revision_id=revision_id, pb=pb, find_ghosts=find_ghosts,
393
mapping=mapping, fetch_spec=fetch_spec)
395
def fetch_refs(self, revision_id=None, pb=None, find_ghosts=False,
396
mapping=None, fetch_spec=None):
199
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
397
201
if mapping is None:
398
202
mapping = self.source.get_mapping()
399
if revision_id is not None:
400
interesting_heads = [revision_id]
401
elif fetch_spec is not None:
402
interesting_heads = fetch_spec.heads
404
interesting_heads = None
406
def determine_wants(refs):
408
if interesting_heads is None:
409
ret = [sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")]
204
pb.note("git: %s", text)
205
def determine_wants(heads):
206
if revision_id is None:
411
ret = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in interesting_heads if revid != NULL_REVISION]
209
ret = [mapping.revision_id_bzr_to_foreign(revision_id)]
412
210
return [rev for rev in ret if not self.target.has_revision(mapping.revision_id_foreign_to_bzr(rev))]
413
self.fetch_objects(determine_wants, mapping, pb)
418
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
419
"""InterRepository that copies revisions from a remote Git into a non-Git
422
def fetch_objects(self, determine_wants, mapping, pb=None):
424
pb.update("git: %s" % text.rstrip("\r\n"), 0, 0)
425
211
graph_walker = BzrFetchGraphWalker(self.target, mapping)
428
214
create_pb = pb = ui.ui_factory.nested_progress_bar()
429
target_git_object_retriever = BazaarObjectStore(self.target, mapping)
432
def record_determine_wants(heads):
433
wants = determine_wants(heads)
434
recorded_wants.extend(wants)
438
self.target.lock_write()
440
self.target.start_write_group()
442
objects_iter = self.source.fetch_objects(
443
record_determine_wants,
445
target_git_object_retriever.get_raw,
447
import_git_objects(self.target, mapping, objects_iter,
448
target_git_object_retriever, recorded_wants, pb)
450
self.target.commit_write_group()
458
def is_compatible(source, target):
459
"""Be compatible with GitRepository."""
460
# FIXME: Also check target uses VersionedFile
461
return (isinstance(source, RemoteGitRepository) and
462
target.supports_rich_root() and
463
not isinstance(target, GitRepository))
466
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
467
"""InterRepository that copies revisions from a remote Git into a non-Git
470
def fetch_objects(self, determine_wants, mapping, pb=None):
471
wants = determine_wants(self.source._git.get_refs())
474
create_pb = pb = ui.ui_factory.nested_progress_bar()
475
target_git_object_retriever = BazaarObjectStore(self.target, mapping)
477
self.target.lock_write()
479
self.target.start_write_group()
481
import_git_objects(self.target, mapping,
482
self.source._git.object_store,
483
target_git_object_retriever, wants, pb)
485
self.target.commit_write_group()
493
def is_compatible(source, target):
494
"""Be compatible with GitRepository."""
495
# FIXME: Also check target uses VersionedFile
496
return (isinstance(source, LocalGitRepository) and
497
target.supports_rich_root() and
498
not isinstance(target, GitRepository))
501
class InterGitRepository(InterRepository):
502
"""InterRepository that copies between Git repositories."""
504
_matching_repo_format = GitRepositoryFormat()
507
def _get_repo_format_to_test():
510
def copy_content(self, revision_id=None, pb=None):
511
"""See InterRepository.copy_content."""
512
self.fetch(revision_id, pb, find_ghosts=False)
514
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
515
mapping=None, fetch_spec=None):
517
mapping = self.source.get_mapping()
519
trace.info("git: %s", text)
521
if revision_id is not None:
522
args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
523
elif fetch_spec is not None:
524
args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in fetch_spec.heads]
525
if fetch_spec is None and revision_id is None:
526
determine_wants = r.object_store.determine_wants_all
528
determine_wants = lambda x: [y for y in args if not y in r.object_store]
530
graphwalker = SimpleFetchGraphWalker(r.heads().values(), r.get_parents)
531
f, commit = r.object_store.add_thin_pack()
533
self.source.fetch_pack(determine_wants, graphwalker, f.write, progress)
540
def is_compatible(source, target):
541
"""Be compatible with GitRepository."""
216
self.target.lock_write()
218
self.target.start_write_group()
220
import_git_objects(self.target, mapping,
221
iter(self.source.fetch_objects(determine_wants, graph_walker,
224
self.target.commit_write_group()
232
def is_compatible(source, target):
233
"""Be compatible with GitRepository."""
234
# FIXME: Also check target uses VersionedFile
542
235
return (isinstance(source, GitRepository) and
543
isinstance(target, GitRepository))
236
target.supports_rich_root())
added
removed
fetch.py
