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(), """
36
import bzrlib.errors as errors
37
from bzrlib.errors import InstallFailed
38
from bzrlib.progress import ProgressPhase
40
39
from bzrlib.revision import NULL_REVISION
40
from bzrlib.tsort import topo_sort
41
41
from bzrlib.trace import mutter
43
from bzrlib.versionedfile import filter_absent, FulltextContentFactory
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
44
63
class RepoFetcher(object):
45
64
"""Pull revisions and texts from one repository to another.
67
if set, try to limit to the data this revision references.
70
count_copied -- number of revisions copied
47
72
This should not be used directly, it's essential a object to encapsulate
48
73
the logic in InterRepository.fetch().
51
def __init__(self, to_repository, from_repository, last_revision=None,
52
find_ghosts=True, fetch_spec=None):
76
def __init__(self, to_repository, from_repository, last_revision=None, pb=None,
53
78
"""Create a repo fetcher.
55
:param last_revision: If set, try to limit to the data this revision
57
80
:param find_ghosts: If True search the entire history for ghosts.
81
:param _write_group_acquired_callable: Don't use; this parameter only
82
exists to facilitate a hack done in InterPackRepo.fetch. We would
83
like to remove this parameter.
59
# repository.fetch has the responsibility for short-circuiting
60
# attempts to copy between a repository and itself.
86
self.failed_revisions = []
88
if to_repository.has_same_location(from_repository):
89
# repository.fetch should be taking care of this case.
90
raise errors.BzrError('RepoFetcher run '
91
'between two objects at the same location: '
92
'%r and %r' % (to_repository, from_repository))
61
93
self.to_repository = to_repository
62
94
self.from_repository = from_repository
63
95
self.sink = to_repository._get_sink()
64
96
# must not mutate self._last_revision as its potentially a shared instance
65
97
self._last_revision = last_revision
66
self._fetch_spec = fetch_spec
67
98
self.find_ghosts = find_ghosts
100
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
101
self.nested_pb = self.pb
104
self.nested_pb = None
68
105
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)
107
self.to_repository.lock_write()
109
self.to_repository.start_write_group()
113
self.to_repository.abort_write_group(suppress_errors=True)
116
self.to_repository.commit_write_group()
119
if self.nested_pb is not None:
120
self.nested_pb.finished()
122
self.to_repository.unlock()
75
124
self.from_repository.unlock()
77
126
def __fetch(self):
78
127
"""Primary worker function.
80
This initialises all the needed variables, and then fetches the
129
This initialises all the needed variables, and then fetches the
81
130
requested revisions, finally clearing the progress bar.
83
132
# Roughly this is what we're aiming for fetch to become:
110
157
# item_keys_introduced_by should have a richer API than it does at the
111
158
# 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()
160
self.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
162
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")
163
stream = self.get_stream(search, pp)
164
self.sink.insert_stream(stream, from_format)
146
165
self.sink.finished()
167
if self.pb is not None:
170
def get_stream(self, search, pp):
172
revs = search.get_keys()
173
graph = self.from_repository.get_graph()
174
revs = list(graph.iter_topo_order(revs))
175
data_to_fetch = self.from_repository.item_keys_introduced_by(
178
for knit_kind, file_id, revisions in data_to_fetch:
179
if knit_kind != phase:
181
# Make a new progress bar for this phase
184
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
185
if knit_kind == "file":
186
# Accumulate file texts
187
text_keys.extend([(file_id, revision) for revision in
189
elif knit_kind == "inventory":
190
# Now copy the file texts.
191
to_texts = self.to_repository.texts
192
from_texts = self.from_repository.texts
193
yield ('texts', from_texts.get_record_stream(
194
text_keys, self.to_repository._fetch_order,
195
not self.to_repository._fetch_uses_deltas))
196
# Cause an error if a text occurs after we have done the
199
# Before we process the inventory we generate the root
200
# texts (if necessary) so that the inventories references
202
for _ in self._generate_root_texts(revs):
204
# NB: This currently reopens the inventory weave in source;
205
# using a single stream interface instead would avoid this.
206
self.pb.update("fetch inventory", 0, 1)
207
from_weave = self.from_repository.inventories
208
# we fetch only the referenced inventories because we do not
209
# know for unselected inventories whether all their required
210
# texts are present in the other repository - it could be
212
yield ('inventories', from_weave.get_record_stream(
213
[(rev_id,) for rev_id in revs],
214
self.inventory_fetch_order(),
215
not self.delta_on_metadata()))
216
elif knit_kind == "signatures":
217
# Nothing to do here; this will be taken care of when
218
# _fetch_revision_texts happens.
220
elif knit_kind == "revisions":
221
for _ in self._fetch_revision_texts(revs, self.pb):
224
raise AssertionError("Unknown knit kind %r" % knit_kind)
225
self.count_copied += len(revs)
150
227
def _revids_to_fetch(self):
151
228
"""Determines the exact revisions needed from self.from_repository to
154
231
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
233
mutter('fetch up to rev {%s}', self._last_revision)
159
234
if self._last_revision is NULL_REVISION:
160
235
# 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)
237
if (self._last_revision is not None and
238
self.to_repository.has_revision(self._last_revision)):
241
return self.to_repository.search_missing_revision_ids(
242
self.from_repository, self._last_revision,
243
find_ghosts=self.find_ghosts)
244
except errors.NoSuchRevision, e:
245
raise InstallFailed([self._last_revision])
247
def _fetch_revision_texts(self, revs, pb):
248
# fetch signatures first and then the revision texts
249
# may need to be a InterRevisionStore call here.
250
from_sf = self.from_repository.signatures
251
# A missing signature is just skipped.
252
keys = [(rev_id,) for rev_id in revs]
253
signatures = filter_absent(from_sf.get_record_stream(
255
self.to_repository._fetch_order,
256
not self.to_repository._fetch_uses_deltas))
257
# If a revision has a delta, this is actually expanded inside the
258
# insert_record_stream code now, which is an alternate fix for
260
from_rf = self.from_repository.revisions
261
revisions = from_rf.get_record_stream(
263
self.to_repository._fetch_order,
264
not self.delta_on_metadata())
265
return [('signatures', signatures), ('revisions', revisions)]
267
def _generate_root_texts(self, revs):
268
"""This will be called by __fetch between fetching weave texts and
269
fetching the inventory weave.
271
Subclasses should override this if they need to generate root texts
272
after fetching weave texts.
276
def inventory_fetch_order(self):
277
return self.to_repository._fetch_order
279
def delta_on_metadata(self):
280
src_serializer = self.from_repository._format._serializer
281
target_serializer = self.to_repository._format._serializer
282
return (self.to_repository._fetch_uses_deltas and
283
src_serializer == target_serializer)
179
286
class Inter1and2Helper(object):
180
287
"""Helper for operations that convert data from model 1 and 2
182
289
This is for use by fetchers and converters.
243
353
# yet, and are unlikely to in non-rich-root environments anyway.
244
354
root_id_order.sort(key=operator.itemgetter(0))
245
355
# 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]
357
for key in root_id_order:
358
root_id, rev_id = key
359
rev_parents = parent_map[rev_id]
360
# We drop revision parents with different file-ids, because
361
# that represents a rename of the root to a different location
362
# - its not actually a parent for us. (We could look for that
363
# file id in the revision tree at considerably more expense,
364
# but for now this is sufficient (and reconcile will catch and
365
# correct this anyway).
366
# When a parent revision is a ghost, we guess that its root id
367
# was unchanged (rather than trimming it from the parent list).
368
parent_keys = tuple((root_id, parent) for parent in rev_parents
369
if parent != NULL_REVISION and
370
rev_id_to_root_id.get(parent, root_id) == root_id)
371
yield FulltextContentFactory(key, parent_keys, None, '')
372
return [('texts', yield_roots())]
375
class Model1toKnit2Fetcher(RepoFetcher):
376
"""Fetch from a Model1 repository into a Knit2 repository
378
def __init__(self, to_repository, from_repository, last_revision=None,
379
pb=None, find_ghosts=True):
380
self.helper = Inter1and2Helper(from_repository)
381
RepoFetcher.__init__(self, to_repository, from_repository,
382
last_revision, pb, find_ghosts)
384
def _generate_root_texts(self, revs):
385
return self.helper.generate_root_texts(revs)
387
def inventory_fetch_order(self):
390
Knit1to2Fetcher = Model1toKnit2Fetcher
added
removed
bzrlib/fetch.py
