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(), """
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,
40
from bzrlib.revision import NULL_REVISION
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
64
44
class RepoFetcher(object):
65
45
"""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
73
47
This should not be used directly, it's essential a object to encapsulate
74
48
the logic in InterRepository.fetch().
77
def __init__(self, to_repository, from_repository, last_revision=None, pb=None,
51
def __init__(self, to_repository, from_repository, last_revision=None,
52
find_ghosts=True, fetch_spec=None):
79
53
"""Create a repo fetcher.
55
:param last_revision: If set, try to limit to the data this revision
81
57
:param find_ghosts: If True search the entire history for ghosts.
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))
59
# repository.fetch has the responsibility for short-circuiting
60
# attempts to copy between a repository and itself.
91
61
self.to_repository = to_repository
92
62
self.from_repository = from_repository
63
self.sink = to_repository._get_sink()
93
64
# must not mutate self._last_revision as its potentially a shared instance
94
65
self._last_revision = last_revision
66
self._fetch_spec = fetch_spec
95
67
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
102
68
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()
115
if self.nested_pb is not None:
116
self.nested_pb.finished()
117
self.to_repository.unlock()
119
75
self.from_repository.unlock()
121
77
def __fetch(self):
122
78
"""Primary worker function.
124
This initialises all the needed variables, and then fetches the
80
This initialises all the needed variables, and then fetches the
125
81
requested revisions, finally clearing the progress bar.
127
self.to_weaves = self.to_repository.weave_store
128
self.from_weaves = self.from_repository.weave_store
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
89
self.count_total = 0
130
90
self.file_ids_names = {}
131
pp = ProgressPhase('Transferring', 4, self.pb)
91
pb = ui.ui_factory.nested_progress_bar()
92
pb.show_pct = pb.show_count = False
94
pb.update("Finding revisions", 0, 2)
134
95
search = self._revids_to_fetch()
135
96
if search is None:
137
if getattr(self, '_fetch_everything_for_search', None) is not None:
138
self._fetch_everything_for_search(search, pp)
140
# backward compatibility
141
self._fetch_everything_for_revisions(search.get_keys, pp)
98
pb.update("Fetching revisions", 1, 2)
99
self._fetch_everything_for_search(search)
145
def _fetch_everything_for_search(self, search, pp):
103
def _fetch_everything_for_search(self, search):
146
104
"""Fetch all data for the given set of revisions."""
147
105
# The first phase is "file". We pass the progress bar for it directly
148
106
# into item_keys_introduced_by, which has more information about how
152
110
# item_keys_introduced_by should have a richer API than it does at the
153
111
# moment, so that it can feed the progress information back to this
156
pb = bzrlib.ui.ui_factory.nested_progress_bar()
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
revs = search.get_keys()
159
data_to_fetch = self.from_repository.item_keys_introduced_by(revs, pb)
160
for knit_kind, file_id, revisions in data_to_fetch:
161
if knit_kind != phase:
163
# Make a new progress bar for this phase
166
pb = bzrlib.ui.ui_factory.nested_progress_bar()
167
if knit_kind == "file":
168
self._fetch_weave_text(file_id, revisions)
169
elif knit_kind == "inventory":
170
# Before we process the inventory we generate the root
171
# texts (if necessary) so that the inventories references
173
self._generate_root_texts(revs)
174
# NB: This currently reopens the inventory weave in source;
175
# using a full get_data_stream instead would avoid this.
176
self._fetch_inventory_weave(revs, pb)
177
elif knit_kind == "signatures":
178
# Nothing to do here; this will be taken care of when
179
# _fetch_revision_texts happens.
181
elif knit_kind == "revisions":
182
self._fetch_revision_texts(revs, pb)
184
raise AssertionError("Unknown knit kind %r" % knit_kind)
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")
188
self.count_copied += len(revs)
190
150
def _revids_to_fetch(self):
191
151
"""Determines the exact revisions needed from self.from_repository to
192
152
install self._last_revision in self.to_repository.
194
154
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
196
158
mutter('fetch up to rev {%s}', self._last_revision)
197
159
if self._last_revision is NULL_REVISION:
198
160
# explicit limit of no revisions needed
200
if (self._last_revision is not None and
201
self.to_repository.has_revision(self._last_revision)):
204
return self.to_repository.search_missing_revision_ids(
205
self.from_repository, self._last_revision,
206
find_ghosts=self.find_ghosts)
207
except errors.NoSuchRevision:
208
raise InstallFailed([self._last_revision])
210
def _fetch_weave_text(self, file_id, required_versions):
211
to_weave = self.to_weaves.get_weave_or_empty(file_id,
212
self.to_repository.get_transaction())
213
from_weave = self.from_weaves.get_weave(file_id,
214
self.from_repository.get_transaction())
215
# we fetch all the texts, because texts do
216
# not reference anything, and its cheap enough
217
to_weave.join(from_weave, version_ids=required_versions)
219
def _fetch_inventory_weave(self, revs, pb):
220
pb.update("fetch inventory", 0, 2)
221
to_weave = self.to_repository.get_inventory_weave()
222
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
224
# just merge, this is optimisable and its means we don't
225
# copy unreferenced data such as not-needed inventories.
226
pb.update("fetch inventory", 1, 3)
227
from_weave = self.from_repository.get_inventory_weave()
228
pb.update("fetch inventory", 2, 3)
229
# we fetch only the referenced inventories because we do not
230
# know for unselected inventories whether all their required
231
# texts are present in the other repository - it could be
233
to_weave.join(from_weave, pb=child_pb, msg='merge inventory',
238
def _generate_root_texts(self, revs):
239
"""This will be called by __fetch between fetching weave texts and
240
fetching the inventory weave.
242
Subclasses should override this if they need to generate root texts
243
after fetching weave texts.
248
class GenericRepoFetcher(RepoFetcher):
249
"""This is a generic repo to repo fetcher.
251
This makes minimal assumptions about repo layout and contents.
252
It triggers a reconciliation after fetching to ensure integrity.
255
def _fetch_revision_texts(self, revs, pb):
256
"""Fetch revision object texts"""
257
to_txn = self.to_transaction = self.to_repository.get_transaction()
260
to_store = self.to_repository._revision_store
262
pb.update('copying revisions', count, total)
264
sig_text = self.from_repository.get_signature_text(rev)
265
to_store.add_revision_signature_text(rev, sig_text, to_txn)
266
except errors.NoSuchRevision:
269
to_store.add_revision(self.from_repository.get_revision(rev),
272
# fixup inventory if needed:
273
# this is expensive because we have no inverse index to current ghosts.
274
# but on local disk its a few seconds and sftp push is already insane.
276
# FIXME: repository should inform if this is needed.
277
self.to_repository.reconcile()
280
class KnitRepoFetcher(RepoFetcher):
281
"""This is a knit format repository specific fetcher.
283
This differs from the GenericRepoFetcher by not doing a
284
reconciliation after copying, and using knit joining to
288
def _fetch_revision_texts(self, revs, pb):
289
# may need to be a InterRevisionStore call here.
290
from_transaction = self.from_repository.get_transaction()
291
to_transaction = self.to_repository.get_transaction()
292
to_sf = self.to_repository._revision_store.get_signature_file(
294
from_sf = self.from_repository._revision_store.get_signature_file(
296
to_sf.join(from_sf, version_ids=revs, ignore_missing=True)
297
to_rf = self.to_repository._revision_store.get_revision_file(
299
from_rf = self.from_repository._revision_store.get_revision_file(
301
to_rf.join(from_rf, version_ids=revs)
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)
304
179
class Inter1and2Helper(object):
305
180
"""Helper for operations that convert data from model 1 and 2
307
182
This is for use by fetchers and converters.
310
def __init__(self, source, target):
185
def __init__(self, source):
313
188
:param source: The repository data comes from
314
:param target: The repository data goes to
316
190
self.source = source
319
192
def iter_rev_trees(self, revs):
320
193
"""Iterate through RevisionTrees efficiently.
336
209
revs = revs[100:]
211
def _find_root_ids(self, revs, parent_map, graph):
213
for tree in self.iter_rev_trees(revs):
214
revision_id = tree.inventory.root.revision
215
root_id = tree.get_root_id()
216
revision_root[revision_id] = root_id
217
# Find out which parents we don't already know root ids for
219
for revision_parents in parent_map.itervalues():
220
parents.update(revision_parents)
221
parents.difference_update(revision_root.keys() + [NULL_REVISION])
222
# Limit to revisions present in the versionedfile
223
parents = graph.get_parent_map(parents).keys()
224
for tree in self.iter_rev_trees(parents):
225
root_id = tree.get_root_id()
226
revision_root[tree.get_revision_id()] = root_id
338
229
def generate_root_texts(self, revs):
339
230
"""Generate VersionedFiles for all root ids.
341
232
:param revs: the revisions to include
343
inventory_weave = self.source.get_inventory_weave()
346
to_store = self.target.weave_store
347
parent_map = self.source.get_graph().get_parent_map(revs)
348
for tree in self.iter_rev_trees(revs):
349
revision_id = tree.inventory.root.revision
350
root_id = tree.get_root_id()
351
parents = parent_map[revision_id]
352
if parents[0] == NULL_REVISION:
354
if root_id not in versionedfile:
355
versionedfile[root_id] = to_store.get_weave_or_empty(root_id,
356
self.target.get_transaction())
357
_, _, parent_texts[root_id] = versionedfile[root_id].add_lines(
358
revision_id, parents, [], parent_texts)
360
def regenerate_inventory(self, revs):
361
"""Generate a new inventory versionedfile in target, convertin data.
363
The inventory is retrieved from the source, (deserializing it), and
364
stored in the target (reserializing it in a different format).
365
:param revs: The revisions to include
367
for tree in self.iter_rev_trees(revs):
368
parents = tree.get_parent_ids()
369
self.target.add_inventory(tree.get_revision_id(), tree.inventory,
373
class Model1toKnit2Fetcher(GenericRepoFetcher):
374
"""Fetch from a Model1 repository into a Knit2 repository
376
def __init__(self, to_repository, from_repository, last_revision=None,
377
pb=None, find_ghosts=True):
378
self.helper = Inter1and2Helper(from_repository, to_repository)
379
GenericRepoFetcher.__init__(self, to_repository, from_repository,
380
last_revision, pb, find_ghosts)
382
def _generate_root_texts(self, revs):
383
self.helper.generate_root_texts(revs)
385
def _fetch_inventory_weave(self, revs, pb):
386
self.helper.regenerate_inventory(revs)
389
class Knit1to2Fetcher(KnitRepoFetcher):
390
"""Fetch from a Knit1 repository into a Knit2 repository"""
392
def __init__(self, to_repository, from_repository, last_revision=None,
393
pb=None, find_ghosts=True):
394
self.helper = Inter1and2Helper(from_repository, to_repository)
395
KnitRepoFetcher.__init__(self, to_repository, from_repository,
396
last_revision, pb, find_ghosts)
398
def _generate_root_texts(self, revs):
399
self.helper.generate_root_texts(revs)
401
def _fetch_inventory_weave(self, revs, pb):
402
self.helper.regenerate_inventory(revs)
405
class RemoteToOtherFetcher(GenericRepoFetcher):
407
def _fetch_everything_for_search(self, search, pp):
408
data_stream = self.from_repository.get_data_stream_for_search(search)
409
self.to_repository.insert_data_stream(data_stream)
234
graph = self.source.get_graph()
235
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]
added
removed
bzrlib/fetch.py
