1
# Copyright (C) 2008-2010 Jelmer Vernooij <jelmer@samba.org>
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from dulwich.objects import (
23
from dulwich.object_store import (
27
from itertools import (
40
from bzrlib.errors import (
44
from bzrlib.inventory import (
51
from bzrlib.repository import (
54
from bzrlib.revision import (
57
from bzrlib.revisiontree import (
60
from bzrlib.testament import (
63
from bzrlib.tsort import (
66
from bzrlib.versionedfile import (
67
ChunkedContentFactory,
70
from bzrlib.plugins.git.mapping import (
76
from bzrlib.plugins.git.object_store import (
81
from bzrlib.plugins.git.refs import extract_tags
82
from bzrlib.plugins.git.remote import (
85
from bzrlib.plugins.git.repository import (
92
def import_git_blob(texts, mapping, path, name, (base_hexsha, hexsha),
93
base_inv, parent_id, revision_id,
94
parent_invs, lookup_object, (base_mode, mode), store_updater,
96
"""Import a git blob object into a bzr repository.
98
:param texts: VersionedFiles to add to
99
:param path: Path in the tree
100
:param blob: A git blob
101
:return: Inventory delta for this file
103
if mapping.is_control_file(path):
105
if base_hexsha == hexsha and base_mode == mode:
106
# If nothing has changed since the base revision, we're done
108
file_id = lookup_file_id(path)
109
if stat.S_ISLNK(mode):
113
ie = cls(file_id, name.decode("utf-8"), parent_id)
114
if ie.kind == "file":
115
ie.executable = mode_is_executable(mode)
116
if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
117
base_ie = base_inv[base_inv.path2id(path)]
118
ie.text_size = base_ie.text_size
119
ie.text_sha1 = base_ie.text_sha1
120
if ie.kind == "symlink":
121
ie.symlink_target = base_ie.symlink_target
122
if ie.executable == base_ie.executable:
123
ie.revision = base_ie.revision
125
blob = lookup_object(hexsha)
127
blob = lookup_object(hexsha)
128
if ie.kind == "symlink":
130
ie.symlink_target = blob.data
132
ie.text_size = sum(imap(len, blob.chunked))
133
ie.text_sha1 = osutils.sha_strings(blob.chunked)
134
# Check what revision we should store
136
for pinv in parent_invs:
141
if (pie.text_sha1 == ie.text_sha1 and
142
pie.executable == ie.executable and
143
pie.symlink_target == ie.symlink_target):
144
# found a revision in one of the parents to use
145
ie.revision = pie.revision
147
parent_key = (file_id, pie.revision)
148
if not parent_key in parent_keys:
149
parent_keys.append(parent_key)
150
if ie.revision is None:
151
# Need to store a new revision
152
ie.revision = revision_id
153
assert ie.revision is not None
154
if ie.kind == 'symlink':
157
chunks = blob.chunked
158
texts.insert_record_stream([
159
ChunkedContentFactory((file_id, ie.revision),
160
tuple(parent_keys), ie.text_sha1, chunks)])
162
if base_hexsha is not None:
163
old_path = path.decode("utf-8") # Renames are not supported yet
164
if stat.S_ISDIR(base_mode):
165
invdelta.extend(remove_disappeared_children(base_inv, old_path,
166
lookup_object(base_hexsha), [], lookup_object))
169
new_path = path.decode("utf-8")
170
invdelta.append((old_path, new_path, file_id, ie))
171
if base_hexsha != hexsha:
172
store_updater.add_object(blob, ie, path)
176
class SubmodulesRequireSubtrees(BzrError):
177
_fmt = """The repository you are fetching from contains submodules. To continue, upgrade your Bazaar repository to a format that supports nested trees, such as 'development-subtree'."""
181
def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),
182
base_inv, parent_id, revision_id, parent_invs, lookup_object,
183
(base_mode, mode), store_updater, lookup_file_id):
184
if base_hexsha == hexsha and base_mode == mode:
186
file_id = lookup_file_id(path)
187
ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
188
ie.revision = revision_id
189
if base_hexsha is None:
193
ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
194
texts.insert_record_stream([
195
ChunkedContentFactory((file_id, ie.revision), (), None, [])])
196
invdelta = [(oldpath, path, file_id, ie)]
200
def remove_disappeared_children(base_inv, path, base_tree, existing_children,
202
"""Generate an inventory delta for removed children.
204
:param base_inv: Base inventory against which to generate the
206
:param path: Path to process (unicode)
207
:param base_tree: Git Tree base object
208
:param existing_children: Children that still exist
209
:param lookup_object: Lookup a git object by its SHA1
210
:return: Inventory delta, as list
212
assert type(path) is unicode
214
for name, mode, hexsha in base_tree.iteritems():
215
if name in existing_children:
217
c_path = posixpath.join(path, name.decode("utf-8"))
218
file_id = base_inv.path2id(c_path)
219
assert file_id is not None
220
ret.append((c_path, None, file_id, None))
221
if stat.S_ISDIR(mode):
222
ret.extend(remove_disappeared_children(
223
base_inv, c_path, lookup_object(hexsha), [], lookup_object))
227
def import_git_tree(texts, mapping, path, name, (base_hexsha, hexsha),
228
base_inv, parent_id, revision_id, parent_invs,
229
lookup_object, (base_mode, mode), store_updater,
230
lookup_file_id, allow_submodules=False):
231
"""Import a git tree object into a bzr repository.
233
:param texts: VersionedFiles object to add to
234
:param path: Path in the tree (str)
235
:param name: Name of the tree (str)
236
:param tree: A git tree object
237
:param base_inv: Base inventory against which to return inventory delta
238
:return: Inventory delta for this subtree
240
assert type(path) is str
241
assert type(name) is str
242
if base_hexsha == hexsha and base_mode == mode:
243
# If nothing has changed since the base revision, we're done
246
file_id = lookup_file_id(path)
247
# We just have to hope this is indeed utf-8:
248
ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
249
tree = lookup_object(hexsha)
250
if base_hexsha is None:
252
old_path = None # Newly appeared here
254
base_tree = lookup_object(base_hexsha)
255
old_path = path.decode("utf-8") # Renames aren't supported yet
256
new_path = path.decode("utf-8")
257
if base_tree is None or type(base_tree) is not Tree:
258
ie.revision = revision_id
259
invdelta.append((old_path, new_path, ie.file_id, ie))
260
texts.insert_record_stream([
261
ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
262
# Remember for next time
263
existing_children = set()
265
for name, child_mode, child_hexsha in tree.iteritems():
266
existing_children.add(name)
267
child_path = posixpath.join(path, name)
268
if type(base_tree) is Tree:
270
child_base_mode, child_base_hexsha = base_tree[name]
272
child_base_hexsha = None
275
child_base_hexsha = None
277
if stat.S_ISDIR(child_mode):
278
subinvdelta, grandchildmodes = import_git_tree(texts, mapping,
279
child_path, name, (child_base_hexsha, child_hexsha), base_inv,
280
file_id, revision_id, parent_invs, lookup_object,
281
(child_base_mode, child_mode), store_updater, lookup_file_id,
282
allow_submodules=allow_submodules)
283
elif S_ISGITLINK(child_mode): # submodule
284
if not allow_submodules:
285
raise SubmodulesRequireSubtrees()
286
subinvdelta, grandchildmodes = import_git_submodule(texts, mapping,
287
child_path, name, (child_base_hexsha, child_hexsha), base_inv,
288
file_id, revision_id, parent_invs, lookup_object,
289
(child_base_mode, child_mode), store_updater, lookup_file_id)
291
subinvdelta = import_git_blob(texts, mapping, child_path, name,
292
(child_base_hexsha, child_hexsha), base_inv, file_id,
293
revision_id, parent_invs, lookup_object,
294
(child_base_mode, child_mode), store_updater, lookup_file_id)
296
child_modes.update(grandchildmodes)
297
invdelta.extend(subinvdelta)
298
if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
299
stat.S_IFLNK, DEFAULT_FILE_MODE|0111):
300
child_modes[child_path] = child_mode
301
# Remove any children that have disappeared
302
if base_tree is not None and type(base_tree) is Tree:
303
invdelta.extend(remove_disappeared_children(base_inv, old_path,
304
base_tree, existing_children, lookup_object))
305
store_updater.add_object(tree, ie, path)
306
return invdelta, child_modes
309
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
310
o, rev, ret_tree, parent_trees, mapping, unusual_modes, verifiers):
311
new_unusual_modes = mapping.export_unusual_file_modes(rev)
312
if new_unusual_modes != unusual_modes:
313
raise AssertionError("unusual modes don't match: %r != %r" % (
314
unusual_modes, new_unusual_modes))
315
# Verify that we can reconstruct the commit properly
316
rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True,
319
raise AssertionError("Reconstructed commit differs: %r != %r" % (
323
for path, obj, ie in _tree_to_objects(ret_tree, parent_trees,
324
target_git_object_retriever._cache.idmap, unusual_modes, mapping.BZR_DUMMY_FILE):
325
old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
327
if obj.id != old_obj_id:
328
diff.append((path, lookup_object(old_obj_id), obj))
329
for (path, old_obj, new_obj) in diff:
330
while (old_obj.type_name == "tree" and
331
new_obj.type_name == "tree" and
332
sorted(old_obj) == sorted(new_obj)):
334
if old_obj[name][0] != new_obj[name][0]:
335
raise AssertionError("Modes for %s differ: %o != %o" %
336
(path, old_obj[name][0], new_obj[name][0]))
337
if old_obj[name][1] != new_obj[name][1]:
338
# Found a differing child, delve deeper
339
path = posixpath.join(path, name)
340
old_obj = lookup_object(old_obj[name][1])
341
new_obj = new_objs[path]
343
raise AssertionError("objects differ for %s: %r != %r" % (path,
347
def import_git_commit(repo, mapping, head, lookup_object,
348
target_git_object_retriever, trees_cache):
349
o = lookup_object(head)
350
rev, roundtrip_revid, verifiers = mapping.import_commit(o,
351
lambda x: target_git_object_retriever.lookup_git_sha(x)[1][0])
352
# We have to do this here, since we have to walk the tree and
353
# we need to make sure to import the blobs / trees with the right
354
# path; this may involve adding them more than once.
355
parent_trees = trees_cache.revision_trees(rev.parent_ids)
356
if parent_trees == []:
357
base_inv = Inventory(root_id=None)
361
base_inv = parent_trees[0].inventory
362
base_tree = lookup_object(o.parents[0]).tree
363
base_mode = stat.S_IFDIR
364
store_updater = target_git_object_retriever._get_updater(rev)
365
fileid_map = mapping.get_fileid_map(lookup_object, o.tree)
366
inv_delta, unusual_modes = import_git_tree(repo.texts,
367
mapping, "", "", (base_tree, o.tree), base_inv,
368
None, rev.revision_id, [p.inventory for p in parent_trees],
369
lookup_object, (base_mode, stat.S_IFDIR), store_updater,
370
fileid_map.lookup_file_id,
371
allow_submodules=getattr(repo._format, "supports_tree_reference", False))
372
if unusual_modes != {}:
373
for path, mode in unusual_modes.iteritems():
374
warn_unusual_mode(rev.foreign_revid, path, mode)
375
mapping.import_unusual_file_modes(rev, unusual_modes)
377
basis_id = rev.parent_ids[0]
379
basis_id = NULL_REVISION
381
rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
382
inv_delta, rev.revision_id, rev.parent_ids, base_inv)
384
testament = StrictTestament3(rev, inv)
385
calculated_verifiers = { "testament3-sha1": testament.as_sha1() }
386
if roundtrip_revid is not None:
387
original_revid = rev.revision_id
388
rev.revision_id = roundtrip_revid
389
if calculated_verifiers != verifiers:
390
trace.mutter("Testament SHA1 %r for %r did not match %r.",
391
calculated_verifiers["testament3-sha1"],
392
rev.revision_id, verifiers["testament3-sha1"])
393
rev.revision_id = original_revid
394
store_updater.add_object(o, calculated_verifiers, None)
395
store_updater.finish()
396
ret_tree = RevisionTree(repo, inv, rev.revision_id)
397
trees_cache.add(ret_tree)
398
repo.add_revision(rev.revision_id, rev)
399
if "verify" in debug.debug_flags:
400
verify_commit_reconstruction(target_git_object_retriever,
401
lookup_object, o, rev, ret_tree, parent_trees, mapping,
402
unusual_modes, verifiers)
405
def import_git_objects(repo, mapping, object_iter,
406
target_git_object_retriever, heads, pb=None, limit=None):
407
"""Import a set of git objects into a bzr repository.
409
:param repo: Target Bazaar repository
410
:param mapping: Mapping to use
411
:param object_iter: Iterator over Git objects.
412
:return: Tuple with pack hints and last imported revision id
414
def lookup_object(sha):
416
return object_iter[sha]
418
return target_git_object_retriever[sha]
421
heads = list(set(heads))
422
trees_cache = LRUTreeCache(repo)
423
# Find and convert commit objects
426
pb.update("finding revisions to fetch", len(graph), None)
428
assert isinstance(head, str)
430
o = lookup_object(head)
433
if isinstance(o, Commit):
434
rev, roundtrip_revid, verifiers = mapping.import_commit(o,
436
if (repo.has_revision(rev.revision_id) or
437
(roundtrip_revid and repo.has_revision(roundtrip_revid))):
439
graph.append((o.id, o.parents))
440
heads.extend([p for p in o.parents if p not in checked])
441
elif isinstance(o, Tag):
442
if o.object[1] not in checked:
443
heads.append(o.object[1])
445
trace.warning("Unable to import head object %r" % o)
448
# Order the revisions
449
# Create the inventory objects
451
revision_ids = topo_sort(graph)
453
if limit is not None:
454
revision_ids = revision_ids[:limit]
456
for offset in range(0, len(revision_ids), batch_size):
457
target_git_object_retriever.start_write_group()
459
repo.start_write_group()
461
for i, head in enumerate(
462
revision_ids[offset:offset+batch_size]):
464
pb.update("fetching revisions", offset+i,
466
import_git_commit(repo, mapping, head, lookup_object,
467
target_git_object_retriever, trees_cache)
470
repo.abort_write_group()
473
hint = repo.commit_write_group()
475
pack_hints.extend(hint)
477
target_git_object_retriever.abort_write_group()
480
target_git_object_retriever.commit_write_group()
481
return pack_hints, last_imported
484
class InterGitRepository(InterRepository):
486
_matching_repo_format = GitRepositoryFormat()
489
def _get_repo_format_to_test():
492
def copy_content(self, revision_id=None, pb=None):
493
"""See InterRepository.copy_content."""
494
self.fetch(revision_id, pb, find_ghosts=False)
497
class InterGitNonGitRepository(InterGitRepository):
498
"""Base InterRepository that copies revisions from a Git into a non-Git
501
def _target_has_shas(self, shas):
502
revids = [self.source.lookup_foreign_revision_id(sha) for sha in shas]
503
return self.target.has_revisions(revids)
505
def get_determine_wants_heads(self, wants, include_tags=False):
507
def determine_wants(refs):
508
potential = set(wants)
510
potential.update([v[0] for v in extract_tags(refs).itervalues()])
511
return list(potential - self._target_has_shas(potential))
512
return determine_wants
514
def get_determine_wants_revids(self, revids, include_tags=False):
516
for revid in set(revids):
517
git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
519
return self.get_determine_wants_heads(wants, include_tags=include_tags)
521
def determine_wants_all(self, refs):
522
potential = set([sha for (ref, sha) in refs.iteritems() if not ref.endswith("^{}")])
523
return list(potential - self._target_has_shas(potential))
525
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
526
"""Fetch objects from a remote server.
528
:param determine_wants: determine_wants callback
529
:param mapping: BzrGitMapping to use
530
:param pb: Optional progress bar
531
:param limit: Maximum number of commits to import.
532
:return: Tuple with pack hint, last imported revision id and remote refs
534
raise NotImplementedError(self.fetch_objects)
536
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
537
mapping=None, fetch_spec=None):
539
mapping = self.source.get_mapping()
540
if revision_id is not None:
541
interesting_heads = [revision_id]
542
elif fetch_spec is not None:
543
recipe = fetch_spec.get_recipe()
544
if recipe[0] in ("search", "proxy-search"):
545
interesting_heads = recipe[1]
547
raise AssertionError("Unsupported search result type %s" % recipe[0])
549
interesting_heads = None
551
if interesting_heads is not None:
552
determine_wants = self.get_determine_wants_revids(interesting_heads,
555
determine_wants = self.determine_wants_all
557
(pack_hint, _, remote_refs) = self.fetch_objects(determine_wants,
559
if pack_hint is not None and self.target._format.pack_compresses:
560
self.target.pack(hint=pack_hint)
564
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
565
def report_git_progress(pb, text):
566
text = text.rstrip("\r\n")
567
g = _GIT_PROGRESS_RE.match(text)
569
(text, pct, current, total) = g.groups()
570
pb.update(text, int(current), int(total))
572
pb.update(text, 0, 0)
575
class DetermineWantsRecorder(object):
577
def __init__(self, actual):
580
self.remote_refs = {}
582
def __call__(self, refs):
583
self.remote_refs = refs
584
self.wants = self.actual(refs)
588
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
589
"""InterRepository that copies revisions from a remote Git into a non-Git
592
def get_target_heads(self):
593
# FIXME: This should be more efficient
594
all_revs = self.target.all_revision_ids()
595
parent_map = self.target.get_parent_map(all_revs)
597
map(all_parents.update, parent_map.itervalues())
598
return set(all_revs) - all_parents
600
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
601
"""See `InterGitNonGitRepository`."""
603
report_git_progress(pb, text)
604
store = BazaarObjectStore(self.target, mapping)
605
self.target.lock_write()
607
heads = self.get_target_heads()
608
graph_walker = store.get_graph_walker(
609
[store._lookup_revision_sha1(head) for head in heads])
610
wants_recorder = DetermineWantsRecorder(determine_wants)
614
create_pb = pb = ui.ui_factory.nested_progress_bar()
616
objects_iter = self.source.fetch_objects(
617
wants_recorder, graph_walker, store.get_raw,
619
trace.mutter("Importing %d new revisions", len(wants_recorder.wants))
620
(pack_hint, last_rev) = import_git_objects(self.target, mapping,
621
objects_iter, store, wants_recorder.wants, pb, limit)
622
return (pack_hint, last_rev, wants_recorder.remote_refs)
630
def is_compatible(source, target):
631
"""Be compatible with GitRepository."""
632
return (isinstance(source, RemoteGitRepository) and
633
target.supports_rich_root() and
634
not isinstance(target, GitRepository) and
635
target.texts is not None)
638
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
639
"""InterRepository that copies revisions from a local Git into a non-Git
642
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
643
"""See `InterGitNonGitRepository`."""
644
remote_refs = self.source._git.get_refs()
645
wants = determine_wants(remote_refs)
648
create_pb = pb = ui.ui_factory.nested_progress_bar()
649
target_git_object_retriever = BazaarObjectStore(self.target, mapping)
651
self.target.lock_write()
653
(pack_hint, last_rev) = import_git_objects(self.target, mapping,
654
self.source._git.object_store,
655
target_git_object_retriever, wants, pb, limit)
656
return (pack_hint, last_rev, remote_refs)
664
def is_compatible(source, target):
665
"""Be compatible with GitRepository."""
666
return (isinstance(source, LocalGitRepository) and
667
target.supports_rich_root() and
668
not isinstance(target, GitRepository) and
669
target.texts is not None)
672
class InterGitGitRepository(InterGitRepository):
673
"""InterRepository that copies between Git repositories."""
675
def fetch_objects(self, determine_wants, mapping, pb=None):
677
trace.note("git: %s", text)
678
graphwalker = self.target._git.get_graph_walker()
679
if (isinstance(self.source, LocalGitRepository) and
680
isinstance(self.target, LocalGitRepository)):
681
refs = self.source._git.fetch(self.target._git, determine_wants,
683
return (None, None, refs)
684
elif (isinstance(self.source, LocalGitRepository) and
685
isinstance(self.target, RemoteGitRepository)):
686
raise NotImplementedError
687
elif (isinstance(self.source, RemoteGitRepository) and
688
isinstance(self.target, LocalGitRepository)):
689
f, commit = self.target._git.object_store.add_thin_pack()
691
refs = self.source.bzrdir.root_transport.fetch_pack(
692
determine_wants, graphwalker, f.write, progress)
694
return (None, None, refs)
701
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
702
mapping=None, fetch_spec=None, branches=None):
704
mapping = self.source.get_mapping()
706
if revision_id is not None:
707
args = [mapping.revision_id_bzr_to_foreign(revision_id)[0]]
708
elif fetch_spec is not None:
709
recipe = fetch_spec.get_recipe()
710
if recipe[0] in ("search", "proxy-search"):
713
raise AssertionError("Unsupported search result type %s" % recipe[0])
714
args = [mapping.revision_id_bzr_to_foreign(revid)[0] for revid in heads]
715
if branches is not None:
716
determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store]
717
elif fetch_spec is None and revision_id is None:
718
determine_wants = r.object_store.determine_wants_all
720
determine_wants = lambda x: [y for y in args if not y in r.object_store]
721
self.fetch_objects(determine_wants, mapping)
724
def is_compatible(source, target):
725
"""Be compatible with GitRepository."""
726
return (isinstance(source, GitRepository) and
727
isinstance(target, GitRepository))
added
removed
fetch.py
