20
21
that has merged into it. As the first step of a merge, pull, or
21
22
branch operation we copy history from the source into the destination
25
The copying is done in a slightly complicated order. We don't want to
26
add a revision to the store until everything it refers to is also
27
stored, so that if a revision is present we can totally recreate it.
28
However, we can't know what files are included in a revision until we
29
read its inventory. So we query the inventory store of the source for
30
the ids we need, and then pull those ids and finally actually join
25
from __future__ import absolute_import
29
from ..lazy_import import lazy_import
30
lazy_import(globals(), """
34
from breezy.bzr import (
43
from ..i18n import gettext
44
from ..revision import NULL_REVISION
45
from ..sixish import (
48
from ..trace import mutter
35
import bzrlib.errors as errors
36
from bzrlib.errors import (InstallFailed, NoSuchRevision,
38
from bzrlib.trace import mutter
39
from bzrlib.progress import ProgressBar, ProgressPhase
40
from bzrlib.reconcile import RepoReconciler
41
from bzrlib.revision import NULL_REVISION
42
from bzrlib.symbol_versioning import *
45
# TODO: Avoid repeatedly opening weaves so many times.
47
# XXX: This doesn't handle ghost (not present in branch) revisions at
48
# all yet. I'm not sure they really should be supported.
50
# NOTE: This doesn't copy revisions which may be present but not
51
# merged into the last revision. I'm not sure we want to do that.
53
# - get a list of revisions that need to be pulled in
54
# - for each one, pull in that revision file
55
# and get the inventory, and store the inventory with right
57
# - and get the ancestry, and store that with right parents too
58
# - and keep a note of all file ids and version seen
59
# - then go through all files; for each one get the weave,
60
# and add in all file versions
63
@deprecated_function(zero_eight)
64
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
65
"""Legacy API, please see branch.fetch(from_branch, last_revision, pb)."""
66
f = Fetcher(to_branch, from_branch, revision, pb)
67
return f.count_copied, f.failed_revisions
51
72
class RepoFetcher(object):
52
73
"""Pull revisions and texts from one repository to another.
54
This should not be used directly, it's essential a object to encapsulate
76
if set, try to limit to the data this revision references.
79
count_copied -- number of revisions copied
81
This should not be used directory, its essential a object to encapsulate
55
82
the logic in InterRepository.fetch().
58
def __init__(self, to_repository, from_repository, last_revision=None,
59
find_ghosts=True, fetch_spec=None):
60
"""Create a repo fetcher.
62
:param last_revision: If set, try to limit to the data this revision
64
:param fetch_spec: A SearchResult specifying which revisions to fetch.
65
If set, this overrides last_revision.
66
:param find_ghosts: If True search the entire history for ghosts.
68
# repository.fetch has the responsibility for short-circuiting
69
# attempts to copy between a repository and itself.
84
def __init__(self, to_repository, from_repository, last_revision=None, pb=None):
86
self.failed_revisions = []
88
if to_repository.control_files._transport.base == from_repository.control_files._transport.base:
89
# check that last_revision is in 'from' and then return a no-operation.
90
if last_revision not in (None, NULL_REVISION):
91
from_repository.get_revision(last_revision)
70
93
self.to_repository = to_repository
71
94
self.from_repository = from_repository
72
self.sink = to_repository._get_sink()
73
95
# must not mutate self._last_revision as its potentially a shared instance
74
96
self._last_revision = last_revision
75
self._fetch_spec = fetch_spec
76
self.find_ghosts = find_ghosts
77
with self.from_repository.lock_read():
78
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
79
str(self.from_repository), str(self.from_repository._format),
80
str(self.to_repository), str(self.to_repository._format))
98
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
99
self.nested_pb = self.pb
102
self.nested_pb = None
103
self.from_repository.lock_read()
105
self.to_repository.lock_write()
109
if self.nested_pb is not None:
110
self.nested_pb.finished()
111
self.to_repository.unlock()
113
self.from_repository.unlock()
83
115
def __fetch(self):
84
116
"""Primary worker function.
86
This initialises all the needed variables, and then fetches the
118
This initialises all the needed variables, and then fetches the
87
119
requested revisions, finally clearing the progress bar.
89
# Roughly this is what we're aiming for fetch to become:
91
# missing = self.sink.insert_stream(self.source.get_stream(search))
93
# missing = self.sink.insert_stream(self.source.get_items(missing))
121
self.to_weaves = self.to_repository.weave_store
122
self.to_control = self.to_repository.control_weaves
123
self.from_weaves = self.from_repository.weave_store
124
self.from_control = self.from_repository.control_weaves
95
125
self.count_total = 0
96
126
self.file_ids_names = {}
97
with ui.ui_factory.nested_progress_bar() as pb:
98
pb.show_pct = pb.show_count = False
99
pb.update(gettext("Finding revisions"), 0, 2)
100
search_result = self._revids_to_fetch()
101
mutter('fetching: %s', str(search_result))
102
if search_result.is_empty():
104
pb.update(gettext("Fetching revisions"), 1, 2)
105
self._fetch_everything_for_search(search_result)
107
def _fetch_everything_for_search(self, search):
108
"""Fetch all data for the given set of revisions."""
109
# The first phase is "file". We pass the progress bar for it directly
110
# into item_keys_introduced_by, which has more information about how
111
# that phase is progressing than we do. Progress updates for the other
112
# phases are taken care of in this function.
113
# XXX: there should be a clear owner of the progress reporting. Perhaps
114
# item_keys_introduced_by should have a richer API than it does at the
115
# moment, so that it can feed the progress information back to this
117
if (self.from_repository._format.rich_root_data and
118
not self.to_repository._format.rich_root_data):
119
raise errors.IncompatibleRepositories(
120
self.from_repository, self.to_repository,
121
"different rich-root support")
122
with ui.ui_factory.nested_progress_bar() as pb:
123
pb.update("Get stream source")
124
source = self.from_repository._get_source(
125
self.to_repository._format)
126
stream = source.get_stream(search)
127
from_format = self.from_repository._format
128
pb.update("Inserting stream")
129
resume_tokens, missing_keys = self.sink.insert_stream(
130
stream, from_format, [])
132
pb.update("Missing keys")
133
stream = source.get_stream_for_missing_keys(missing_keys)
134
pb.update("Inserting missing keys")
135
resume_tokens, missing_keys = self.sink.insert_stream(
136
stream, from_format, resume_tokens)
138
raise AssertionError(
139
"second push failed to complete a fetch %r." % (
142
raise AssertionError(
143
"second push failed to commit the fetch %r." % (
145
pb.update("Finishing stream")
127
pp = ProgressPhase('fetch phase', 4, self.pb)
129
revs = self._revids_to_fetch()
133
self._fetch_weave_texts(revs)
135
self._fetch_inventory_weave(revs)
137
self._fetch_revision_texts(revs)
138
self.count_copied += len(revs)
148
142
def _revids_to_fetch(self):
149
"""Determines the exact revisions needed from self.from_repository to
150
install self._last_revision in self.to_repository.
152
:returns: A SearchResult of some sort. (Possibly a
153
PendingAncestryResult, EmptySearchResult, etc.)
155
if self._fetch_spec is not None:
156
# The fetch spec is already a concrete search result.
157
return self._fetch_spec
158
elif self._last_revision == NULL_REVISION:
159
# fetch_spec is None + last_revision is null => empty fetch.
143
mutter('fetch up to rev {%s}', self._last_revision)
144
if self._last_revision is NULL_REVISION:
160
145
# explicit limit of no revisions needed
161
return vf_search.EmptySearchResult()
162
elif self._last_revision is not None:
163
return vf_search.NotInOtherForRevs(self.to_repository,
164
self.from_repository, [
165
self._last_revision],
166
find_ghosts=self.find_ghosts).execute()
167
else: # self._last_revision is None:
168
return vf_search.EverythingNotInOther(self.to_repository,
169
self.from_repository,
170
find_ghosts=self.find_ghosts).execute()
173
class Inter1and2Helper(object):
174
"""Helper for operations that convert data from model 1 and 2
176
This is for use by fetchers and converters.
179
# This is a class variable so that the test suite can override it.
180
known_graph_threshold = 100
182
def __init__(self, source):
185
:param source: The repository data comes from
189
def iter_rev_trees(self, revs):
190
"""Iterate through RevisionTrees efficiently.
192
Additionally, the inventory's revision_id is set if unset.
194
Trees are retrieved in batches of 100, and then yielded in the order
197
:param revs: A list of revision ids
199
# In case that revs is not a list.
202
for tree in self.source.revision_trees(revs[:100]):
203
if tree.root_inventory.revision_id is None:
204
tree.root_inventory.revision_id = tree.get_revision_id()
208
def _find_root_ids(self, revs, parent_map, graph):
210
for tree in self.iter_rev_trees(revs):
211
root_id = tree.path2id('')
212
revision_id = tree.get_file_revision(u'')
213
revision_root[revision_id] = root_id
214
# Find out which parents we don't already know root ids for
215
parents = set(viewvalues(parent_map))
216
parents.difference_update(revision_root)
217
parents.discard(NULL_REVISION)
218
# Limit to revisions present in the versionedfile
219
parents = graph.get_parent_map(parents)
220
for tree in self.iter_rev_trees(parents):
221
root_id = tree.path2id('')
222
revision_root[tree.get_revision_id()] = root_id
225
def generate_root_texts(self, revs):
226
"""Generate VersionedFiles for all root ids.
228
:param revs: the revisions to include
230
graph = self.source.get_graph()
231
parent_map = graph.get_parent_map(revs)
232
rev_order = tsort.topo_sort(parent_map)
233
rev_id_to_root_id = self._find_root_ids(revs, parent_map, graph)
234
root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
236
# Guaranteed stable, this groups all the file id operations together
237
# retaining topological order within the revisions of a file id.
238
# File id splits and joins would invalidate this, but they don't exist
239
# yet, and are unlikely to in non-rich-root environments anyway.
240
root_id_order.sort(key=operator.itemgetter(0))
241
# Create a record stream containing the roots to create.
242
if len(revs) > self.known_graph_threshold:
243
graph = self.source.get_known_graph_ancestry(revs)
244
new_roots_stream = _new_root_data_stream(
245
root_id_order, rev_id_to_root_id, parent_map, self.source, graph)
246
return [('texts', new_roots_stream)]
249
def _new_root_data_stream(
250
root_keys_to_create, rev_id_to_root_id_map, parent_map, repo, graph=None):
251
"""Generate a texts substream of synthesised root entries.
253
Used in fetches that do rich-root upgrades.
255
:param root_keys_to_create: iterable of (root_id, rev_id) pairs describing
256
the root entries to create.
257
:param rev_id_to_root_id_map: dict of known rev_id -> root_id mappings for
258
calculating the parents. If a parent rev_id is not found here then it
259
will be recalculated.
260
:param parent_map: a parent map for all the revisions in
262
:param graph: a graph to use instead of repo.get_graph().
264
for root_key in root_keys_to_create:
265
root_id, rev_id = root_key
266
parent_keys = _parent_keys_for_root_version(
267
root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph)
268
yield versionedfile.ChunkedContentFactory(
269
root_key, parent_keys, None, [])
272
def _parent_keys_for_root_version(
273
root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph=None):
274
"""Get the parent keys for a given root id.
276
A helper function for _new_root_data_stream.
278
# Include direct parents of the revision, but only if they used the same
279
# root_id and are heads.
280
rev_parents = parent_map[rev_id]
282
for parent_id in rev_parents:
283
if parent_id == NULL_REVISION:
285
if parent_id not in rev_id_to_root_id_map:
286
# We probably didn't read this revision, go spend the extra effort
289
tree = repo.revision_tree(parent_id)
290
except errors.NoSuchRevision:
291
# Ghost, fill out rev_id_to_root_id in case we encounter this
293
# But set parent_root_id to None since we don't really know
294
parent_root_id = None
296
parent_root_id = tree.path2id('')
297
rev_id_to_root_id_map[parent_id] = None
299
# rev_id_to_root_id_map[parent_id] = parent_root_id
300
# memory consumption maybe?
302
parent_root_id = rev_id_to_root_id_map[parent_id]
303
if root_id == parent_root_id:
304
# With stacking we _might_ want to refer to a non-local revision,
305
# but this code path only applies when we have the full content
306
# available, so ghosts really are ghosts, not just the edge of
308
parent_ids.append(parent_id)
310
# root_id may be in the parent anyway.
312
tree = repo.revision_tree(parent_id)
313
except errors.NoSuchRevision:
314
# ghost, can't refer to it.
147
if (self._last_revision != None and
148
self.to_repository.has_revision(self._last_revision)):
152
return self.to_repository.missing_revision_ids(self.from_repository,
154
except errors.NoSuchRevision:
155
raise InstallFailed([self._last_revision])
157
def _fetch_weave_texts(self, revs):
158
texts_pb = bzrlib.ui.ui_factory.nested_progress_bar()
160
file_ids = self.from_repository.fileid_involved_by_set(revs)
162
num_file_ids = len(file_ids)
163
for file_id in file_ids:
164
texts_pb.update("fetch texts", count, num_file_ids)
166
to_weave = self.to_weaves.get_weave_or_empty(file_id,
167
self.to_repository.get_transaction())
168
from_weave = self.from_weaves.get_weave(file_id,
169
self.from_repository.get_transaction())
170
# we fetch all the texts, because texts do
171
# not reference anything, and its cheap enough
172
to_weave.join(from_weave)
176
def _fetch_inventory_weave(self, revs):
177
pb = bzrlib.ui.ui_factory.nested_progress_bar()
179
pb.update("fetch inventory", 0, 2)
180
to_weave = self.to_control.get_weave('inventory',
181
self.to_repository.get_transaction())
183
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
185
# just merge, this is optimisable and its means we dont
186
# copy unreferenced data such as not-needed inventories.
187
pb.update("fetch inventory", 1, 3)
188
from_weave = self.from_repository.get_inventory_weave()
189
pb.update("fetch inventory", 2, 3)
190
# we fetch only the referenced inventories because we do not
191
# know for unselected inventories whether all their required
192
# texts are present in the other repository - it could be
194
to_weave.join(from_weave, pb=child_pb, msg='merge inventory',
202
class GenericRepoFetcher(RepoFetcher):
203
"""This is a generic repo to repo fetcher.
205
This makes minimal assumptions about repo layout and contents.
206
It triggers a reconciliation after fetching to ensure integrity.
209
def _fetch_revision_texts(self, revs):
210
"""Fetch revision object texts"""
211
rev_pb = bzrlib.ui.ui_factory.nested_progress_bar()
213
to_txn = self.to_transaction = self.to_repository.get_transaction()
216
to_store = self.to_repository._revision_store
218
pb = bzrlib.ui.ui_factory.nested_progress_bar()
319
tree.get_file_revision(
320
tree.id2path(root_id, recurse='none')))
321
except errors.NoSuchId:
324
# Drop non-head parents
326
graph = repo.get_graph()
327
heads = graph.heads(parent_ids)
329
for parent_id in parent_ids:
330
if parent_id in heads and parent_id not in selected_ids:
331
selected_ids.append(parent_id)
332
parent_keys = [(root_id, parent_id) for parent_id in selected_ids]
336
class TargetRepoKinds(object):
337
"""An enum-like set of constants.
339
They are the possible values of FetchSpecFactory.target_repo_kinds.
342
PREEXISTING = 'preexisting'
347
class FetchSpecFactory(object):
348
"""A helper for building the best fetch spec for a sprout call.
350
Factors that go into determining the sort of fetch to perform:
351
* did the caller specify any revision IDs?
352
* did the caller specify a source branch (need to fetch its
353
heads_to_fetch(), usually the tip + tags)
354
* is there an existing target repo (don't need to refetch revs it
356
* target is stacked? (similar to pre-existing target repo: even if
357
the target itself is new don't want to refetch existing revs)
359
:ivar source_branch: the source branch if one specified, else None.
360
:ivar source_branch_stop_revision_id: fetch up to this revision of
361
source_branch, rather than its tip.
362
:ivar source_repo: the source repository if one found, else None.
363
:ivar target_repo: the target repository acquired by sprout.
364
:ivar target_repo_kind: one of the TargetRepoKinds constants.
368
self._explicit_rev_ids = set()
369
self.source_branch = None
370
self.source_branch_stop_revision_id = None
371
self.source_repo = None
372
self.target_repo = None
373
self.target_repo_kind = None
376
def add_revision_ids(self, revision_ids):
377
"""Add revision_ids to the set of revision_ids to be fetched."""
378
self._explicit_rev_ids.update(revision_ids)
380
def make_fetch_spec(self):
381
"""Build a SearchResult or PendingAncestryResult or etc."""
382
if self.target_repo_kind is None or self.source_repo is None:
383
raise AssertionError(
384
'Incomplete FetchSpecFactory: %r' % (self.__dict__,))
385
if len(self._explicit_rev_ids) == 0 and self.source_branch is None:
386
if self.limit is not None:
387
raise NotImplementedError(
388
"limit is only supported with a source branch set")
389
# Caller hasn't specified any revisions or source branch
390
if self.target_repo_kind == TargetRepoKinds.EMPTY:
391
return vf_search.EverythingResult(self.source_repo)
393
# We want everything not already in the target (or target's
395
return vf_search.EverythingNotInOther(
396
self.target_repo, self.source_repo).execute()
397
heads_to_fetch = set(self._explicit_rev_ids)
398
if self.source_branch is not None:
399
must_fetch, if_present_fetch = self.source_branch.heads_to_fetch()
400
if self.source_branch_stop_revision_id is not None:
401
# Replace the tip rev from must_fetch with the stop revision
402
# XXX: this might be wrong if the tip rev is also in the
403
# must_fetch set for other reasons (e.g. it's the tip of
404
# multiple loom threads?), but then it's pretty unclear what it
405
# should mean to specify a stop_revision in that case anyway.
406
must_fetch.discard(self.source_branch.last_revision())
407
must_fetch.add(self.source_branch_stop_revision_id)
408
heads_to_fetch.update(must_fetch)
410
if_present_fetch = set()
411
if self.target_repo_kind == TargetRepoKinds.EMPTY:
412
# PendingAncestryResult does not raise errors if a requested head
413
# is absent. Ideally it would support the
414
# required_ids/if_present_ids distinction, but in practice
415
# heads_to_fetch will almost certainly be present so this doesn't
417
all_heads = heads_to_fetch.union(if_present_fetch)
418
ret = vf_search.PendingAncestryResult(all_heads, self.source_repo)
419
if self.limit is not None:
420
graph = self.source_repo.get_graph()
421
topo_order = list(graph.iter_topo_order(ret.get_keys()))
422
result_set = topo_order[:self.limit]
423
ret = self.source_repo.revision_ids_to_search_result(
427
return vf_search.NotInOtherForRevs(self.target_repo, self.source_repo,
428
required_ids=heads_to_fetch, if_present_ids=if_present_fetch,
429
limit=self.limit).execute()
220
pb.update('copying revisions', count, total)
222
sig_text = self.from_repository.get_signature_text(rev)
223
to_store.add_revision_signature_text(rev, sig_text, to_txn)
224
except errors.NoSuchRevision:
227
to_store.add_revision(self.from_repository.get_revision(rev),
232
# fixup inventory if needed:
233
# this is expensive because we have no inverse index to current ghosts.
234
# but on local disk its a few seconds and sftp push is already insane.
236
# FIXME: repository should inform if this is needed.
237
self.to_repository.reconcile()
242
class KnitRepoFetcher(RepoFetcher):
243
"""This is a knit format repository specific fetcher.
245
This differs from the GenericRepoFetcher by not doing a
246
reconciliation after copying, and using knit joining to
250
def _fetch_revision_texts(self, revs):
251
# may need to be a InterRevisionStore call here.
252
from_transaction = self.from_repository.get_transaction()
253
to_transaction = self.to_repository.get_transaction()
254
to_sf = self.to_repository._revision_store.get_signature_file(
256
from_sf = self.from_repository._revision_store.get_signature_file(
258
to_sf.join(from_sf, version_ids=revs, ignore_missing=True)
259
to_rf = self.to_repository._revision_store.get_revision_file(
261
from_rf = self.from_repository._revision_store.get_revision_file(
263
to_rf.join(from_rf, version_ids=revs)
266
class Fetcher(object):
267
"""Backwards compatability glue for branch.fetch()."""
269
@deprecated_method(zero_eight)
270
def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
271
"""Please see branch.fetch()."""
272
to_branch.fetch(from_branch, last_revision, pb)
added
removed
bzrlib/fetch.py
