1
# Copyright (C) 2005, 2006 Canonical Ltd
1
# Copyright (C) 2005 by Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
"""Copying of history from one branch to another.
20
The basic plan is that every branch knows the history of everything
21
that has merged into it. As the first step of a merge, pull, or
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
37
from bzrlib.progress import ProgressPhase
38
from bzrlib.revision import is_null, NULL_REVISION
39
from bzrlib.symbol_versioning import (deprecated_function,
42
from bzrlib.trace import mutter
45
from bzrlib.lazy_import import lazy_import
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
65
class RepoFetcher(object):
66
"""Pull revisions and texts from one repository to another.
69
if set, try to limit to the data this revision references.
72
count_copied -- number of revisions copied
74
This should not be used directly, it's essential a object to encapsulate
75
the logic in InterRepository.fetch().
17
from bzrlib.trace import mutter, note
18
from bzrlib.branch import Branch
19
from bzrlib.progress import ProgressBar
23
def has_revision(branch, revision_id):
25
branch.get_revision_xml(revision_id)
27
except bzrlib.errors.NoSuchRevision:
31
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
32
"""Copy a revision and all available ancestors from one branch to another
33
If no revision is specified, uses the last revision in the source branch's
78
def __init__(self, to_repository, from_repository, last_revision=None, pb=None,
80
"""Create a repo fetcher.
82
:param find_ghosts: If True search the entire history for ghosts.
85
self.failed_revisions = []
87
if to_repository.has_same_location(from_repository):
88
# repository.fetch should be taking care of this case.
89
raise errors.BzrError('RepoFetcher run '
90
'between two objects at the same location: '
91
'%r and %r' % (to_repository, from_repository))
92
self.to_repository = to_repository
93
self.from_repository = from_repository
94
# must not mutate self._last_revision as its potentially a shared instance
95
self._last_revision = last_revision
96
self.find_ghosts = find_ghosts
98
self.pb = bzrlib.ui.ui_factory.nested_progress_bar()
99
self.nested_pb = self.pb
36
from_history = from_branch.revision_history()
37
required_revisions = set(from_history)
39
if revision is not None:
40
required_revisions.add(revision)
42
rev_index = from_history.index(revision)
45
if rev_index is not None:
46
from_history = from_history[:rev_index + 1]
102
self.nested_pb = None
103
self.from_repository.lock_read()
105
self.to_repository.lock_write()
48
from_history = [revision]
49
to_history = to_branch.revision_history()
51
for rev_id in from_history:
52
if not has_revision(to_branch, rev_id):
53
missing.append(rev_id)
56
while len(missing) > 0:
57
installed, failed = to_branch.install_revisions(from_branch,
61
required_failed = failed.intersection(required_revisions)
62
if len(required_failed) > 0:
63
raise bzrlib.errors.InstallFailed(required_failed)
65
note("Failed to install %s" % rev_id)
66
all_failed.update(failed)
68
for rev_id in missing:
107
self.to_repository.start_write_group()
111
self.to_repository.abort_write_group()
70
revision = from_branch.get_revision(rev_id)
71
except bzrlib.errors.NoSuchRevision:
72
if revision in from_history:
114
self.to_repository.commit_write_group()
116
if self.nested_pb is not None:
117
self.nested_pb.finished()
118
self.to_repository.unlock()
120
self.from_repository.unlock()
123
"""Primary worker function.
125
This initialises all the needed variables, and then fetches the
126
requested revisions, finally clearing the progress bar.
128
self.to_weaves = self.to_repository.weave_store
129
self.from_weaves = self.from_repository.weave_store
131
self.file_ids_names = {}
132
pp = ProgressPhase('Transferring', 4, self.pb)
135
search = self._revids_to_fetch()
138
if getattr(self, '_fetch_everything_for_search', None) is not None:
139
self._fetch_everything_for_search(search, pp)
141
# backward compatibility
142
self._fetch_everything_for_revisions(search.get_keys, pp)
146
def _fetch_everything_for_search(self, search, pp):
147
"""Fetch all data for the given set of revisions."""
148
# The first phase is "file". We pass the progress bar for it directly
149
# into item_keys_introduced_by, which has more information about how
150
# that phase is progressing than we do. Progress updates for the other
151
# phases are taken care of in this function.
152
# XXX: there should be a clear owner of the progress reporting. Perhaps
153
# item_keys_introduced_by should have a richer API than it does at the
154
# moment, so that it can feed the progress information back to this
157
pb = bzrlib.ui.ui_factory.nested_progress_bar()
159
revs = search.get_keys()
160
data_to_fetch = self.from_repository.item_keys_introduced_by(revs, pb)
161
for knit_kind, file_id, revisions in data_to_fetch:
162
if knit_kind != phase:
164
# Make a new progress bar for this phase
167
pb = bzrlib.ui.ui_factory.nested_progress_bar()
168
if knit_kind == "file":
169
self._fetch_weave_text(file_id, revisions)
170
elif knit_kind == "inventory":
172
# Once we've processed all the files, then we generate the root
173
# texts (if necessary), then we process the inventory. It's a
174
# bit distasteful to have knit_kind == "inventory" mean this,
175
# perhaps it should happen on the first non-"file" knit, in case
176
# it's not always inventory?
177
self._generate_root_texts(revs)
178
self._fetch_inventory_weave(revs, pb)
179
elif knit_kind == "signatures":
180
# Nothing to do here; this will be taken care of when
181
# _fetch_revision_texts happens.
183
elif knit_kind == "revisions":
184
self._fetch_revision_texts(revs, pb)
186
raise AssertionError("Unknown knit kind %r" % knit_kind)
190
self.count_copied += len(revs)
192
def _revids_to_fetch(self):
193
"""Determines the exact revisions needed from self.from_repository to
194
install self._last_revision in self.to_repository.
196
If no revisions need to be fetched, then this just returns None.
198
mutter('fetch up to rev {%s}', self._last_revision)
199
if self._last_revision is NULL_REVISION:
200
# explicit limit of no revisions needed
202
if (self._last_revision is not None and
203
self.to_repository.has_revision(self._last_revision)):
206
return self.to_repository.search_missing_revision_ids(
207
self.from_repository, self._last_revision,
208
find_ghosts=self.find_ghosts)
209
except errors.NoSuchRevision:
210
raise InstallFailed([self._last_revision])
212
def _fetch_weave_text(self, file_id, required_versions):
213
to_weave = self.to_weaves.get_weave_or_empty(file_id,
214
self.to_repository.get_transaction())
215
from_weave = self.from_weaves.get_weave(file_id,
216
self.from_repository.get_transaction())
217
# we fetch all the texts, because texts do
218
# not reference anything, and its cheap enough
219
to_weave.join(from_weave, version_ids=required_versions)
220
# we don't need *all* of this data anymore, but we dont know
221
# what we do. This cache clearing will result in a new read
222
# of the knit data when we do the checkout, but probably we
223
# want to emit the needed data on the fly rather than at the
225
# the from weave should know not to cache data being joined,
226
# but its ok to ask it to clear.
227
from_weave.clear_cache()
228
to_weave.clear_cache()
230
def _fetch_inventory_weave(self, revs, pb):
231
pb.update("fetch inventory", 0, 2)
232
to_weave = self.to_repository.get_inventory_weave()
233
child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
235
# just merge, this is optimisable and its means we don't
236
# copy unreferenced data such as not-needed inventories.
237
pb.update("fetch inventory", 1, 3)
238
from_weave = self.from_repository.get_inventory_weave()
239
pb.update("fetch inventory", 2, 3)
240
# we fetch only the referenced inventories because we do not
241
# know for unselected inventories whether all their required
242
# texts are present in the other repository - it could be
244
to_weave.join(from_weave, pb=child_pb, msg='merge inventory',
246
from_weave.clear_cache()
250
def _generate_root_texts(self, revs):
251
"""This will be called by __fetch between fetching weave texts and
252
fetching the inventory weave.
254
Subclasses should override this if they need to generate root texts
255
after fetching weave texts.
260
class GenericRepoFetcher(RepoFetcher):
261
"""This is a generic repo to repo fetcher.
263
This makes minimal assumptions about repo layout and contents.
264
It triggers a reconciliation after fetching to ensure integrity.
267
def _fetch_revision_texts(self, revs, pb):
268
"""Fetch revision object texts"""
269
to_txn = self.to_transaction = self.to_repository.get_transaction()
272
to_store = self.to_repository._revision_store
274
pb.update('copying revisions', count, total)
276
sig_text = self.from_repository.get_signature_text(rev)
277
to_store.add_revision_signature_text(rev, sig_text, to_txn)
278
except errors.NoSuchRevision:
281
to_store.add_revision(self.from_repository.get_revision(rev),
284
# fixup inventory if needed:
285
# this is expensive because we have no inverse index to current ghosts.
286
# but on local disk its a few seconds and sftp push is already insane.
288
# FIXME: repository should inform if this is needed.
289
self.to_repository.reconcile()
292
class KnitRepoFetcher(RepoFetcher):
293
"""This is a knit format repository specific fetcher.
295
This differs from the GenericRepoFetcher by not doing a
296
reconciliation after copying, and using knit joining to
300
def _fetch_revision_texts(self, revs, pb):
301
# may need to be a InterRevisionStore call here.
302
from_transaction = self.from_repository.get_transaction()
303
to_transaction = self.to_repository.get_transaction()
304
to_sf = self.to_repository._revision_store.get_signature_file(
306
from_sf = self.from_repository._revision_store.get_signature_file(
308
to_sf.join(from_sf, version_ids=revs, ignore_missing=True)
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=revs)
316
class Inter1and2Helper(object):
317
"""Helper for operations that convert data from model 1 and 2
319
This is for use by fetchers and converters.
322
def __init__(self, source, target):
325
:param source: The repository data comes from
326
:param target: The repository data goes to
331
def iter_rev_trees(self, revs):
332
"""Iterate through RevisionTrees efficiently.
334
Additionally, the inventory's revision_id is set if unset.
336
Trees are retrieved in batches of 100, and then yielded in the order
339
:param revs: A list of revision ids
341
# In case that revs is not a list.
344
for tree in self.source.revision_trees(revs[:100]):
345
if tree.inventory.revision_id is None:
346
tree.inventory.revision_id = tree.get_revision_id()
350
def generate_root_texts(self, revs):
351
"""Generate VersionedFiles for all root ids.
353
:param revs: the revisions to include
355
inventory_weave = self.source.get_inventory_weave()
358
to_store = self.target.weave_store
359
parent_map = self.source.get_graph().get_parent_map(revs)
360
for tree in self.iter_rev_trees(revs):
361
revision_id = tree.inventory.root.revision
362
root_id = tree.get_root_id()
363
parents = parent_map[revision_id]
364
if parents[0] == NULL_REVISION:
366
if root_id not in versionedfile:
367
versionedfile[root_id] = to_store.get_weave_or_empty(root_id,
368
self.target.get_transaction())
369
_, _, parent_texts[root_id] = versionedfile[root_id].add_lines(
370
revision_id, parents, [], parent_texts)
372
def regenerate_inventory(self, revs):
373
"""Generate a new inventory versionedfile in target, convertin data.
375
The inventory is retrieved from the source, (deserializing it), and
376
stored in the target (reserializing it in a different format).
377
:param revs: The revisions to include
379
for tree in self.iter_rev_trees(revs):
380
parents = tree.get_parent_ids()
381
self.target.add_inventory(tree.get_revision_id(), tree.inventory,
385
class Model1toKnit2Fetcher(GenericRepoFetcher):
386
"""Fetch from a Model1 repository into a Knit2 repository
388
def __init__(self, to_repository, from_repository, last_revision=None,
389
pb=None, find_ghosts=True):
390
self.helper = Inter1and2Helper(from_repository, to_repository)
391
GenericRepoFetcher.__init__(self, to_repository, from_repository,
392
last_revision, pb, find_ghosts)
394
def _generate_root_texts(self, revs):
395
self.helper.generate_root_texts(revs)
397
def _fetch_inventory_weave(self, revs, pb):
398
self.helper.regenerate_inventory(revs)
401
class Knit1to2Fetcher(KnitRepoFetcher):
402
"""Fetch from a Knit1 repository into a Knit2 repository"""
404
def __init__(self, to_repository, from_repository, last_revision=None,
405
pb=None, find_ghosts=True):
406
self.helper = Inter1and2Helper(from_repository, to_repository)
407
KnitRepoFetcher.__init__(self, to_repository, from_repository,
408
last_revision, pb, find_ghosts)
410
def _generate_root_texts(self, revs):
411
self.helper.generate_root_texts(revs)
413
def _fetch_inventory_weave(self, revs, pb):
414
self.helper.regenerate_inventory(revs)
417
class RemoteToOtherFetcher(GenericRepoFetcher):
419
def _fetch_everything_for_search(self, search, pp):
420
data_stream = self.from_repository.get_data_stream_for_search(search)
421
self.to_repository.insert_data_stream(data_stream)
76
for parent in [p.revision_id for p in revision.parents]:
77
if not has_revision(to_branch, parent):
78
new_missing.add(parent)
80
return count, all_failed
added
removed
bzrlib/fetch.py
