21
35
that has merged into it. As the first step of a merge, pull, or
22
36
branch operation we copy history from the source into the destination
39
The copying is done in a slightly complicated order. We don't want to
40
add a revision to the store until everything it refers to is also
41
stored, so that if a revision is present we can totally recreate it.
42
However, we can't know what files are included in a revision until we
43
read its inventory. Therefore, we first pull the XML and hold it in
44
memory until we've updated all of the files referenced.
28
from bzrlib.lazy_import import lazy_import
29
lazy_import(globals(), """
40
from bzrlib.revision import NULL_REVISION
41
from bzrlib.trace import mutter
47
# TODO: Avoid repeatedly opening weaves so many times.
49
# XXX: This doesn't handle ghost (not present in branch) revisions at
50
# all yet. I'm not sure they really should be supported.
52
# NOTE: This doesn't copy revisions which may be present but not
53
# merged into the last revision. I'm not sure we want to do that.
55
# - get a list of revisions that need to be pulled in
56
# - for each one, pull in that revision file
57
# and get the inventory, and store the inventory with right
59
# - and get the ancestry, and store that with right parents too
60
# - and keep a note of all file ids and version seen
61
# - then go through all files; for each one get the weave,
62
# and add in all file versions
66
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
67
f = Fetcher(to_branch, from_branch, revision, pb)
68
return f.count_copied, f.failed_revisions
44
71
class RepoFetcher(object):
45
72
"""Pull revisions and texts from one repository to another.
47
This should not be used directly, it's essential a object to encapsulate
48
the logic in InterRepository.fetch().
75
if set, try to limit to the data this revision references.
78
count_copied -- number of revisions copied
79
count_weaves -- number of file weaves copied
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 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.
81
def __init__(self, to_repository, from_repository, last_revision=NULL_REVISION, pb=None):
82
if to_repository.bzrdir.transport.base == from_repository.bzrdir.transport.base:
83
raise Exception("can't fetch from a repository to itself %s, %s" %
84
(from_repository.bzrdir.transport.base,
85
to_repository.bzrdir.transport.base))
61
86
self.to_repository = to_repository
62
87
self.from_repository = from_repository
63
self.sink = to_repository._get_sink()
64
88
# must not mutate self._last_revision as its potentially a shared instance
65
89
self._last_revision = last_revision
66
self._fetch_spec = fetch_spec
67
self.find_ghosts = find_ghosts
91
self.pb = bzrlib.ui.ui_factory.progress_bar()
68
94
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)
96
self.to_repository.lock_write()
100
self.to_repository.unlock()
75
102
self.from_repository.unlock()
77
104
def __fetch(self):
78
105
"""Primary worker function.
80
This initialises all the needed variables, and then fetches the
107
This initialises all the needed variables, and then fetches the
81
108
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))
110
self.to_weaves = self.to_repository.weave_store
111
self.to_control = self.to_repository.control_weaves
112
self.from_weaves = self.from_repository.weave_store
113
self.from_control = self.from_repository.control_weaves
114
self.failed_revisions = []
115
self.count_copied = 0
89
116
self.count_total = 0
117
self.count_weaves = 0
118
self.copied_file_ids = set()
90
119
self.file_ids_names = {}
91
pb = ui.ui_factory.nested_progress_bar()
92
pb.show_pct = pb.show_count = False
94
pb.update("Finding revisions", 0, 2)
95
search = self._revids_to_fetch()
98
pb.update("Fetching revisions", 1, 2)
99
self._fetch_everything_for_search(search)
103
def _fetch_everything_for_search(self, search):
104
"""Fetch all data for the given set of revisions."""
105
# The first phase is "file". We pass the progress bar for it directly
106
# into item_keys_introduced_by, which has more information about how
107
# that phase is progressing than we do. Progress updates for the other
108
# phases are taken care of in this function.
109
# XXX: there should be a clear owner of the progress reporting. Perhaps
110
# item_keys_introduced_by should have a richer API than it does at the
111
# 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()
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")
121
revs = self._revids_to_fetch()
124
self._fetch_weave_texts(revs)
125
self._fetch_inventory_weave(revs)
126
self._fetch_revision_texts(revs)
127
self.count_copied += len(revs)
150
131
def _revids_to_fetch(self):
151
"""Determines the exact revisions needed from self.from_repository to
152
install self._last_revision in self.to_repository.
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
158
132
mutter('fetch up to rev {%s}', self._last_revision)
159
if self._last_revision is NULL_REVISION:
160
# 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)
179
class Inter1and2Helper(object):
180
"""Helper for operations that convert data from model 1 and 2
182
This is for use by fetchers and converters.
185
def __init__(self, source):
188
:param source: The repository data comes from
192
def iter_rev_trees(self, revs):
193
"""Iterate through RevisionTrees efficiently.
195
Additionally, the inventory's revision_id is set if unset.
197
Trees are retrieved in batches of 100, and then yielded in the order
200
:param revs: A list of revision ids
202
# In case that revs is not a list.
205
for tree in self.source.revision_trees(revs[:100]):
206
if tree.inventory.revision_id is None:
207
tree.inventory.revision_id = tree.get_revision_id()
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
229
def generate_root_texts(self, revs):
230
"""Generate VersionedFiles for all root ids.
232
:param revs: the revisions to include
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.
133
if self._last_revision is None:
134
# explicit limit of None
136
if (self._last_revision != NULL_REVISION and
137
self.to_repository.has_revision(self._last_revision)):
141
if self._last_revision is NULL_REVISION:
142
branch_from_revs = set(self.from_repository.all_revision_ids() +
145
branch_from_revs = set(
146
self.from_repository.get_ancestry(self._last_revision))
147
except errors.NoSuchRevision:
148
raise InstallFailed([self._last_revision])
150
branch_to_revs = set(self.to_repository.all_revision_ids() + [None])
151
return branch_from_revs.difference(branch_to_revs)
153
def _fetch_revision_texts(self, revs):
154
self.to_repository.revision_store.copy_multi(
155
self.from_repository.revision_store,
159
def _fetch_weave_texts(self, revs):
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
self.pb.update("merge weave merge", 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())
171
if to_weave.numversions() > 0:
172
# destination has contents, must merge
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]
174
to_weave.join(from_weave)
175
except errors.WeaveParentMismatch:
176
to_weave.reweave(from_weave)
178
# destination is empty, just replace it
179
to_weave = from_weave.copy()
181
self.to_weaves.put_weave(file_id, to_weave,
182
self.to_repository.get_transaction())
185
def _fetch_inventory_weave(self, revs):
186
self.pb.update("inventory fetch", 0, 2)
187
from_weave = self.from_repository.get_inventory_weave()
188
to_weave = self.to_repository.get_inventory_weave()
189
self.pb.update("inventory fetch", 1, 2)
190
to_weave = self.to_control.get_weave('inventory',
191
self.to_repository.get_transaction())
192
self.pb.update("inventory fetch", 2, 2)
194
if to_weave.numversions() > 0:
195
# destination has contents, must merge
197
to_weave.join(from_weave, pb=self.pb, msg='merge inventory')
198
except errors.WeaveParentMismatch:
199
to_weave.reweave(from_weave, pb=self.pb, msg='reweave inventory')
201
# destination is empty, just replace it
202
to_weave = from_weave.copy()
204
self.to_control.put_weave('inventory', to_weave,
205
self.to_repository.get_transaction())
210
class Fetcher(object):
211
"""Pull revisions and texts from one branch to another.
213
This doesn't update the destination's history; that can be done
214
separately if desired.
217
If set, pull only up to this revision_id.
221
last_revision -- if last_revision
222
is given it will be that, otherwise the last revision of
225
count_copied -- number of revisions copied
227
count_weaves -- number of file weaves copied
229
def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
230
if to_branch.base == from_branch.base:
231
raise Exception("can't fetch from a branch to itself %s, %s" %
232
(from_branch.base, to_branch.base))
234
self.to_branch = to_branch
235
self.from_branch = from_branch
236
self._last_revision = last_revision
238
self.pb = bzrlib.ui.ui_factory.progress_bar()
241
self.from_branch.lock_read()
243
self.to_branch.lock_write()
247
self.to_branch.unlock()
249
self.from_branch.unlock()
252
self._find_last_revision()
253
repo_fetcher = RepoFetcher(to_repository=self.to_branch.repository,
254
from_repository=self.from_branch.repository,
256
last_revision=self._last_revision)
257
self.failed_revisions = repo_fetcher.failed_revisions
258
self.count_copied = repo_fetcher.count_copied
259
self.count_total = repo_fetcher.count_total
260
self.count_weaves = repo_fetcher.count_weaves
261
self.copied_file_ids = repo_fetcher.copied_file_ids
263
def _find_last_revision(self):
264
"""Find the limiting source revision.
266
Every ancestor of that revision will be merged across.
268
Returns the revision_id, or returns None if there's no history
269
in the source branch."""
270
if self._last_revision:
272
self.pb.update('get source history')
273
from_history = self.from_branch.revision_history()
274
self.pb.update('get destination history')
276
self._last_revision = from_history[-1]
278
# no history in the source branch
279
self._last_revision = None
added
removed
bzrlib/fetch.py
