1
# Copyright (C) 2005 by Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
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, NoSuchRevision,
38
from bzrlib.trace import mutter
39
from bzrlib.progress import ProgressBar
40
from bzrlib.reconcile import RepoReconciler
41
from bzrlib.revision import NULL_REVISION
42
from bzrlib.symbol_versioning import *
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
63
@deprecated_function(zero_eight)
64
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
65
"""Legacy API, please see branch.fetch(from_branch, last_revision, pb)."""
66
f = Fetcher(to_branch, from_branch, revision, pb)
67
return f.count_copied, f.failed_revisions
72
class RepoFetcher(object):
73
"""Pull revisions and texts from one repository to another.
76
if set, try to limit to the data this revision references.
79
count_copied -- number of revisions copied
81
This should not be used directory, its essential a object to encapsulate
82
the logic in InterRepository.fetch().
84
def __init__(self, to_repository, from_repository, last_revision=None, pb=None):
86
self.failed_revisions = []
88
if to_repository.control_files._transport.base == from_repository.control_files._transport.base:
89
# check that last_revision is in 'from' and then return a no-operation.
90
if last_revision not in (None, NULL_REVISION):
91
from_repository.get_revision(last_revision)
93
self.to_repository = to_repository
94
self.from_repository = from_repository
95
# must not mutate self._last_revision as its potentially a shared instance
96
self._last_revision = last_revision
98
self.pb = bzrlib.ui.ui_factory.progress_bar()
101
self.from_repository.lock_read()
103
self.to_repository.lock_write()
107
self.to_repository.unlock()
109
self.from_repository.unlock()
112
"""Primary worker function.
114
This initialises all the needed variables, and then fetches the
115
requested revisions, finally clearing the progress bar.
117
self.to_weaves = self.to_repository.weave_store
118
self.to_control = self.to_repository.control_weaves
119
self.from_weaves = self.from_repository.weave_store
120
self.from_control = self.from_repository.control_weaves
122
self.file_ids_names = {}
124
revs = self._revids_to_fetch()
127
self._fetch_weave_texts(revs)
128
self._fetch_inventory_weave(revs)
129
self._fetch_revision_texts(revs)
130
self.count_copied += len(revs)
134
def _revids_to_fetch(self):
135
self.pb.update('get destination history')
136
mutter('fetch up to rev {%s}', self._last_revision)
137
if self._last_revision is NULL_REVISION:
138
# explicit limit of no revisions needed
140
if (self._last_revision != None and
141
self.to_repository.has_revision(self._last_revision)):
145
return self.to_repository.missing_revision_ids(self.from_repository,
147
except errors.NoSuchRevision:
148
raise InstallFailed([self._last_revision])
150
def _fetch_weave_texts(self, revs):
151
file_ids = self.from_repository.fileid_involved_by_set(revs)
153
num_file_ids = len(file_ids)
154
for file_id in file_ids:
155
self.pb.update("merge weaves", count, num_file_ids)
157
to_weave = self.to_weaves.get_weave_or_empty(file_id,
158
self.to_repository.get_transaction())
160
if to_weave.num_versions() > 0:
161
# destination has contents, must merge
162
from_weave = self.from_weaves.get_weave(file_id,
163
self.from_repository.get_transaction())
164
to_weave.join(from_weave)
166
# destination is empty, just replace it
167
self.to_weaves.copy_multi(self.from_weaves, [file_id], self.pb,
168
self.from_repository.get_transaction(),
169
self.to_repository.get_transaction())
172
def _fetch_inventory_weave(self, revs):
173
self.pb.update("inventory fetch", 0, 2)
174
to_weave = self.to_control.get_weave('inventory',
175
self.to_repository.get_transaction())
177
if to_weave.num_versions() > 0:
178
# destination has contents, must merge
179
self.pb.update("inventory fetch", 1, 2)
180
from_weave = self.from_repository.get_inventory_weave()
181
self.pb.update("inventory fetch", 2, 2)
182
to_weave.join(from_weave, pb=self.pb, msg='merge inventory')
184
# destination is empty, just replace it
185
self.to_control.copy_multi(self.from_control,
188
self.from_repository.get_transaction(),
189
self.to_repository.get_transaction())
194
class GenericRepoFetcher(RepoFetcher):
195
"""This is a generic repo to repo fetcher.
197
This makes minimal assumptions about repo layout and contents.
198
It triggers a reconciliation after fetching to ensure integrity.
201
def _fetch_revision_texts(self, revs):
202
self.to_transaction = self.to_repository.get_transaction()
206
self.pb.update('copying revisions', count, total)
208
sig_text = self.from_repository.get_signature_text(rev)
209
self.to_repository._revision_store.add_revision_signature_text(
210
rev, sig_text, self.to_transaction)
211
except errors.NoSuchRevision:
214
self.to_repository._revision_store.add_revision(
215
self.from_repository.get_revision(rev),
218
self.pb.update('copying revisions', count, total)
219
# fixup inventory if needed:
220
# this is expensive because we have no inverse index to current ghosts.
221
# but on local disk its a few seconds and sftp push is already insane.
223
# FIXME: repository should inform if this is needed.
224
reconciler = RepoReconciler(self.to_repository)
225
reconciler.reconcile()
228
class KnitRepoFetcher(RepoFetcher):
229
"""This is a knit format repository specific fetcher.
231
This differs from the GenericRepoFetcher by not doing a
232
reconciliation after copying, and using knit joining to
236
def _fetch_revision_texts(self, revs):
237
# may need to be a InterRevisionStore call here.
238
from_transaction = self.from_repository.get_transaction()
239
to_transaction = self.to_repository.get_transaction()
240
to_sf = self.to_repository._revision_store.get_signature_file(
242
from_sf = self.from_repository._revision_store.get_signature_file(
244
to_sf.join(from_sf, version_ids=revs, pb=self.pb, ignore_missing=True)
245
to_rf = self.to_repository._revision_store.get_revision_file(
247
from_rf = self.from_repository._revision_store.get_revision_file(
249
to_rf.join(from_rf, version_ids=revs, pb=self.pb)
250
reconciler = RepoReconciler(self.to_repository)
251
reconciler.reconcile()
254
class Fetcher(object):
255
"""Backwards compatability glue for branch.fetch()."""
257
@deprecated_method(zero_eight)
258
def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
259
"""Please see branch.fetch()."""
260
to_branch.fetch(from_branch, last_revision, pb)
added
removed
bzrlib/fetch.py
