1
# Copyright (C) 2005, 2006, 2008, 2009 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
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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
33
from bzrlib.errors import InstallFailed
34
from bzrlib.progress import ProgressPhase
35
from bzrlib.revision import NULL_REVISION
36
from bzrlib.tsort import topo_sort
37
from bzrlib.trace import mutter
39
from bzrlib.versionedfile import FulltextContentFactory
42
class RepoFetcher(object):
43
"""Pull revisions and texts from one repository to another.
45
This should not be used directly, it's essential a object to encapsulate
46
the logic in InterRepository.fetch().
49
def __init__(self, to_repository, from_repository, last_revision=None,
50
pb=None, find_ghosts=True, fetch_spec=None):
51
"""Create a repo fetcher.
53
:param last_revision: If set, try to limit to the data this revision
55
:param find_ghosts: If True search the entire history for ghosts.
56
:param _write_group_acquired_callable: Don't use; this parameter only
57
exists to facilitate a hack done in InterPackRepo.fetch. We would
58
like to remove this parameter.
59
:param pb: ProgressBar object to use; deprecated and ignored.
60
This method will just create one on top of the stack.
63
symbol_versioning.warn(
64
symbol_versioning.deprecated_in((1, 14, 0))
65
% "pb parameter to RepoFetcher.__init__")
66
# and for simplicity it is in fact ignored
67
if to_repository.has_same_location(from_repository):
68
# repository.fetch should be taking care of this case.
69
raise errors.BzrError('RepoFetcher run '
70
'between two objects at the same location: '
71
'%r and %r' % (to_repository, from_repository))
72
self.to_repository = to_repository
73
self.from_repository = from_repository
74
self.sink = to_repository._get_sink()
75
# must not mutate self._last_revision as its potentially a shared instance
76
self._last_revision = last_revision
77
self._fetch_spec = fetch_spec
78
self.find_ghosts = find_ghosts
79
self.from_repository.lock_read()
80
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
81
self.from_repository, self.from_repository._format,
82
self.to_repository, self.to_repository._format)
86
self.from_repository.unlock()
89
"""Primary worker function.
91
This initialises all the needed variables, and then fetches the
92
requested revisions, finally clearing the progress bar.
94
# Roughly this is what we're aiming for fetch to become:
96
# missing = self.sink.insert_stream(self.source.get_stream(search))
98
# missing = self.sink.insert_stream(self.source.get_items(missing))
101
self.file_ids_names = {}
102
pb = bzrlib.ui.ui_factory.nested_progress_bar()
103
pb.show_pct = pb.show_count = False
105
pb.update("Finding revisions", 0, 2)
106
search = self._revids_to_fetch()
109
pb.update("Fetching revisions", 1, 2)
110
self._fetch_everything_for_search(search)
114
def _fetch_everything_for_search(self, search):
115
"""Fetch all data for the given set of revisions."""
116
# The first phase is "file". We pass the progress bar for it directly
117
# into item_keys_introduced_by, which has more information about how
118
# that phase is progressing than we do. Progress updates for the other
119
# phases are taken care of in this function.
120
# XXX: there should be a clear owner of the progress reporting. Perhaps
121
# item_keys_introduced_by should have a richer API than it does at the
122
# moment, so that it can feed the progress information back to this
124
if (self.from_repository._format.rich_root_data and
125
not self.to_repository._format.rich_root_data):
126
raise errors.IncompatibleRepositories(
127
self.from_repository, self.to_repository,
128
"different rich-root support")
129
pb = bzrlib.ui.ui_factory.nested_progress_bar()
131
pb.update("Get stream source")
132
source = self.from_repository._get_source(
133
self.to_repository._format)
134
stream = source.get_stream(search)
135
from_format = self.from_repository._format
136
pb.update("Inserting stream")
137
resume_tokens, missing_keys = self.sink.insert_stream(
138
stream, from_format, [])
140
pb.update("Missing keys")
141
stream = source.get_stream_for_missing_keys(missing_keys)
142
pb.update("Inserting missing keys")
143
resume_tokens, missing_keys = self.sink.insert_stream(
144
stream, from_format, resume_tokens)
146
raise AssertionError(
147
"second push failed to complete a fetch %r." % (
150
raise AssertionError(
151
"second push failed to commit the fetch %r." % (
153
pb.update("Finishing stream")
158
def _revids_to_fetch(self):
159
"""Determines the exact revisions needed from self.from_repository to
160
install self._last_revision in self.to_repository.
162
If no revisions need to be fetched, then this just returns None.
164
if self._fetch_spec is not None:
165
return self._fetch_spec
166
mutter('fetch up to rev {%s}', self._last_revision)
167
if self._last_revision is NULL_REVISION:
168
# explicit limit of no revisions needed
170
if (self._last_revision is not None and
171
self.to_repository.has_revision(self._last_revision)):
174
return self.to_repository.search_missing_revision_ids(
175
self.from_repository, self._last_revision,
176
find_ghosts=self.find_ghosts)
177
except errors.NoSuchRevision, e:
178
raise InstallFailed([self._last_revision])
181
class Inter1and2Helper(object):
182
"""Helper for operations that convert data from model 1 and 2
184
This is for use by fetchers and converters.
187
def __init__(self, source):
190
:param source: The repository data comes from
194
def iter_rev_trees(self, revs):
195
"""Iterate through RevisionTrees efficiently.
197
Additionally, the inventory's revision_id is set if unset.
199
Trees are retrieved in batches of 100, and then yielded in the order
202
:param revs: A list of revision ids
204
# In case that revs is not a list.
207
for tree in self.source.revision_trees(revs[:100]):
208
if tree.inventory.revision_id is None:
209
tree.inventory.revision_id = tree.get_revision_id()
213
def _find_root_ids(self, revs, parent_map, graph):
215
planned_versions = {}
216
for tree in self.iter_rev_trees(revs):
217
revision_id = tree.inventory.root.revision
218
root_id = tree.get_root_id()
219
planned_versions.setdefault(root_id, []).append(revision_id)
220
revision_root[revision_id] = root_id
221
# Find out which parents we don't already know root ids for
223
for revision_parents in parent_map.itervalues():
224
parents.update(revision_parents)
225
parents.difference_update(revision_root.keys() + [NULL_REVISION])
226
# Limit to revisions present in the versionedfile
227
parents = graph.get_parent_map(parents).keys()
228
for tree in self.iter_rev_trees(parents):
229
root_id = tree.get_root_id()
230
revision_root[tree.get_revision_id()] = root_id
231
return revision_root, planned_versions
233
def generate_root_texts(self, revs):
234
"""Generate VersionedFiles for all root ids.
236
:param revs: the revisions to include
238
graph = self.source.get_graph()
239
parent_map = graph.get_parent_map(revs)
240
rev_order = topo_sort(parent_map)
241
rev_id_to_root_id, root_id_to_rev_ids = self._find_root_ids(
242
revs, parent_map, graph)
243
root_id_order = [(rev_id_to_root_id[rev_id], rev_id) for rev_id in
245
# Guaranteed stable, this groups all the file id operations together
246
# retaining topological order within the revisions of a file id.
247
# File id splits and joins would invalidate this, but they don't exist
248
# yet, and are unlikely to in non-rich-root environments anyway.
249
root_id_order.sort(key=operator.itemgetter(0))
250
# Create a record stream containing the roots to create.
252
for key in root_id_order:
253
root_id, rev_id = key
254
rev_parents = parent_map[rev_id]
255
# We drop revision parents with different file-ids, because
256
# that represents a rename of the root to a different location
257
# - its not actually a parent for us. (We could look for that
258
# file id in the revision tree at considerably more expense,
259
# but for now this is sufficient (and reconcile will catch and
260
# correct this anyway).
261
# When a parent revision is a ghost, we guess that its root id
262
# was unchanged (rather than trimming it from the parent list).
263
parent_keys = tuple((root_id, parent) for parent in rev_parents
264
if parent != NULL_REVISION and
265
rev_id_to_root_id.get(parent, root_id) == root_id)
266
yield FulltextContentFactory(key, parent_keys, None, '')
267
return [('texts', yield_roots())]
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
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
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]
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:
70
revision = from_branch.get_revision(rev_id)
71
except bzrlib.errors.NoSuchRevision:
72
if revision in from_history:
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
