1
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
"""InterRepository operations."""
19
from __future__ import absolute_import
21
from io import BytesIO
24
from dulwich.errors import (
27
from dulwich.object_store import (
28
ObjectStoreGraphWalker,
30
from dulwich.protocol import (
34
from dulwich.refs import (
38
from dulwich.walk import Walker
40
from ..errors import (
42
FetchLimitUnsupported,
45
NoRoundtrippingSupport,
48
from ..repository import (
52
from ..revision import (
55
from ..sixish import (
70
DetermineWantsRecorder,
72
from .mapping import (
75
from .object_store import (
79
MissingObjectsIterator,
85
from .repository import (
93
from .unpeel_map import (
98
class InterToGitRepository(InterRepository):
99
"""InterRepository that copies into a Git repository."""
101
_matching_repo_format = GitRepositoryFormat()
103
def __init__(self, source, target):
104
super(InterToGitRepository, self).__init__(source, target)
105
self.mapping = self.target.get_mapping()
106
self.source_store = get_object_store(self.source, self.mapping)
109
def _get_repo_format_to_test():
112
def copy_content(self, revision_id=None, pb=None):
113
"""See InterRepository.copy_content."""
114
self.fetch(revision_id, pb, find_ghosts=False)
116
def fetch_refs(self, update_refs, lossy, overwrite=False):
117
"""Fetch possibly roundtripped revisions into the target repository
120
:param update_refs: Generate refs to fetch. Receives dictionary
121
with old refs (git shas), returns dictionary of new names to
123
:param lossy: Whether to roundtrip
124
:return: old refs, new refs
126
raise NotImplementedError(self.fetch_refs)
128
def search_missing_revision_ids(self,
129
find_ghosts=True, revision_ids=None,
130
if_present_ids=None, limit=None):
131
if limit is not None:
132
raise FetchLimitUnsupported(self)
136
todo.extend(revision_ids)
138
todo.extend(revision_ids)
139
with self.source_store.lock_read():
140
for revid in revision_ids:
141
if revid == NULL_REVISION:
144
git_sha = self.source_store._lookup_revision_sha1(revid)
146
raise NoSuchRevision(revid, self.source)
147
git_shas.append(git_sha)
152
sha for sha in self.target.controldir.get_refs_container().as_dict().values()
154
missing_revids = set()
156
for (kind, type_data) in self.source_store.lookup_git_sha(
159
missing_revids.add(type_data[0])
160
return self.source.revision_ids_to_search_result(missing_revids)
162
def _warn_slow(self):
163
if not config.GlobalConfig().suppress_warning('slow_intervcs_push'):
165
'Pushing from a Bazaar to a Git repository. '
166
'For better performance, push into a Bazaar repository.')
169
class InterToLocalGitRepository(InterToGitRepository):
170
"""InterBranch implementation between a Bazaar and a Git repository."""
172
def __init__(self, source, target):
173
super(InterToLocalGitRepository, self).__init__(source, target)
174
self.target_store = self.target.controldir._git.object_store
175
self.target_refs = self.target.controldir._git.refs
177
def _commit_needs_fetching(self, sha_id):
179
return (sha_id not in self.target_store)
180
except NoSuchRevision:
184
def _revision_needs_fetching(self, sha_id, revid):
185
if revid == NULL_REVISION:
189
sha_id = self.source_store._lookup_revision_sha1(revid)
192
return self._commit_needs_fetching(sha_id)
194
def missing_revisions(self, stop_revisions):
195
"""Find the revisions that are missing from the target repository.
197
:param stop_revisions: Revisions to check for (tuples with
199
:return: sequence of missing revisions, in topological order
200
:raise: NoSuchRevision if the stop_revisions are not present in
205
for (sha1, revid) in stop_revisions:
206
if sha1 is not None and revid is not None:
207
revid_sha_map[revid] = sha1
208
stop_revids.append(revid)
209
elif sha1 is not None:
210
if self._commit_needs_fetching(sha1):
211
for (kind, (revid, tree_sha, verifiers)) in self.source_store.lookup_git_sha(sha1):
212
revid_sha_map[revid] = sha1
213
stop_revids.append(revid)
217
stop_revids.append(revid)
219
graph = self.source.get_graph()
220
with ui.ui_factory.nested_progress_bar() as pb:
223
for revid in stop_revids:
224
sha1 = revid_sha_map.get(revid)
225
if (revid not in missing and
226
self._revision_needs_fetching(sha1, revid)):
228
new_stop_revids.append(revid)
230
parent_map = graph.get_parent_map(new_stop_revids)
231
for parent_revids in viewvalues(parent_map):
232
stop_revids.update(parent_revids)
233
pb.update("determining revisions to fetch", len(missing))
234
return graph.iter_topo_order(missing)
236
def _get_target_bzr_refs(self):
237
"""Return a dictionary with references.
239
:return: Dictionary with reference names as keys and tuples
240
with Git SHA, Bazaar revid as values.
243
for k in self.target._git.refs.allkeys():
245
v = self.target._git.refs.read_ref(k)
250
if not v.startswith(SYMREF):
252
for (kind, type_data) in self.source_store.lookup_git_sha(
254
if kind == "commit" and self.source.has_revision(
260
bzr_refs[k] = (v, revid)
263
def fetch_refs(self, update_refs, lossy, overwrite=False):
266
with self.source_store.lock_read():
267
old_refs = self._get_target_bzr_refs()
268
new_refs = update_refs(old_refs)
269
revidmap = self.fetch_objects(
270
[(git_sha, bzr_revid)
271
for (git_sha, bzr_revid) in new_refs.values()
272
if git_sha is None or not git_sha.startswith(SYMREF)],
274
for name, (gitid, revid) in viewitems(new_refs):
277
gitid = revidmap[revid][0]
279
gitid = self.source_store._lookup_revision_sha1(revid)
280
if gitid.startswith(SYMREF):
281
self.target_refs.set_symbolic_ref(
282
name, gitid[len(SYMREF):])
285
old_git_id = old_refs[name][0]
287
self.target_refs.add_if_new(name, gitid)
289
self.target_refs.set_if_equals(name, old_git_id, gitid)
290
result_refs[name] = (gitid, revid if not lossy else self.mapping.revision_id_foreign_to_bzr(gitid))
291
return revidmap, old_refs, result_refs
293
def fetch_objects(self, revs, lossy, limit=None):
294
if not lossy and not self.mapping.roundtripping:
295
for git_sha, bzr_revid in revs:
296
if (bzr_revid is not None and
297
needs_roundtripping(self.source, bzr_revid)):
298
raise NoPushSupport(self.source, self.target, self.mapping,
300
with self.source_store.lock_read():
301
todo = list(self.missing_revisions(revs))[:limit]
303
with ui.ui_factory.nested_progress_bar() as pb:
304
object_generator = MissingObjectsIterator(
305
self.source_store, self.source, pb)
306
for (old_revid, git_sha) in object_generator.import_revisions(
309
new_revid = self.mapping.revision_id_foreign_to_bzr(
312
new_revid = old_revid
314
self.mapping.revision_id_bzr_to_foreign(old_revid)
315
except InvalidRevisionId:
316
refname = self.mapping.revid_as_refname(old_revid)
317
self.target_refs[refname] = git_sha
318
revidmap[old_revid] = (git_sha, new_revid)
319
self.target_store.add_objects(object_generator)
322
def fetch(self, revision_id=None, pb=None, find_ghosts=False,
323
fetch_spec=None, mapped_refs=None, lossy=False):
324
if mapped_refs is not None:
325
stop_revisions = mapped_refs
326
elif revision_id is not None:
327
stop_revisions = [(None, revision_id)]
328
elif fetch_spec is not None:
329
recipe = fetch_spec.get_recipe()
330
if recipe[0] in ("search", "proxy-search"):
331
stop_revisions = [(None, revid) for revid in recipe[1]]
333
raise AssertionError(
334
"Unsupported search result type %s" % recipe[0])
336
stop_revisions = [(None, revid)
337
for revid in self.source.all_revision_ids()]
340
revidmap = self.fetch_objects(stop_revisions, lossy=lossy)
341
except NoPushSupport:
342
raise NoRoundtrippingSupport(self.source, self.target)
343
return FetchResult(revidmap)
346
def is_compatible(source, target):
347
"""Be compatible with GitRepository."""
348
return (not isinstance(source, GitRepository) and
349
isinstance(target, LocalGitRepository))
352
class InterToRemoteGitRepository(InterToGitRepository):
354
def fetch_refs(self, update_refs, lossy, overwrite=False):
355
"""Import the gist of the ancestry of a particular revision."""
356
if not lossy and not self.mapping.roundtripping:
357
raise NoPushSupport(self.source, self.target, self.mapping)
358
unpeel_map = UnpeelMap.from_repository(self.source)
361
def git_update_refs(old_refs):
364
k: (v, None) for (k, v) in viewitems(old_refs)}
365
new_refs = update_refs(self.old_refs)
366
for name, (gitid, revid) in viewitems(new_refs):
368
git_sha = self.source_store._lookup_revision_sha1(revid)
369
gitid = unpeel_map.re_unpeel_tag(
370
git_sha, old_refs.get(name))
372
if remote_divergence(
373
old_refs.get(name), gitid, self.source_store):
374
raise DivergedBranches(self.source, self.target)
378
with self.source_store.lock_read():
379
new_refs = self.target.send_pack(
380
git_update_refs, self.source_store.generate_lossy_pack_data)
382
return revidmap, self.old_refs, new_refs
385
def is_compatible(source, target):
386
"""Be compatible with GitRepository."""
387
return (not isinstance(source, GitRepository) and
388
isinstance(target, RemoteGitRepository))
391
class GitSearchResult(object):
393
def __init__(self, start, exclude, keys):
395
self._exclude = exclude
401
def get_recipe(self):
402
return ('search', self._start, self._exclude, len(self._keys))
405
class InterFromGitRepository(InterRepository):
407
_matching_repo_format = GitRepositoryFormat()
409
def _target_has_shas(self, shas):
410
raise NotImplementedError(self._target_has_shas)
412
def get_determine_wants_heads(self, wants, include_tags=False):
415
def determine_wants(refs):
417
for k, v in viewitems(refs):
418
if k.endswith(ANNOTATED_TAG_SUFFIX):
419
unpeel_lookup[v] = refs[k[:-len(ANNOTATED_TAG_SUFFIX)]]
420
potential = set([unpeel_lookup.get(w, w) for w in wants])
422
for k, sha in viewitems(refs):
423
if k.endswith(ANNOTATED_TAG_SUFFIX):
430
return list(potential - self._target_has_shas(potential))
431
return determine_wants
433
def determine_wants_all(self, refs):
434
raise NotImplementedError(self.determine_wants_all)
437
def _get_repo_format_to_test():
440
def copy_content(self, revision_id=None):
441
"""See InterRepository.copy_content."""
442
self.fetch(revision_id, find_ghosts=False)
444
def search_missing_revision_ids(self,
445
find_ghosts=True, revision_ids=None,
446
if_present_ids=None, limit=None):
447
if limit is not None:
448
raise FetchLimitUnsupported(self)
449
if revision_ids is None and if_present_ids is None:
450
todo = set(self.source.all_revision_ids())
453
if revision_ids is not None:
454
for revid in revision_ids:
455
if not self.source.has_revision(revid):
456
raise NoSuchRevision(revid, self.source)
457
todo.update(revision_ids)
458
if if_present_ids is not None:
459
todo.update(if_present_ids)
460
result_set = todo.difference(self.target.all_revision_ids())
461
result_parents = set(itertools.chain.from_iterable(viewvalues(
462
self.source.get_graph().get_parent_map(result_set))))
463
included_keys = result_set.intersection(result_parents)
464
start_keys = result_set.difference(included_keys)
465
exclude_keys = result_parents.difference(result_set)
466
return GitSearchResult(start_keys, exclude_keys, result_set)
469
class InterGitNonGitRepository(InterFromGitRepository):
470
"""Base InterRepository that copies revisions from a Git into a non-Git
473
def _target_has_shas(self, shas):
477
revid = self.source.lookup_foreign_revision_id(sha)
478
except NotCommitError:
479
# Commit is definitely not present
483
return set([revids[r] for r in self.target.has_revisions(revids)])
485
def determine_wants_all(self, refs):
487
for k, v in viewitems(refs):
488
# For non-git target repositories, only worry about peeled
491
potential.add(self.source.controldir.get_peeled(k) or v)
492
return list(potential - self._target_has_shas(potential))
494
def _warn_slow(self):
495
if not config.GlobalConfig().suppress_warning('slow_intervcs_push'):
497
'Fetching from Git to Bazaar repository. '
498
'For better performance, fetch into a Git repository.')
500
def fetch_objects(self, determine_wants, mapping, limit=None, lossy=False):
501
"""Fetch objects from a remote server.
503
:param determine_wants: determine_wants callback
504
:param mapping: BzrGitMapping to use
505
:param limit: Maximum number of commits to import.
506
:return: Tuple with pack hint, last imported revision id and remote
509
raise NotImplementedError(self.fetch_objects)
511
def get_determine_wants_revids(self, revids, include_tags=False):
513
for revid in set(revids):
514
if self.target.has_revision(revid):
516
git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
518
return self.get_determine_wants_heads(wants, include_tags=include_tags)
520
def fetch(self, revision_id=None, find_ghosts=False,
521
mapping=None, fetch_spec=None, include_tags=False, lossy=False):
523
mapping = self.source.get_mapping()
524
if revision_id is not None:
525
interesting_heads = [revision_id]
526
elif fetch_spec is not None:
527
recipe = fetch_spec.get_recipe()
528
if recipe[0] in ("search", "proxy-search"):
529
interesting_heads = recipe[1]
531
raise AssertionError("Unsupported search result type %s" %
534
interesting_heads = None
536
if interesting_heads is not None:
537
determine_wants = self.get_determine_wants_revids(
538
interesting_heads, include_tags=include_tags)
540
determine_wants = self.determine_wants_all
542
(pack_hint, _, remote_refs) = self.fetch_objects(
543
determine_wants, mapping, lossy=lossy)
544
if pack_hint is not None and self.target._format.pack_compresses:
545
self.target.pack(hint=pack_hint)
546
result = FetchResult()
547
result.refs = remote_refs
551
class InterRemoteGitNonGitRepository(InterGitNonGitRepository):
552
"""InterRepository that copies revisions from a remote Git into a non-Git
555
def get_target_heads(self):
556
# FIXME: This should be more efficient
557
all_revs = self.target.all_revision_ids()
558
parent_map = self.target.get_parent_map(all_revs)
560
for values in viewvalues(parent_map):
561
all_parents.update(values)
562
return set(all_revs) - all_parents
564
def fetch_objects(self, determine_wants, mapping, limit=None, lossy=False):
565
"""See `InterGitNonGitRepository`."""
567
store = get_object_store(self.target, mapping)
568
with store.lock_write():
569
heads = self.get_target_heads()
570
graph_walker = ObjectStoreGraphWalker(
571
[store._lookup_revision_sha1(head) for head in heads],
572
lambda sha: store[sha].parents)
573
wants_recorder = DetermineWantsRecorder(determine_wants)
575
with ui.ui_factory.nested_progress_bar() as pb:
576
objects_iter = self.source.fetch_objects(
577
wants_recorder, graph_walker, store.get_raw)
578
trace.mutter("Importing %d new revisions",
579
len(wants_recorder.wants))
580
(pack_hint, last_rev) = import_git_objects(
581
self.target, mapping, objects_iter, store,
582
wants_recorder.wants, pb, limit)
583
return (pack_hint, last_rev, wants_recorder.remote_refs)
586
def is_compatible(source, target):
587
"""Be compatible with GitRepository."""
588
if not isinstance(source, RemoteGitRepository):
590
if not target.supports_rich_root():
592
if isinstance(target, GitRepository):
594
if not getattr(target._format, "supports_full_versioned_files", True):
599
class InterLocalGitNonGitRepository(InterGitNonGitRepository):
600
"""InterRepository that copies revisions from a local Git into a non-Git
603
def fetch_objects(self, determine_wants, mapping, limit=None, lossy=False):
604
"""See `InterGitNonGitRepository`."""
606
remote_refs = self.source.controldir.get_refs_container().as_dict()
607
wants = determine_wants(remote_refs)
608
target_git_object_retriever = get_object_store(self.target, mapping)
609
with ui.ui_factory.nested_progress_bar() as pb:
610
target_git_object_retriever.lock_write()
612
(pack_hint, last_rev) = import_git_objects(
613
self.target, mapping, self.source._git.object_store,
614
target_git_object_retriever, wants, pb, limit)
615
return (pack_hint, last_rev, remote_refs)
617
target_git_object_retriever.unlock()
620
def is_compatible(source, target):
621
"""Be compatible with GitRepository."""
622
if not isinstance(source, LocalGitRepository):
624
if not target.supports_rich_root():
626
if isinstance(target, GitRepository):
628
if not getattr(target._format, "supports_full_versioned_files", True):
633
class InterGitGitRepository(InterFromGitRepository):
634
"""InterRepository that copies between Git repositories."""
636
def fetch_refs(self, update_refs, lossy, overwrite=False):
638
raise LossyPushToSameVCS(self.source, self.target)
639
old_refs = self.target.controldir.get_refs_container()
642
def determine_wants(heads):
643
old_refs = dict([(k, (v, None))
644
for (k, v) in viewitems(heads.as_dict())])
645
new_refs = update_refs(old_refs)
646
ref_changes.update(new_refs)
647
return [sha1 for (sha1, bzr_revid) in viewvalues(new_refs)]
648
self.fetch_objects(determine_wants, lossy=lossy)
649
for k, (git_sha, bzr_revid) in viewitems(ref_changes):
650
self.target._git.refs[k] = git_sha
651
new_refs = self.target.controldir.get_refs_container()
652
return None, old_refs, new_refs
654
def fetch_objects(self, determine_wants, mapping=None, limit=None,
656
raise NotImplementedError(self.fetch_objects)
658
def _target_has_shas(self, shas):
660
[sha for sha in shas if sha in self.target._git.object_store])
662
def fetch(self, revision_id=None, find_ghosts=False,
663
mapping=None, fetch_spec=None, branches=None, limit=None,
664
include_tags=False, lossy=False):
666
mapping = self.source.get_mapping()
667
if revision_id is not None:
669
elif fetch_spec is not None:
670
recipe = fetch_spec.get_recipe()
671
if recipe[0] in ("search", "proxy-search"):
674
raise AssertionError(
675
"Unsupported search result type %s" % recipe[0])
677
if branches is not None:
678
determine_wants = self.get_determine_wants_branches(
679
branches, include_tags=include_tags)
680
elif fetch_spec is None and revision_id is None:
681
determine_wants = self.determine_wants_all
683
determine_wants = self.get_determine_wants_revids(
684
args, include_tags=include_tags)
685
wants_recorder = DetermineWantsRecorder(determine_wants)
686
self.fetch_objects(wants_recorder, mapping, limit=limit, lossy=lossy)
687
result = FetchResult()
688
result.refs = wants_recorder.remote_refs
691
def get_determine_wants_revids(self, revids, include_tags=False):
693
for revid in set(revids):
694
if revid == NULL_REVISION:
696
git_sha, mapping = self.source.lookup_bzr_revision_id(revid)
698
return self.get_determine_wants_heads(wants, include_tags=include_tags)
700
def get_determine_wants_branches(self, branches, include_tags=False):
701
def determine_wants(refs):
703
for name, value in viewitems(refs):
704
if value == ZERO_SHA:
707
if name.endswith(ANNOTATED_TAG_SUFFIX):
710
if name in branches or (include_tags and is_tag(name)):
713
return determine_wants
715
def determine_wants_all(self, refs):
717
v for k, v in refs.items()
718
if not v == ZERO_SHA and not k.endswith(ANNOTATED_TAG_SUFFIX)])
719
return list(potential - self._target_has_shas(potential))
722
class InterLocalGitLocalGitRepository(InterGitGitRepository):
724
def fetch_objects(self, determine_wants, mapping=None, limit=None,
727
raise LossyPushToSameVCS(self.source, self.target)
728
if limit is not None:
729
raise FetchLimitUnsupported(self)
730
from .remote import DefaultProgressReporter
731
with ui.ui_factory.nested_progress_bar() as pb:
732
progress = DefaultProgressReporter(pb).progress
733
refs = self.source._git.fetch(
734
self.target._git, determine_wants,
736
return (None, None, refs)
739
def is_compatible(source, target):
740
"""Be compatible with GitRepository."""
741
return (isinstance(source, LocalGitRepository) and
742
isinstance(target, LocalGitRepository))
745
class InterRemoteGitLocalGitRepository(InterGitGitRepository):
747
def fetch_objects(self, determine_wants, mapping=None, limit=None,
750
raise LossyPushToSameVCS(self.source, self.target)
751
if limit is not None:
752
raise FetchLimitUnsupported(self)
753
graphwalker = self.target._git.get_graph_walker()
754
if (CAPABILITY_THIN_PACK in
755
self.source.controldir._client._fetch_capabilities):
756
# TODO(jelmer): Avoid reading entire file into memory and
757
# only processing it after the whole file has been fetched.
763
self.target._git.object_store.move_in_thin_pack(f)
768
f, commit, abort = self.target._git.object_store.add_pack()
770
refs = self.source.controldir.fetch_pack(
771
determine_wants, graphwalker, f.write)
773
return (None, None, refs)
774
except BaseException:
779
def is_compatible(source, target):
780
"""Be compatible with GitRepository."""
781
return (isinstance(source, RemoteGitRepository) and
782
isinstance(target, LocalGitRepository))
added
removed
breezy/git/interrepo.py
