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 (
25
from dulwich.object_store import (
28
from dulwich.walk import Walker
29
from itertools import (
43
from bzrlib.errors import (
47
from bzrlib.inventory import (
54
from bzrlib.repository import (
57
from bzrlib.revision import (
61
from bzrlib.revisiontree import InventoryRevisionTree
62
except ImportError: # bzr < 2.4
63
from bzrlib.revisiontree import RevisionTree as InventoryRevisionTree
64
from bzrlib.testament import (
67
from bzrlib.tsort import (
70
from bzrlib.versionedfile import (
71
ChunkedContentFactory,
74
from bzrlib.plugins.git.errors import (
77
from bzrlib.plugins.git.mapping import (
83
from bzrlib.plugins.git.object_store import (
88
from bzrlib.plugins.git.refs import extract_tags
89
from bzrlib.plugins.git.remote import (
92
from bzrlib.plugins.git.repository import (
99
def import_git_blob(texts, mapping, path, name, (base_hexsha, hexsha),
100
base_inv, parent_id, revision_id,
101
parent_invs, lookup_object, (base_mode, mode), store_updater,
103
"""Import a git blob object into a bzr repository.
105
:param texts: VersionedFiles to add to
106
:param path: Path in the tree
107
:param blob: A git blob
108
:return: Inventory delta for this file
110
if mapping.is_control_file(path):
112
if base_hexsha == hexsha and base_mode == mode:
113
# If nothing has changed since the base revision, we're done
115
file_id = lookup_file_id(path)
116
if stat.S_ISLNK(mode):
120
ie = cls(file_id, name.decode("utf-8"), parent_id)
121
if ie.kind == "file":
122
ie.executable = mode_is_executable(mode)
123
if base_hexsha == hexsha and mode_kind(base_mode) == mode_kind(mode):
124
base_ie = base_inv[base_inv.path2id(path)]
125
ie.text_size = base_ie.text_size
126
ie.text_sha1 = base_ie.text_sha1
127
if ie.kind == "symlink":
128
ie.symlink_target = base_ie.symlink_target
129
if ie.executable == base_ie.executable:
130
ie.revision = base_ie.revision
132
blob = lookup_object(hexsha)
134
blob = lookup_object(hexsha)
135
if ie.kind == "symlink":
137
ie.symlink_target = blob.data.decode("utf-8")
139
ie.text_size = sum(imap(len, blob.chunked))
140
ie.text_sha1 = osutils.sha_strings(blob.chunked)
141
# Check what revision we should store
143
for pinv in parent_invs:
148
if (pie.text_sha1 == ie.text_sha1 and
149
pie.executable == ie.executable and
150
pie.symlink_target == ie.symlink_target):
151
# found a revision in one of the parents to use
152
ie.revision = pie.revision
154
parent_key = (file_id, pie.revision)
155
if not parent_key in parent_keys:
156
parent_keys.append(parent_key)
157
if ie.revision is None:
158
# Need to store a new revision
159
ie.revision = revision_id
160
assert ie.revision is not None
161
if ie.kind == 'symlink':
164
chunks = blob.chunked
165
texts.insert_record_stream([
166
ChunkedContentFactory((file_id, ie.revision),
167
tuple(parent_keys), ie.text_sha1, chunks)])
169
if base_hexsha is not None:
170
old_path = path.decode("utf-8") # Renames are not supported yet
171
if stat.S_ISDIR(base_mode):
172
invdelta.extend(remove_disappeared_children(base_inv, old_path,
173
lookup_object(base_hexsha), [], lookup_object))
176
new_path = path.decode("utf-8")
177
invdelta.append((old_path, new_path, file_id, ie))
178
if base_hexsha != hexsha:
179
store_updater.add_object(blob, ie, path)
183
class SubmodulesRequireSubtrees(BzrError):
184
_fmt = ("The repository you are fetching from contains submodules. "
185
"To continue, upgrade your Bazaar repository to a format that "
186
"supports nested trees, such as 'development-subtree'.")
190
def import_git_submodule(texts, mapping, path, name, (base_hexsha, hexsha),
191
base_inv, parent_id, revision_id, parent_invs, lookup_object,
192
(base_mode, mode), store_updater, lookup_file_id):
193
"""Import a git submodule."""
194
if base_hexsha == hexsha and base_mode == mode:
196
file_id = lookup_file_id(path)
198
ie = TreeReference(file_id, name.decode("utf-8"), parent_id)
199
ie.revision = revision_id
200
if base_hexsha is not None:
201
old_path = path.decode("utf-8") # Renames are not supported yet
202
if stat.S_ISDIR(base_mode):
203
invdelta.extend(remove_disappeared_children(base_inv, old_path,
204
lookup_object(base_hexsha), [], lookup_object))
207
ie.reference_revision = mapping.revision_id_foreign_to_bzr(hexsha)
208
texts.insert_record_stream([
209
ChunkedContentFactory((file_id, ie.revision), (), None, [])])
210
invdelta.append((old_path, path, file_id, ie))
214
def remove_disappeared_children(base_inv, path, base_tree, existing_children,
216
"""Generate an inventory delta for removed children.
218
:param base_inv: Base inventory against which to generate the
220
:param path: Path to process (unicode)
221
:param base_tree: Git Tree base object
222
:param existing_children: Children that still exist
223
:param lookup_object: Lookup a git object by its SHA1
224
:return: Inventory delta, as list
226
assert type(path) is unicode
228
for name, mode, hexsha in base_tree.iteritems():
229
if name in existing_children:
231
c_path = posixpath.join(path, name.decode("utf-8"))
232
file_id = base_inv.path2id(c_path)
233
assert file_id is not None
234
ret.append((c_path, None, file_id, None))
235
if stat.S_ISDIR(mode):
236
ret.extend(remove_disappeared_children(
237
base_inv, c_path, lookup_object(hexsha), [], lookup_object))
241
def import_git_tree(texts, mapping, path, name, (base_hexsha, hexsha),
242
base_inv, parent_id, revision_id, parent_invs,
243
lookup_object, (base_mode, mode), store_updater,
244
lookup_file_id, allow_submodules=False):
245
"""Import a git tree object into a bzr repository.
247
:param texts: VersionedFiles object to add to
248
:param path: Path in the tree (str)
249
:param name: Name of the tree (str)
250
:param tree: A git tree object
251
:param base_inv: Base inventory against which to return inventory delta
252
:return: Inventory delta for this subtree
254
assert type(path) is str
255
assert type(name) is str
256
if base_hexsha == hexsha and base_mode == mode:
257
# If nothing has changed since the base revision, we're done
260
file_id = lookup_file_id(path)
261
# We just have to hope this is indeed utf-8:
262
ie = InventoryDirectory(file_id, name.decode("utf-8"), parent_id)
263
tree = lookup_object(hexsha)
264
if base_hexsha is None:
266
old_path = None # Newly appeared here
268
base_tree = lookup_object(base_hexsha)
269
old_path = path.decode("utf-8") # Renames aren't supported yet
270
new_path = path.decode("utf-8")
271
if base_tree is None or type(base_tree) is not Tree:
272
ie.revision = revision_id
273
invdelta.append((old_path, new_path, ie.file_id, ie))
274
texts.insert_record_stream([
275
ChunkedContentFactory((ie.file_id, ie.revision), (), None, [])])
276
# Remember for next time
277
existing_children = set()
279
for name, child_mode, child_hexsha in tree.iteritems():
280
existing_children.add(name)
281
child_path = posixpath.join(path, name)
282
if type(base_tree) is Tree:
284
child_base_mode, child_base_hexsha = base_tree[name]
286
child_base_hexsha = None
289
child_base_hexsha = None
291
if stat.S_ISDIR(child_mode):
292
subinvdelta, grandchildmodes = import_git_tree(texts, mapping,
293
child_path, name, (child_base_hexsha, child_hexsha), base_inv,
294
file_id, revision_id, parent_invs, lookup_object,
295
(child_base_mode, child_mode), store_updater, lookup_file_id,
296
allow_submodules=allow_submodules)
297
elif S_ISGITLINK(child_mode): # submodule
298
if not allow_submodules:
299
raise SubmodulesRequireSubtrees()
300
subinvdelta, grandchildmodes = import_git_submodule(texts, mapping,
301
child_path, name, (child_base_hexsha, child_hexsha), base_inv,
302
file_id, revision_id, parent_invs, lookup_object,
303
(child_base_mode, child_mode), store_updater, lookup_file_id)
305
if not mapping.is_special_file(name):
306
subinvdelta = import_git_blob(texts, mapping, child_path, name,
307
(child_base_hexsha, child_hexsha), base_inv, file_id,
308
revision_id, parent_invs, lookup_object,
309
(child_base_mode, child_mode), store_updater, lookup_file_id)
313
child_modes.update(grandchildmodes)
314
invdelta.extend(subinvdelta)
315
if child_mode not in (stat.S_IFDIR, DEFAULT_FILE_MODE,
316
stat.S_IFLNK, DEFAULT_FILE_MODE|0111,
318
child_modes[child_path] = child_mode
319
# Remove any children that have disappeared
320
if base_tree is not None and type(base_tree) is Tree:
321
invdelta.extend(remove_disappeared_children(base_inv, old_path,
322
base_tree, existing_children, lookup_object))
323
store_updater.add_object(tree, ie, path)
324
return invdelta, child_modes
327
def verify_commit_reconstruction(target_git_object_retriever, lookup_object,
328
o, rev, ret_tree, parent_trees, mapping, unusual_modes, verifiers):
329
new_unusual_modes = mapping.export_unusual_file_modes(rev)
330
if new_unusual_modes != unusual_modes:
331
raise AssertionError("unusual modes don't match: %r != %r" % (
332
unusual_modes, new_unusual_modes))
333
# Verify that we can reconstruct the commit properly
334
rec_o = target_git_object_retriever._reconstruct_commit(rev, o.tree, True,
337
raise AssertionError("Reconstructed commit differs: %r != %r" % (
341
for path, obj, ie in _tree_to_objects(ret_tree, parent_trees,
342
target_git_object_retriever._cache.idmap, unusual_modes,
343
mapping.BZR_DUMMY_FILE):
344
old_obj_id = tree_lookup_path(lookup_object, o.tree, path)[1]
346
if obj.id != old_obj_id:
347
diff.append((path, lookup_object(old_obj_id), obj))
348
for (path, old_obj, new_obj) in diff:
349
while (old_obj.type_name == "tree" and
350
new_obj.type_name == "tree" and
351
sorted(old_obj) == sorted(new_obj)):
353
if old_obj[name][0] != new_obj[name][0]:
354
raise AssertionError("Modes for %s differ: %o != %o" %
355
(path, old_obj[name][0], new_obj[name][0]))
356
if old_obj[name][1] != new_obj[name][1]:
357
# Found a differing child, delve deeper
358
path = posixpath.join(path, name)
359
old_obj = lookup_object(old_obj[name][1])
360
new_obj = new_objs[path]
362
raise AssertionError("objects differ for %s: %r != %r" % (path,
366
def ensure_inventories_in_repo(repo, trees):
367
real_inv_vf = repo.inventories.without_fallbacks()
369
revid = t.get_revision_id()
370
if not real_inv_vf.get_parent_map([(revid, )]):
371
repo.add_inventory(revid, t.inventory, t.get_parent_ids())
374
def import_git_commit(repo, mapping, head, lookup_object,
375
target_git_object_retriever, trees_cache):
376
o = lookup_object(head)
377
# Note that this uses mapping.revision_id_foreign_to_bzr. If the parents
378
# were bzr roundtripped revisions they would be specified in the
380
rev, roundtrip_revid, verifiers = mapping.import_commit(
381
o, mapping.revision_id_foreign_to_bzr)
382
if roundtrip_revid is not None:
383
original_revid = rev.revision_id
384
rev.revision_id = roundtrip_revid
385
# We have to do this here, since we have to walk the tree and
386
# we need to make sure to import the blobs / trees with the right
387
# path; this may involve adding them more than once.
388
parent_trees = trees_cache.revision_trees(rev.parent_ids)
389
ensure_inventories_in_repo(repo, parent_trees)
390
if parent_trees == []:
391
base_inv = Inventory(root_id=None)
395
base_inv = parent_trees[0].inventory
396
base_tree = lookup_object(o.parents[0]).tree
397
base_mode = stat.S_IFDIR
398
store_updater = target_git_object_retriever._get_updater(rev)
399
tree_supplement = mapping.get_fileid_map(lookup_object, o.tree)
400
inv_delta, unusual_modes = import_git_tree(repo.texts,
401
mapping, "", "", (base_tree, o.tree), base_inv,
402
None, rev.revision_id, [p.inventory for p in parent_trees],
403
lookup_object, (base_mode, stat.S_IFDIR), store_updater,
404
tree_supplement.lookup_file_id,
405
allow_submodules=getattr(repo._format, "supports_tree_reference",
407
if unusual_modes != {}:
408
for path, mode in unusual_modes.iteritems():
409
warn_unusual_mode(rev.foreign_revid, path, mode)
410
mapping.import_unusual_file_modes(rev, unusual_modes)
412
basis_id = rev.parent_ids[0]
414
basis_id = NULL_REVISION
416
rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
417
inv_delta, rev.revision_id, rev.parent_ids, base_inv)
418
ret_tree = InventoryRevisionTree(repo, inv, rev.revision_id)
420
if verifiers and roundtrip_revid is not None:
421
if getattr(StrictTestament3, "from_revision_tree", None):
422
testament = StrictTestament3(rev, ret_tree)
424
testament = StrictTestament3(rev, inv)
425
calculated_verifiers = { "testament3-sha1": testament.as_sha1() }
426
if calculated_verifiers != verifiers:
427
trace.mutter("Testament SHA1 %r for %r did not match %r.",
428
calculated_verifiers["testament3-sha1"],
429
rev.revision_id, verifiers["testament3-sha1"])
430
rev.revision_id = original_revid
431
rev.inventory_sha1, inv = repo.add_inventory_by_delta(basis_id,
432
inv_delta, rev.revision_id, rev.parent_ids, base_inv)
433
ret_tree = InventoryRevisionTree(repo, inv, rev.revision_id)
435
calculated_verifiers = {}
436
store_updater.add_object(o, calculated_verifiers, None)
437
store_updater.finish()
438
trees_cache.add(ret_tree)
439
repo.add_revision(rev.revision_id, rev)
440
if "verify" in debug.debug_flags:
441
verify_commit_reconstruction(target_git_object_retriever,
442
lookup_object, o, rev, ret_tree, parent_trees, mapping,
443
unusual_modes, verifiers)
446
def import_git_objects(repo, mapping, object_iter,
447
target_git_object_retriever, heads, pb=None, limit=None):
448
"""Import a set of git objects into a bzr repository.
450
:param repo: Target Bazaar repository
451
:param mapping: Mapping to use
452
:param object_iter: Iterator over Git objects.
453
:return: Tuple with pack hints and last imported revision id
455
def lookup_object(sha):
457
return object_iter[sha]
459
return target_git_object_retriever[sha]
462
heads = list(set(heads))
463
trees_cache = LRUTreeCache(repo)
464
# Find and convert commit objects
467
pb.update("finding revisions to fetch", len(graph), None)
471
assert isinstance(head, str), "head is %r" % (head,)
473
o = lookup_object(head)
476
if isinstance(o, Commit):
477
rev, roundtrip_revid, verifiers = mapping.import_commit(o,
478
mapping.revision_id_foreign_to_bzr)
479
if (repo.has_revision(rev.revision_id) or
480
(roundtrip_revid and repo.has_revision(roundtrip_revid))):
482
graph.append((o.id, o.parents))
483
heads.extend([p for p in o.parents if p not in checked])
484
elif isinstance(o, Tag):
485
if o.object[1] not in checked:
486
heads.append(o.object[1])
488
trace.warning("Unable to import head object %r" % o)
491
# Order the revisions
492
# Create the inventory objects
494
revision_ids = topo_sort(graph)
496
if limit is not None:
497
revision_ids = revision_ids[:limit]
499
for offset in range(0, len(revision_ids), batch_size):
500
target_git_object_retriever.start_write_group()
502
repo.start_write_group()
504
for i, head in enumerate(
505
revision_ids[offset:offset+batch_size]):
507
pb.update("fetching revisions", offset+i,
509
import_git_commit(repo, mapping, head, lookup_object,
510
target_git_object_retriever, trees_cache)
513
repo.abort_write_group()
516
hint = repo.commit_write_group()
518
pack_hints.extend(hint)
520
target_git_object_retriever.abort_write_group()
523
target_git_object_retriever.commit_write_group()
524
return pack_hints, last_imported
527
class InterFromGitRepository(InterRepository):
529
_matching_repo_format = GitRepositoryFormat()
531
def _target_has_shas(self, shas):
532
raise NotImplementedError(self._target_has_shas)
534
def get_determine_wants_heads(self, wants, include_tags=False):
536
def determine_wants(refs):
537
potential = set(wants)
540
[v[1] or v[0] for v in extract_tags(refs).itervalues()])
541
return list(potential - self._target_has_shas(potential))
542
return determine_wants
544
def determine_wants_all(self, refs):
545
potential = set([sha for (ref, sha) in refs.iteritems() if not
546
ref.endswith("^{}")])
547
return list(potential - self._target_has_shas(potential))
550
def _get_repo_format_to_test():
553
def copy_content(self, revision_id=None, pb=None):
554
"""See InterRepository.copy_content."""
555
self.fetch(revision_id, pb, find_ghosts=False)
557
def search_missing_revision_ids(self,
558
find_ghosts=True, revision_ids=None, if_present_ids=None,
563
todo.extend(revision_ids)
565
todo.extend(revision_ids)
566
for revid in revision_ids:
567
if revid == NULL_REVISION:
569
git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
570
git_shas.append(git_sha)
571
walker = Walker(self.source._git.object_store,
572
include=git_shas, exclude=[sha for sha in self.target.bzrdir.get_refs().values() if sha != ZERO_SHA])
573
missing_revids = set()
575
missing_revids.add(self.source.lookup_foreign_revision_id(entry.commit.id))
576
return self.source.revision_ids_to_search_result(missing_revids)
579
class InterGitNonGitRepository(InterFromGitRepository):
580
"""Base InterRepository that copies revisions from a Git into a non-Git
583
def _target_has_shas(self, shas):
587
revid = self.source.lookup_foreign_revision_id(sha)
588
except NotCommitError:
589
# Commit is definitely not present
593
return set([revids[r] for r in self.target.has_revisions(revids)])
595
def get_determine_wants_revids(self, revids, include_tags=False):
597
for revid in set(revids):
598
if self.target.has_revision(revid):
600
git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
602
return self.get_determine_wants_heads(wants,
603
include_tags=include_tags)
605
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
606
"""Fetch objects from a remote server.
608
:param determine_wants: determine_wants callback
609
:param mapping: BzrGitMapping to use
610
:param pb: Optional progress bar
611
:param limit: Maximum number of commits to import.
612
:return: Tuple with pack hint, last imported revision id and remote refs
614
raise NotImplementedError(self.fetch_objects)
616
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
617
mapping=None, fetch_spec=None):
619
mapping = self.source.get_mapping()
620
if revision_id is not None:
621
interesting_heads = [revision_id]
622
elif fetch_spec is not None:
623
recipe = fetch_spec.get_recipe()
624
if recipe[0] in ("search", "proxy-search"):
625
interesting_heads = recipe[1]
627
raise AssertionError("Unsupported search result type %s" %
630
interesting_heads = None
632
if interesting_heads is not None:
633
determine_wants = self.get_determine_wants_revids(
634
interesting_heads, include_tags=False)
636
determine_wants = self.determine_wants_all
638
(pack_hint, _, remote_refs) = self.fetch_objects(determine_wants,
640
if pack_hint is not None and self.target._format.pack_compresses:
641
self.target.pack(hint=pack_hint)
642
assert isinstance(remote_refs, dict)
646
_GIT_PROGRESS_RE = re.compile(r"(.*?): +(\d+)% \((\d+)/(\d+)\)")
647
def report_git_progress(pb, text):
648
text = text.rstrip("\r\n")
649
g = _GIT_PROGRESS_RE.match(text)
651
(text, pct, current, total) = g.groups()
652
pb.update(text, int(current), int(total))
654
pb.update(text, 0, 0)
657
class DetermineWantsRecorder(object):
659
def __init__(self, actual):
662
self.remote_refs = {}
664
def __call__(self, refs):
665
self.remote_refs = refs
666
self.wants = self.actual(refs)
670
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
671
"""InterRepository that copies revisions from a remote Git into a non-Git
674
def get_target_heads(self):
675
# FIXME: This should be more efficient
676
all_revs = self.target.all_revision_ids()
677
parent_map = self.target.get_parent_map(all_revs)
679
map(all_parents.update, parent_map.itervalues())
680
return set(all_revs) - all_parents
682
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
683
"""See `InterGitNonGitRepository`."""
685
report_git_progress(pb, text)
686
store = BazaarObjectStore(self.target, mapping)
689
heads = self.get_target_heads()
690
graph_walker = store.get_graph_walker(
691
[store._lookup_revision_sha1(head) for head in heads])
692
wants_recorder = DetermineWantsRecorder(determine_wants)
696
create_pb = pb = ui.ui_factory.nested_progress_bar()
698
objects_iter = self.source.fetch_objects(
699
wants_recorder, graph_walker, store.get_raw,
701
trace.mutter("Importing %d new revisions",
702
len(wants_recorder.wants))
703
(pack_hint, last_rev) = import_git_objects(self.target,
704
mapping, objects_iter, store, wants_recorder.wants, pb,
706
return (pack_hint, last_rev, wants_recorder.remote_refs)
714
def is_compatible(source, target):
715
"""Be compatible with GitRepository."""
716
if not isinstance(source, RemoteGitRepository):
718
if not target.supports_rich_root():
720
if isinstance(target, GitRepository):
722
if not getattr(target._format, "supports_full_versioned_files", True):
727
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
728
"""InterRepository that copies revisions from a local Git into a non-Git
731
def fetch_objects(self, determine_wants, mapping, pb=None, limit=None):
732
"""See `InterGitNonGitRepository`."""
733
remote_refs = self.source.bzrdir.get_refs()
734
wants = determine_wants(remote_refs)
737
create_pb = pb = ui.ui_factory.nested_progress_bar()
738
target_git_object_retriever = BazaarObjectStore(self.target, mapping)
740
target_git_object_retriever.lock_write()
742
(pack_hint, last_rev) = import_git_objects(self.target,
743
mapping, self.source._git.object_store,
744
target_git_object_retriever, wants, pb, limit)
745
return (pack_hint, last_rev, remote_refs)
747
target_git_object_retriever.unlock()
753
def is_compatible(source, target):
754
"""Be compatible with GitRepository."""
755
if not isinstance(source, LocalGitRepository):
757
if not target.supports_rich_root():
759
if isinstance(target, GitRepository):
761
if not getattr(target._format, "supports_full_versioned_files", True):
766
class InterGitGitRepository(InterFromGitRepository):
767
"""InterRepository that copies between Git repositories."""
769
def fetch_refs(self, update_refs, lossy=False):
771
raise errors.LossyPushToSameVCS(self.source, self.target)
772
old_refs = self.target.bzrdir.get_refs()
774
def determine_wants(heads):
775
old_refs = dict([(k, (v, None)) for (k, v) in heads.iteritems()])
776
new_refs = update_refs(old_refs)
777
ref_changes.update(new_refs)
778
return [sha1 for (sha1, bzr_revid) in new_refs.itervalues()]
779
self.fetch_objects(determine_wants)
780
for k, (git_sha, bzr_revid) in ref_changes.iteritems():
781
self.target._git.refs[k] = git_sha
782
new_refs = self.target.bzrdir.get_refs()
783
return None, old_refs, new_refs
785
def fetch_objects(self, determine_wants, mapping=None, pb=None):
787
trace.note("git: %s", text)
788
graphwalker = self.target._git.get_graph_walker()
789
if (isinstance(self.source, LocalGitRepository) and
790
isinstance(self.target, LocalGitRepository)):
791
refs = self.source._git.fetch(self.target._git, determine_wants,
793
return (None, None, refs)
794
elif (isinstance(self.source, LocalGitRepository) and
795
isinstance(self.target, RemoteGitRepository)):
796
raise NotImplementedError
797
elif (isinstance(self.source, RemoteGitRepository) and
798
isinstance(self.target, LocalGitRepository)):
799
f, commit = self.target._git.object_store.add_pack()
801
refs = self.source.bzrdir.fetch_pack(
802
determine_wants, graphwalker, f.write, progress)
804
return (None, None, refs)
809
raise AssertionError("fetching between %r and %r not supported" %
810
(self.source, self.target))
812
def _target_has_shas(self, shas):
813
return set([sha for sha in shas if self.target._git.object_store])
815
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
816
mapping=None, fetch_spec=None, branches=None):
818
mapping = self.source.get_mapping()
820
if revision_id is not None:
821
args = [self.source.lookup_bzr_revision_id(revision_id)[0]]
822
elif fetch_spec is not None:
823
recipe = fetch_spec.get_recipe()
824
if recipe[0] in ("search", "proxy-search"):
827
raise AssertionError(
828
"Unsupported search result type %s" % recipe[0])
829
args = [self.source.lookup_bzr_revision_id(revid)[0] for revid in heads]
830
if branches is not None:
831
determine_wants = lambda x: [x[y] for y in branches if not x[y] in r.object_store and x[y] != ZERO_SHA]
832
elif fetch_spec is None and revision_id is None:
833
determine_wants = self.determine_wants_all
835
determine_wants = lambda x: [y for y in args if not y in r.object_store and y != ZERO_SHA]
836
wants_recorder = DetermineWantsRecorder(determine_wants)
837
self.fetch_objects(wants_recorder, mapping)
838
return wants_recorder.remote_refs
841
def is_compatible(source, target):
842
"""Be compatible with GitRepository."""
843
return (isinstance(source, GitRepository) and
844
isinstance(target, GitRepository))
846
def get_determine_wants_revids(self, revids, include_tags=False):
848
for revid in set(revids):
849
if self.target.has_revision(revid):
851
git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
853
return self.get_determine_wants_heads(wants,
854
include_tags=include_tags)
added
removed
fetch.py
