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 then return to the inventories.
28
from bzrlib.lazy_import import lazy_import
29
lazy_import(globals(), """
40
from bzrlib.revision import NULL_REVISION
34
import bzrlib.errors as errors
35
from bzrlib.errors import InstallFailed
36
from bzrlib.progress import ProgressPhase
37
from bzrlib.revision import is_null, NULL_REVISION
38
from bzrlib.symbol_versioning import (deprecated_function,
41
41
from bzrlib.trace import mutter
44
from bzrlib.lazy_import import lazy_import
46
# TODO: Avoid repeatedly opening weaves so many times.
48
# XXX: This doesn't handle ghost (not present in branch) revisions at
49
# all yet. I'm not sure they really should be supported.
51
# NOTE: This doesn't copy revisions which may be present but not
52
# merged into the last revision. I'm not sure we want to do that.
54
# - get a list of revisions that need to be pulled in
55
# - for each one, pull in that revision file
56
# and get the inventory, and store the inventory with right
58
# - and get the ancestry, and store that with right parents too
59
# - and keep a note of all file ids and version seen
60
# - then go through all files; for each one get the weave,
61
# and add in all file versions
44
64
class RepoFetcher(object):
45
65
"""Pull revisions and texts from one repository to another.
68
if set, try to limit to the data this revision references.
71
count_copied -- number of revisions copied
47
73
This should not be used directly, it's essential a object to encapsulate
48
74
the logic in InterRepository.fetch().
51
def __init__(self, to_repository, from_repository, last_revision=None,
52
find_ghosts=True, fetch_spec=None):
77
def __init__(self, to_repository, from_repository, last_revision=None, pb=None,
53
79
"""Create a repo fetcher.
55
:param last_revision: If set, try to limit to the data this revision
57
81
:param find_ghosts: If True search the entire history for ghosts.
59
# repository.fetch has the responsibility for short-circuiting
60
# attempts to copy between a repository and itself.
84
self.failed_revisions = []
86
if to_repository.has_same_location(from_repository):
87
# repository.fetch should be taking care of this case.
88
raise errors.BzrError('RepoFetcher run '
89
'between two objects at the same location: '
90
'%r and %r' % (to_repository, from_repository))
61
91
self.to_repository = to_repository
62
92
self.from_repository = from_repository
63
self.sink = to_repository._get_sink()
64
93
# must not mutate self._last_revision as its potentially a shared instance
65
94
self._last_revision = last_revision
66
self._fetch_spec = fetch_spec
67
95
self.find_ghosts = find_ghosts
97
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
98
self.nested_pb = self.pb
101
self.nested_pb = None
68
102
self.from_repository.lock_read()
69
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
70
self.from_repository, self.from_repository._format,
71
self.to_repository, self.to_repository._format)
104
self.to_repository.lock_write()
106
self.to_repository.start_write_group()
110
self.to_repository.abort_write_group()
113
self.to_repository.commit_write_group()
116
if self.nested_pb is not None:
117
self.nested_pb.finished()
119
self.to_repository.unlock()
75
121
self.from_repository.unlock()
77
123
def __fetch(self):
78
124
"""Primary worker function.
80
This initialises all the needed variables, and then fetches the
126
This initialises all the needed variables, and then fetches the
81
127
requested revisions, finally clearing the progress bar.
83
# Roughly this is what we're aiming for fetch to become:
85
# missing = self.sink.insert_stream(self.source.get_stream(search))
87
# missing = self.sink.insert_stream(self.source.get_items(missing))
129
self.to_weaves = self.to_repository.weave_store
130
self.from_weaves = self.from_repository.weave_store
89
131
self.count_total = 0
90
132
self.file_ids_names = {}
91
pb = ui.ui_factory.nested_progress_bar()
92
pb.show_pct = pb.show_count = False
133
pp = ProgressPhase('Transferring', 4, self.pb)
94
pb.update("Finding revisions", 0, 2)
95
136
search = self._revids_to_fetch()
96
137
if search is None:
98
pb.update("Fetching revisions", 1, 2)
99
self._fetch_everything_for_search(search)
139
if getattr(self, '_fetch_everything_for_search', None) is not None:
140
self._fetch_everything_for_search(search, pp)
142
# backward compatibility
143
self._fetch_everything_for_revisions(search.get_keys, pp)
103
def _fetch_everything_for_search(self, search):
147
def _fetch_everything_for_search(self, search, pp):
104
148
"""Fetch all data for the given set of revisions."""
105
149
# The first phase is "file". We pass the progress bar for it directly
106
150
# into item_keys_introduced_by, which has more information about how
110
154
# item_keys_introduced_by should have a richer API than it does at the
111
155
# moment, so that it can feed the progress information back to this
113
if (self.from_repository._format.rich_root_data and
114
not self.to_repository._format.rich_root_data):
115
raise errors.IncompatibleRepositories(
116
self.from_repository, self.to_repository,
117
"different rich-root support")
118
pb = ui.ui_factory.nested_progress_bar()
158
pb = bzrlib.ui.ui_factory.nested_progress_bar()
120
pb.update("Get stream source")
121
source = self.from_repository._get_source(
122
self.to_repository._format)
123
stream = source.get_stream(search)
124
from_format = self.from_repository._format
125
pb.update("Inserting stream")
126
resume_tokens, missing_keys = self.sink.insert_stream(
127
stream, from_format, [])
128
if self.to_repository._fallback_repositories:
130
self._parent_inventories(search.get_keys()))
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")
160
revs = search.get_keys()
161
graph = self.from_repository.get_graph()
162
revs = list(graph.iter_topo_order(revs))
163
data_to_fetch = self.from_repository.item_keys_introduced_by(revs,
165
for knit_kind, file_id, revisions in data_to_fetch:
166
if knit_kind != phase:
168
# Make a new progress bar for this phase
171
pb = bzrlib.ui.ui_factory.nested_progress_bar()
172
if knit_kind == "file":
173
self._fetch_weave_text(file_id, revisions)
174
elif knit_kind == "inventory":
175
# Before we process the inventory we generate the root
176
# texts (if necessary) so that the inventories references
178
self._generate_root_texts(revs)
179
# NB: This currently reopens the inventory weave in source;
180
# using a full get_data_stream instead would avoid this.
181
self._fetch_inventory_weave(revs, pb)
182
elif knit_kind == "signatures":
183
# Nothing to do here; this will be taken care of when
184
# _fetch_revision_texts happens.
186
elif knit_kind == "revisions":
187
self._fetch_revision_texts(revs, pb)
189
raise AssertionError("Unknown knit kind %r" % knit_kind)
193
self.count_copied += len(revs)
150
195
def _revids_to_fetch(self):
151
196
"""Determines the exact revisions needed from self.from_repository to
152
197
install self._last_revision in self.to_repository.
154
199
If no revisions need to be fetched, then this just returns None.
156
if self._fetch_spec is not None:
157
return self._fetch_spec
158
201
mutter('fetch up to rev {%s}', self._last_revision)
159
202
if self._last_revision is NULL_REVISION:
160
203
# explicit limit of no revisions needed
162
return self.to_repository.search_missing_revision_ids(
163
self.from_repository, self._last_revision,
164
find_ghosts=self.find_ghosts)
166
def _parent_inventories(self, revision_ids):
167
# Find all the parent revisions referenced by the stream, but
168
# not present in the stream, and make sure we send their
170
parent_maps = self.to_repository.get_parent_map(revision_ids)
172
map(parents.update, parent_maps.itervalues())
173
parents.discard(NULL_REVISION)
174
parents.difference_update(revision_ids)
175
missing_keys = set(('inventories', rev_id) for rev_id in parents)
205
if (self._last_revision is not None and
206
self.to_repository.has_revision(self._last_revision)):
209
return self.to_repository.search_missing_revision_ids(
210
self.from_repository, self._last_revision,
211
find_ghosts=self.find_ghosts)
212
except errors.NoSuchRevision:
213
raise InstallFailed([self._last_revision])
215
def _fetch_weave_text(self, file_id, required_versions):
216
to_weave = self.to_weaves.get_weave_or_empty(file_id,
217
self.to_repository.get_transaction())
218
from_weave = self.from_weaves.get_weave(file_id,
219
self.from_repository.get_transaction())
220
# we fetch all the texts, because texts do
221
# not reference anything, and its cheap enough
222
to_weave.join(from_weave, version_ids=required_versions)
224
def _fetch_inventory_weave(self, revs, pb):
225
pb.update("fetch inventory", 0, 2)
226
to_weave = self.to_repository.get_inventory_weave()
227
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
229
# just merge, this is optimisable and its means we don't
230
# copy unreferenced data such as not-needed inventories.
231
pb.update("fetch inventory", 1, 3)
232
from_weave = self.from_repository.get_inventory_weave()
233
pb.update("fetch inventory", 2, 3)
234
# we fetch only the referenced inventories because we do not
235
# know for unselected inventories whether all their required
236
# texts are present in the other repository - it could be
238
to_weave.join(from_weave, pb=child_pb, msg='merge inventory',
243
def _generate_root_texts(self, revs):
244
"""This will be called by __fetch between fetching weave texts and
245
fetching the inventory weave.
247
Subclasses should override this if they need to generate root texts
248
after fetching weave texts.
253
class GenericRepoFetcher(RepoFetcher):
254
"""This is a generic repo to repo fetcher.
256
This makes minimal assumptions about repo layout and contents.
257
It triggers a reconciliation after fetching to ensure integrity.
260
def _fetch_revision_texts(self, revs, pb):
261
"""Fetch revision object texts"""
262
to_txn = self.to_transaction = self.to_repository.get_transaction()
265
to_store = self.to_repository._revision_store
267
pb.update('copying revisions', count, total)
269
sig_text = self.from_repository.get_signature_text(rev)
270
to_store.add_revision_signature_text(rev, sig_text, to_txn)
271
except errors.NoSuchRevision:
274
self._copy_revision(rev, to_txn)
276
# fixup inventory if needed:
277
# this is expensive because we have no inverse index to current ghosts.
278
# but on local disk its a few seconds and sftp push is already insane.
280
# FIXME: repository should inform if this is needed.
281
self.to_repository.reconcile()
283
def _copy_revision(self, rev, to_txn):
284
to_store = self.to_repository._revision_store
285
to_store.add_revision(self.from_repository.get_revision(rev), to_txn)
288
class KnitRepoFetcher(RepoFetcher):
289
"""This is a knit format repository specific fetcher.
291
This differs from the GenericRepoFetcher by not doing a
292
reconciliation after copying, and using knit joining to
296
def _fetch_revision_texts(self, revs, pb):
297
# may need to be a InterRevisionStore call here.
298
from_transaction = self.from_repository.get_transaction()
299
to_transaction = self.to_repository.get_transaction()
300
to_sf = self.to_repository._revision_store.get_signature_file(
302
from_sf = self.from_repository._revision_store.get_signature_file(
304
to_sf.join(from_sf, version_ids=revs, ignore_missing=True)
305
self._fetch_just_revision_texts(revs, from_transaction, to_transaction)
307
def _fetch_just_revision_texts(self, version_ids, from_transaction,
309
to_rf = self.to_repository._revision_store.get_revision_file(
311
from_rf = self.from_repository._revision_store.get_revision_file(
313
to_rf.join(from_rf, version_ids=version_ids)
179
316
class Inter1and2Helper(object):
180
317
"""Helper for operations that convert data from model 1 and 2
182
319
This is for use by fetchers and converters.
185
def __init__(self, source):
322
def __init__(self, source, target):
188
325
:param source: The repository data comes from
326
:param target: The repository data goes to
190
328
self.source = source
192
331
def iter_rev_trees(self, revs):
193
332
"""Iterate through RevisionTrees efficiently.
224
365
for tree in self.iter_rev_trees(parents):
225
366
root_id = tree.get_root_id()
226
367
revision_root[tree.get_revision_id()] = root_id
368
return revision_root, planned_versions
229
370
def generate_root_texts(self, revs):
230
371
"""Generate VersionedFiles for all root ids.
232
373
:param revs: the revisions to include
375
to_store = self.target.weave_store
234
376
graph = self.source.get_graph()
235
377
parent_map = graph.get_parent_map(revs)
236
rev_order = tsort.topo_sort(parent_map)
237
rev_id_to_root_id = self._find_root_ids(revs, parent_map, graph)
238
root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
240
# Guaranteed stable, this groups all the file id operations together
241
# retaining topological order within the revisions of a file id.
242
# File id splits and joins would invalidate this, but they don't exist
243
# yet, and are unlikely to in non-rich-root environments anyway.
244
root_id_order.sort(key=operator.itemgetter(0))
245
# Create a record stream containing the roots to create.
247
# XXX: not covered by tests, should have a flag to always run
248
# this. -- mbp 20100129
249
graph = self.source_repo.get_known_graph_ancestry(revs)
250
new_roots_stream = _new_root_data_stream(
251
root_id_order, rev_id_to_root_id, parent_map, self.source, graph)
252
return [('texts', new_roots_stream)]
255
def _get_rich_root_heads_graph(source_repo, revision_ids):
256
"""Get a Graph object suitable for asking heads() for new rich roots."""
260
def _new_root_data_stream(
261
root_keys_to_create, rev_id_to_root_id_map, parent_map, repo, graph=None):
262
"""Generate a texts substream of synthesised root entries.
264
Used in fetches that do rich-root upgrades.
266
:param root_keys_to_create: iterable of (root_id, rev_id) pairs describing
267
the root entries to create.
268
:param rev_id_to_root_id_map: dict of known rev_id -> root_id mappings for
269
calculating the parents. If a parent rev_id is not found here then it
270
will be recalculated.
271
:param parent_map: a parent map for all the revisions in
273
:param graph: a graph to use instead of repo.get_graph().
275
for root_key in root_keys_to_create:
276
root_id, rev_id = root_key
277
parent_keys = _parent_keys_for_root_version(
278
root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph)
279
yield versionedfile.FulltextContentFactory(
280
root_key, parent_keys, None, '')
283
def _parent_keys_for_root_version(
284
root_id, rev_id, rev_id_to_root_id_map, parent_map, repo, graph=None):
285
"""Get the parent keys for a given root id.
287
A helper function for _new_root_data_stream.
289
# Include direct parents of the revision, but only if they used the same
290
# root_id and are heads.
291
rev_parents = parent_map[rev_id]
293
for parent_id in rev_parents:
294
if parent_id == NULL_REVISION:
296
if parent_id not in rev_id_to_root_id_map:
297
# We probably didn't read this revision, go spend the extra effort
300
tree = repo.revision_tree(parent_id)
301
except errors.NoSuchRevision:
302
# Ghost, fill out rev_id_to_root_id in case we encounter this
304
# But set parent_root_id to None since we don't really know
305
parent_root_id = None
307
parent_root_id = tree.get_root_id()
308
rev_id_to_root_id_map[parent_id] = None
310
# rev_id_to_root_id_map[parent_id] = parent_root_id
311
# memory consumption maybe?
313
parent_root_id = rev_id_to_root_id_map[parent_id]
314
if root_id == parent_root_id:
315
# With stacking we _might_ want to refer to a non-local revision,
316
# but this code path only applies when we have the full content
317
# available, so ghosts really are ghosts, not just the edge of
319
parent_ids.append(parent_id)
321
# root_id may be in the parent anyway.
323
tree = repo.revision_tree(parent_id)
324
except errors.NoSuchRevision:
325
# ghost, can't refer to it.
329
parent_ids.append(tree.inventory[root_id].revision)
330
except errors.NoSuchId:
333
# Drop non-head parents
335
graph = repo.get_graph()
336
heads = graph.heads(parent_ids)
338
for parent_id in parent_ids:
339
if parent_id in heads and parent_id not in selected_ids:
340
selected_ids.append(parent_id)
341
parent_keys = [(root_id, parent_id) for parent_id in selected_ids]
378
revision_root, planned_versions = self._find_root_ids(
379
revs, parent_map, graph)
380
for root_id, versions in planned_versions.iteritems():
381
versionedfile = to_store.get_weave_or_empty(root_id,
382
self.target.get_transaction())
384
for revision_id in versions:
385
if revision_id in versionedfile:
387
parents = parent_map[revision_id]
388
# We drop revision parents with different file-ids, because
389
# a version cannot have a version with another file-id as its
391
# When a parent revision is a ghost, we guess that its root id
393
parents = tuple(p for p in parents if p != NULL_REVISION
394
and revision_root.get(p, root_id) == root_id)
395
result = versionedfile.add_lines_with_ghosts(
396
revision_id, parents, [], parent_texts)
397
parent_texts[revision_id] = result[2]
399
def regenerate_inventory(self, revs):
400
"""Generate a new inventory versionedfile in target, convertin data.
402
The inventory is retrieved from the source, (deserializing it), and
403
stored in the target (reserializing it in a different format).
404
:param revs: The revisions to include
406
for tree in self.iter_rev_trees(revs):
407
parents = tree.get_parent_ids()
408
self.target.add_inventory(tree.get_revision_id(), tree.inventory,
411
def fetch_revisions(self, revision_ids):
412
for revision in self.source.get_revisions(revision_ids):
413
self.target.add_revision(revision.revision_id, revision)
416
class Model1toKnit2Fetcher(GenericRepoFetcher):
417
"""Fetch from a Model1 repository into a Knit2 repository
419
def __init__(self, to_repository, from_repository, last_revision=None,
420
pb=None, find_ghosts=True):
421
self.helper = Inter1and2Helper(from_repository, to_repository)
422
GenericRepoFetcher.__init__(self, to_repository, from_repository,
423
last_revision, pb, find_ghosts)
425
def _generate_root_texts(self, revs):
426
self.helper.generate_root_texts(revs)
428
def _fetch_inventory_weave(self, revs, pb):
429
self.helper.regenerate_inventory(revs)
431
def _copy_revision(self, rev, to_txn):
432
self.helper.fetch_revisions([rev])
435
class Knit1to2Fetcher(KnitRepoFetcher):
436
"""Fetch from a Knit1 repository into a Knit2 repository"""
438
def __init__(self, to_repository, from_repository, last_revision=None,
439
pb=None, find_ghosts=True):
440
self.helper = Inter1and2Helper(from_repository, to_repository)
441
KnitRepoFetcher.__init__(self, to_repository, from_repository,
442
last_revision, pb, find_ghosts)
444
def _generate_root_texts(self, revs):
445
self.helper.generate_root_texts(revs)
447
def _fetch_inventory_weave(self, revs, pb):
448
self.helper.regenerate_inventory(revs)
450
def _fetch_just_revision_texts(self, version_ids, from_transaction,
452
self.helper.fetch_revisions(version_ids)
455
class RemoteToOtherFetcher(GenericRepoFetcher):
457
def _fetch_everything_for_search(self, search, pp):
458
data_stream = self.from_repository.get_data_stream_for_search(search)
459
self.to_repository.insert_data_stream(data_stream)
added
removed
bzrlib/fetch.py
