21
21
that has merged into it. As the first step of a merge, pull, or
22
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
35
import bzrlib.errors as errors
36
from bzrlib.errors import (InstallFailed,
38
from bzrlib.progress import ProgressPhase
39
from bzrlib.revision import is_null, NULL_REVISION
40
from bzrlib.symbol_versioning import (deprecated_function,
43
from bzrlib.trace import mutter
28
46
from bzrlib.lazy_import import lazy_import
29
lazy_import(globals(), """
40
from bzrlib.revision import NULL_REVISION
41
from bzrlib.trace import mutter
48
# TODO: Avoid repeatedly opening weaves so many times.
50
# XXX: This doesn't handle ghost (not present in branch) revisions at
51
# all yet. I'm not sure they really should be supported.
53
# NOTE: This doesn't copy revisions which may be present but not
54
# merged into the last revision. I'm not sure we want to do that.
56
# - get a list of revisions that need to be pulled in
57
# - for each one, pull in that revision file
58
# and get the inventory, and store the inventory with right
60
# - and get the ancestry, and store that with right parents too
61
# - and keep a note of all file ids and version seen
62
# - then go through all files; for each one get the weave,
63
# and add in all file versions
44
66
class RepoFetcher(object):
45
67
"""Pull revisions and texts from one repository to another.
70
if set, try to limit to the data this revision references.
73
count_copied -- number of revisions copied
47
75
This should not be used directly, it's essential a object to encapsulate
48
76
the logic in InterRepository.fetch().
51
def __init__(self, to_repository, from_repository, last_revision=None,
52
find_ghosts=True, fetch_spec=None):
53
"""Create a repo fetcher.
55
:param last_revision: If set, try to limit to the data this revision
57
:param fetch_spec: A SearchResult specifying which revisions to fetch.
58
If set, this overrides last_revision.
59
:param find_ghosts: If True search the entire history for ghosts.
61
# repository.fetch has the responsibility for short-circuiting
62
# attempts to copy between a repository and itself.
78
def __init__(self, to_repository, from_repository, last_revision=None, pb=None):
80
self.failed_revisions = []
82
if to_repository.has_same_location(from_repository):
83
# repository.fetch should be taking care of this case.
84
raise errors.BzrError('RepoFetcher run '
85
'between two objects at the same location: '
86
'%r and %r' % (to_repository, from_repository))
63
87
self.to_repository = to_repository
64
88
self.from_repository = from_repository
65
self.sink = to_repository._get_sink()
66
89
# must not mutate self._last_revision as its potentially a shared instance
67
90
self._last_revision = last_revision
68
self._fetch_spec = fetch_spec
69
self.find_ghosts = find_ghosts
92
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
93
self.nested_pb = self.pb
70
97
self.from_repository.lock_read()
71
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
72
self.from_repository, self.from_repository._format,
73
self.to_repository, self.to_repository._format)
99
self.to_repository.lock_write()
101
self.to_repository.start_write_group()
105
self.to_repository.abort_write_group()
108
self.to_repository.commit_write_group()
110
if self.nested_pb is not None:
111
self.nested_pb.finished()
112
self.to_repository.unlock()
77
114
self.from_repository.unlock()
79
116
def __fetch(self):
80
117
"""Primary worker function.
82
This initialises all the needed variables, and then fetches the
119
This initialises all the needed variables, and then fetches the
83
120
requested revisions, finally clearing the progress bar.
85
# Roughly this is what we're aiming for fetch to become:
87
# missing = self.sink.insert_stream(self.source.get_stream(search))
89
# missing = self.sink.insert_stream(self.source.get_items(missing))
122
self.to_weaves = self.to_repository.weave_store
123
self.from_weaves = self.from_repository.weave_store
91
124
self.count_total = 0
92
125
self.file_ids_names = {}
93
pb = ui.ui_factory.nested_progress_bar()
94
pb.show_pct = pb.show_count = False
126
pp = ProgressPhase('Fetch phase', 4, self.pb)
96
pb.update("Finding revisions", 0, 2)
97
search_result = self._revids_to_fetch()
98
mutter('fetching: %s', search_result)
99
if search_result.is_empty():
129
revs = self._revids_to_fetch()
101
pb.update("Fetching revisions", 1, 2)
102
self._fetch_everything_for_search(search_result)
132
self._fetch_everything_for_revisions(revs, pp)
106
def _fetch_everything_for_search(self, search):
136
def _fetch_everything_for_revisions(self, revs, pp):
107
137
"""Fetch all data for the given set of revisions."""
108
138
# The first phase is "file". We pass the progress bar for it directly
109
139
# into item_keys_introduced_by, which has more information about how
113
143
# item_keys_introduced_by should have a richer API than it does at the
114
144
# moment, so that it can feed the progress information back to this
116
if (self.from_repository._format.rich_root_data and
117
not self.to_repository._format.rich_root_data):
118
raise errors.IncompatibleRepositories(
119
self.from_repository, self.to_repository,
120
"different rich-root support")
121
pb = ui.ui_factory.nested_progress_bar()
147
pb = bzrlib.ui.ui_factory.nested_progress_bar()
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")
149
data_to_fetch = self.from_repository.item_keys_introduced_by(revs, pb)
150
for knit_kind, file_id, revisions in data_to_fetch:
151
if knit_kind != phase:
153
# Make a new progress bar for this phase
156
pb = bzrlib.ui.ui_factory.nested_progress_bar()
157
if knit_kind == "file":
158
self._fetch_weave_text(file_id, revisions)
159
elif knit_kind == "inventory":
161
# Once we've processed all the files, then we generate the root
162
# texts (if necessary), then we process the inventory. It's a
163
# bit distasteful to have knit_kind == "inventory" mean this,
164
# perhaps it should happen on the first non-"file" knit, in case
165
# it's not always inventory?
166
self._generate_root_texts(revs)
167
self._fetch_inventory_weave(revs, pb)
168
elif knit_kind == "signatures":
169
# Nothing to do here; this will be taken care of when
170
# _fetch_revision_texts happens.
172
elif knit_kind == "revisions":
173
self._fetch_revision_texts(revs, pb)
175
raise AssertionError("Unknown knit kind %r" % knit_kind)
179
self.count_copied += len(revs)
150
181
def _revids_to_fetch(self):
151
182
"""Determines the exact revisions needed from self.from_repository to
152
183
install self._last_revision in self.to_repository.
154
:returns: A SearchResult of some sort. (Possibly a
155
PendingAncestryResult, EmptySearchResult, etc.)
185
If no revisions need to be fetched, then this just returns None.
157
if self._fetch_spec is not None:
158
# The fetch spec is already a concrete search result.
159
return self._fetch_spec
160
elif self._last_revision == NULL_REVISION:
161
# fetch_spec is None + last_revision is null => empty fetch.
187
mutter('fetch up to rev {%s}', self._last_revision)
188
if self._last_revision is NULL_REVISION:
162
189
# explicit limit of no revisions needed
163
return graph.EmptySearchResult()
164
elif self._last_revision is not None:
165
return graph.NotInOtherForRevs(self.to_repository,
166
self.from_repository, [self._last_revision],
167
find_ghosts=self.find_ghosts).execute()
168
else: # self._last_revision is None:
169
return graph.EverythingNotInOther(self.to_repository,
170
self.from_repository,
171
find_ghosts=self.find_ghosts).execute()
191
if (self._last_revision is not None and
192
self.to_repository.has_revision(self._last_revision)):
196
# XXX: this gets the full graph on both sides, and will make sure
197
# that ghosts are filled whether or not you care about them.
198
return self.to_repository.missing_revision_ids(self.from_repository,
200
except errors.NoSuchRevision:
201
raise InstallFailed([self._last_revision])
203
def _fetch_weave_text(self, file_id, required_versions):
204
to_weave = self.to_weaves.get_weave_or_empty(file_id,
205
self.to_repository.get_transaction())
206
from_weave = self.from_weaves.get_weave(file_id,
207
self.from_repository.get_transaction())
208
# we fetch all the texts, because texts do
209
# not reference anything, and its cheap enough
210
to_weave.join(from_weave, version_ids=required_versions)
211
# we don't need *all* of this data anymore, but we dont know
212
# what we do. This cache clearing will result in a new read
213
# of the knit data when we do the checkout, but probably we
214
# want to emit the needed data on the fly rather than at the
216
# the from weave should know not to cache data being joined,
217
# but its ok to ask it to clear.
218
from_weave.clear_cache()
219
to_weave.clear_cache()
221
def _fetch_inventory_weave(self, revs, pb):
222
pb.update("fetch inventory", 0, 2)
223
to_weave = self.to_repository.get_inventory_weave()
224
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
226
# just merge, this is optimisable and its means we don't
227
# copy unreferenced data such as not-needed inventories.
228
pb.update("fetch inventory", 1, 3)
229
from_weave = self.from_repository.get_inventory_weave()
230
pb.update("fetch inventory", 2, 3)
231
# we fetch only the referenced inventories because we do not
232
# know for unselected inventories whether all their required
233
# texts are present in the other repository - it could be
235
to_weave.join(from_weave, pb=child_pb, msg='merge inventory',
237
from_weave.clear_cache()
241
def _generate_root_texts(self, revs):
242
"""This will be called by __fetch between fetching weave texts and
243
fetching the inventory weave.
245
Subclasses should override this if they need to generate root texts
246
after fetching weave texts.
251
class GenericRepoFetcher(RepoFetcher):
252
"""This is a generic repo to repo fetcher.
254
This makes minimal assumptions about repo layout and contents.
255
It triggers a reconciliation after fetching to ensure integrity.
258
def _fetch_revision_texts(self, revs, pb):
259
"""Fetch revision object texts"""
260
to_txn = self.to_transaction = self.to_repository.get_transaction()
263
to_store = self.to_repository._revision_store
265
pb.update('copying revisions', count, total)
267
sig_text = self.from_repository.get_signature_text(rev)
268
to_store.add_revision_signature_text(rev, sig_text, to_txn)
269
except errors.NoSuchRevision:
272
to_store.add_revision(self.from_repository.get_revision(rev),
275
# fixup inventory if needed:
276
# this is expensive because we have no inverse index to current ghosts.
277
# but on local disk its a few seconds and sftp push is already insane.
279
# FIXME: repository should inform if this is needed.
280
self.to_repository.reconcile()
283
class KnitRepoFetcher(RepoFetcher):
284
"""This is a knit format repository specific fetcher.
286
This differs from the GenericRepoFetcher by not doing a
287
reconciliation after copying, and using knit joining to
291
def _fetch_revision_texts(self, revs, pb):
292
# may need to be a InterRevisionStore call here.
293
from_transaction = self.from_repository.get_transaction()
294
to_transaction = self.to_repository.get_transaction()
295
to_sf = self.to_repository._revision_store.get_signature_file(
297
from_sf = self.from_repository._revision_store.get_signature_file(
299
to_sf.join(from_sf, version_ids=revs, ignore_missing=True)
300
to_rf = self.to_repository._revision_store.get_revision_file(
302
from_rf = self.from_repository._revision_store.get_revision_file(
304
to_rf.join(from_rf, version_ids=revs)
174
307
class Inter1and2Helper(object):
175
308
"""Helper for operations that convert data from model 1 and 2
177
310
This is for use by fetchers and converters.
180
# This is a class variable so that the test suite can override it.
181
known_graph_threshold = 100
183
def __init__(self, source):
313
def __init__(self, source, target):
186
316
:param source: The repository data comes from
317
:param target: The repository data goes to
188
319
self.source = source
190
322
def iter_rev_trees(self, revs):
191
323
"""Iterate through RevisionTrees efficiently.
207
337
revs = revs[100:]
209
def _find_root_ids(self, revs, parent_map, graph):
211
for tree in self.iter_rev_trees(revs):
212
revision_id = tree.inventory.root.revision
213
root_id = tree.get_root_id()
214
revision_root[revision_id] = root_id
215
# Find out which parents we don't already know root ids for
217
for revision_parents in parent_map.itervalues():
218
parents.update(revision_parents)
219
parents.difference_update(revision_root.keys() + [NULL_REVISION])
220
# Limit to revisions present in the versionedfile
221
parents = graph.get_parent_map(parents).keys()
222
for tree in self.iter_rev_trees(parents):
223
root_id = tree.get_root_id()
224
revision_root[tree.get_revision_id()] = root_id
227
339
def generate_root_texts(self, revs):
228
340
"""Generate VersionedFiles for all root ids.
230
342
:param revs: the revisions to include
232
graph = self.source.get_graph()
233
parent_map = graph.get_parent_map(revs)
234
rev_order = tsort.topo_sort(parent_map)
235
rev_id_to_root_id = self._find_root_ids(revs, parent_map, graph)
236
root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
238
# Guaranteed stable, this groups all the file id operations together
239
# retaining topological order within the revisions of a file id.
240
# File id splits and joins would invalidate this, but they don't exist
241
# yet, and are unlikely to in non-rich-root environments anyway.
242
root_id_order.sort(key=operator.itemgetter(0))
243
# Create a record stream containing the roots to create.
244
if len(revs) > self.known_graph_threshold:
245
graph = self.source.get_known_graph_ancestry(revs)
246
new_roots_stream = _new_root_data_stream(
247
root_id_order, rev_id_to_root_id, parent_map, self.source, graph)
248
return [('texts', new_roots_stream)]
251
def _new_root_data_stream(
252
root_keys_to_create, rev_id_to_root_id_map, parent_map, repo, graph=None):
253
"""Generate a texts substream of synthesised root entries.
255
Used in fetches that do rich-root upgrades.
257
:param root_keys_to_create: iterable of (root_id, rev_id) pairs describing
258
the root entries to create.
259
:param rev_id_to_root_id_map: dict of known rev_id -> root_id mappings for
260
calculating the parents. If a parent rev_id is not found here then it
261
will be recalculated.
262
:param parent_map: a parent map for all the revisions in
264
:param graph: a graph to use instead of repo.get_graph().
266
for root_key in root_keys_to_create:
267
root_id, rev_id = root_key
268
parent_keys = _parent_keys_for_root_version(
269
root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph)
270
yield versionedfile.FulltextContentFactory(
271
root_key, parent_keys, None, '')
274
def _parent_keys_for_root_version(
275
root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph=None):
276
"""Get the parent keys for a given root id.
278
A helper function for _new_root_data_stream.
280
# Include direct parents of the revision, but only if they used the same
281
# root_id and are heads.
282
rev_parents = parent_map[rev_id]
284
for parent_id in rev_parents:
285
if parent_id == NULL_REVISION:
287
if parent_id not in rev_id_to_root_id_map:
288
# We probably didn't read this revision, go spend the extra effort
291
tree = repo.revision_tree(parent_id)
292
except errors.NoSuchRevision:
293
# Ghost, fill out rev_id_to_root_id in case we encounter this
295
# But set parent_root_id to None since we don't really know
296
parent_root_id = None
298
parent_root_id = tree.get_root_id()
299
rev_id_to_root_id_map[parent_id] = None
301
# rev_id_to_root_id_map[parent_id] = parent_root_id
302
# memory consumption maybe?
304
parent_root_id = rev_id_to_root_id_map[parent_id]
305
if root_id == parent_root_id:
306
# With stacking we _might_ want to refer to a non-local revision,
307
# but this code path only applies when we have the full content
308
# available, so ghosts really are ghosts, not just the edge of
310
parent_ids.append(parent_id)
312
# root_id may be in the parent anyway.
314
tree = repo.revision_tree(parent_id)
315
except errors.NoSuchRevision:
316
# ghost, can't refer to it.
320
parent_ids.append(tree.get_file_revision(root_id))
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
375
def add_revision_ids(self, revision_ids):
376
"""Add revision_ids to the set of revision_ids to be fetched."""
377
self._explicit_rev_ids.update(revision_ids)
344
inventory_weave = self.source.get_inventory_weave()
347
to_store = self.target.weave_store
348
for tree in self.iter_rev_trees(revs):
349
revision_id = tree.inventory.root.revision
350
root_id = tree.inventory.root.file_id
351
parents = inventory_weave.get_parents(revision_id)
352
if root_id not in versionedfile:
353
versionedfile[root_id] = to_store.get_weave_or_empty(root_id,
354
self.target.get_transaction())
355
_, _, parent_texts[root_id] = versionedfile[root_id].add_lines(
356
revision_id, parents, [], parent_texts)
358
def regenerate_inventory(self, revs):
359
"""Generate a new inventory versionedfile in target, convertin data.
379
def make_fetch_spec(self):
380
"""Build a SearchResult or PendingAncestryResult or etc."""
381
if self.target_repo_kind is None or self.source_repo is None:
382
raise AssertionError(
383
'Incomplete FetchSpecFactory: %r' % (self.__dict__,))
384
if len(self._explicit_rev_ids) == 0 and self.source_branch is None:
385
# Caller hasn't specified any revisions or source branch
386
if self.target_repo_kind == TargetRepoKinds.EMPTY:
387
return graph.EverythingResult(self.source_repo)
389
# We want everything not already in the target (or target's
391
return graph.EverythingNotInOther(
392
self.target_repo, self.source_repo).execute()
393
heads_to_fetch = set(self._explicit_rev_ids)
394
if self.source_branch is not None:
395
must_fetch, if_present_fetch = self.source_branch.heads_to_fetch()
396
if self.source_branch_stop_revision_id is not None:
397
# Replace the tip rev from must_fetch with the stop revision
398
# XXX: this might be wrong if the tip rev is also in the
399
# must_fetch set for other reasons (e.g. it's the tip of
400
# multiple loom threads?), but then it's pretty unclear what it
401
# should mean to specify a stop_revision in that case anyway.
402
must_fetch.discard(self.source_branch.last_revision())
403
must_fetch.add(self.source_branch_stop_revision_id)
404
heads_to_fetch.update(must_fetch)
406
if_present_fetch = set()
407
if self.target_repo_kind == TargetRepoKinds.EMPTY:
408
# PendingAncestryResult does not raise errors if a requested head
409
# is absent. Ideally it would support the
410
# required_ids/if_present_ids distinction, but in practice
411
# heads_to_fetch will almost certainly be present so this doesn't
413
all_heads = heads_to_fetch.union(if_present_fetch)
414
return graph.PendingAncestryResult(all_heads, self.source_repo)
415
return graph.NotInOtherForRevs(self.target_repo, self.source_repo,
416
required_ids=heads_to_fetch, if_present_ids=if_present_fetch
361
The inventory is retrieved from the source, (deserializing it), and
362
stored in the target (reserializing it in a different format).
363
:param revs: The revisions to include
365
inventory_weave = self.source.get_inventory_weave()
366
for tree in self.iter_rev_trees(revs):
367
parents = inventory_weave.get_parents(tree.get_revision_id())
368
self.target.add_inventory(tree.get_revision_id(), tree.inventory,
372
class Model1toKnit2Fetcher(GenericRepoFetcher):
373
"""Fetch from a Model1 repository into a Knit2 repository
375
def __init__(self, to_repository, from_repository, last_revision=None,
377
self.helper = Inter1and2Helper(from_repository, to_repository)
378
GenericRepoFetcher.__init__(self, to_repository, from_repository,
381
def _generate_root_texts(self, revs):
382
self.helper.generate_root_texts(revs)
384
def _fetch_inventory_weave(self, revs, pb):
385
self.helper.regenerate_inventory(revs)
388
class Knit1to2Fetcher(KnitRepoFetcher):
389
"""Fetch from a Knit1 repository into a Knit2 repository"""
391
def __init__(self, to_repository, from_repository, last_revision=None,
393
self.helper = Inter1and2Helper(from_repository, to_repository)
394
KnitRepoFetcher.__init__(self, to_repository, from_repository,
397
def _generate_root_texts(self, revs):
398
self.helper.generate_root_texts(revs)
400
def _fetch_inventory_weave(self, revs, pb):
401
self.helper.regenerate_inventory(revs)
404
class RemoteToOtherFetcher(GenericRepoFetcher):
406
def _fetch_everything_for_revisions(self, revs, pp):
407
data_stream = self.from_repository.get_data_stream(revs)
408
self.to_repository.insert_data_stream(data_stream)
added
removed
bzrlib/fetch.py
