65
68
return f.count_copied, f.failed_revisions
71
class RepoFetcher(object):
72
"""Pull revisions and texts from one repository to another.
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
81
def __init__(self, to_repository, from_repository, last_revision=None, 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))
86
self.to_repository = to_repository
87
self.from_repository = from_repository
88
# must not mutate self._last_revision as its potentially a shared instance
89
self._last_revision = last_revision
91
self.pb = bzrlib.ui.ui_factory.progress_bar()
94
self.from_repository.lock_read()
96
self.to_repository.lock_write()
100
self.to_repository.unlock()
102
self.from_repository.unlock()
105
"""Primary worker function.
107
This initialises all the needed variables, and then fetches the
108
requested revisions, finally clearing the progress bar.
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
117
self.count_weaves = 0
118
self.copied_file_ids = set()
119
self.file_ids_names = {}
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)
131
def _revids_to_fetch(self):
132
mutter('fetch up to rev {%s}', self._last_revision)
133
if self._last_revision is NULL_REVISION:
134
# explicit limit of no revisions needed
136
if (self._last_revision != None and
137
self.to_repository.has_revision(self._last_revision)):
141
return self.to_repository.missing_revision_ids(self.from_repository,
143
except errors.NoSuchRevision:
144
raise InstallFailed([self._last_revision])
146
def _fetch_revision_texts(self, revs):
147
self.to_repository.revision_store.copy_multi(
148
self.from_repository.revision_store,
152
def _fetch_weave_texts(self, revs):
153
file_ids = self.from_repository.fileid_involved_by_set(revs)
155
num_file_ids = len(file_ids)
156
for file_id in file_ids:
157
self.pb.update("merge weaves", count, num_file_ids)
159
to_weave = self.to_weaves.get_weave_or_empty(file_id,
160
self.to_repository.get_transaction())
161
from_weave = self.from_weaves.get_weave(file_id,
162
self.from_repository.get_transaction())
164
if to_weave.numversions() > 0:
165
# destination has contents, must merge
167
to_weave.join(from_weave)
168
except errors.WeaveParentMismatch:
169
to_weave.reweave(from_weave)
171
# destination is empty, just replace it
172
to_weave = from_weave.copy()
174
self.to_weaves.put_weave(file_id, to_weave,
175
self.to_repository.get_transaction())
178
def _fetch_inventory_weave(self, revs):
179
self.pb.update("inventory fetch", 0, 2)
180
from_weave = self.from_repository.get_inventory_weave()
181
to_weave = self.to_repository.get_inventory_weave()
182
self.pb.update("inventory fetch", 1, 2)
183
to_weave = self.to_control.get_weave('inventory',
184
self.to_repository.get_transaction())
185
self.pb.update("inventory fetch", 2, 2)
187
if to_weave.numversions() > 0:
188
# destination has contents, must merge
190
to_weave.join(from_weave, pb=self.pb, msg='merge inventory')
191
except errors.WeaveParentMismatch:
192
to_weave.reweave(from_weave, pb=self.pb, msg='reweave inventory')
194
# destination is empty, just replace it
195
to_weave = from_weave.copy()
197
self.to_control.put_weave('inventory', to_weave,
198
self.to_repository.get_transaction())
69
203
class Fetcher(object):
70
204
"""Pull revisions and texts from one branch to another.
86
220
count_weaves -- number of file weaves copied
88
222
def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
89
if to_branch == from_branch:
90
raise Exception("can't fetch from a branch to itself")
223
if to_branch.base == from_branch.base:
224
raise Exception("can't fetch from a branch to itself %s, %s" %
225
(from_branch.base, to_branch.base))
91
227
self.to_branch = to_branch
92
self.to_weaves = to_branch.weave_store
93
self.to_control = to_branch.control_weaves
94
228
self.from_branch = from_branch
95
self.from_weaves = from_branch.weave_store
96
self.from_control = from_branch.control_weaves
97
self.failed_revisions = []
100
self.count_weaves = 0
101
self.copied_file_ids = set()
229
self._last_revision = last_revision
103
231
self.pb = bzrlib.ui.ui_factory.progress_bar()
106
234
self.from_branch.lock_read()
108
self._fetch_revisions(last_revision)
236
self.to_branch.lock_write()
240
self.to_branch.unlock()
110
242
self.from_branch.unlock()
113
def _fetch_revisions(self, last_revision):
115
self.last_revision = self._find_last_revision(last_revision)
116
except NoSuchRevision, e:
117
mutter('failed getting last revision: %s', e)
118
raise InstallFailed([last_revision])
119
mutter('fetch up to rev {%s}', self.last_revision)
120
if (self.last_revision is not None and
121
self.to_branch.has_revision(self.last_revision)):
124
revs_to_fetch = self._compare_ancestries()
126
raise InstallFailed([self.last_revision])
127
self._copy_revisions(revs_to_fetch)
128
self.new_ancestry = revs_to_fetch
130
def _find_last_revision(self, last_revision):
245
self._find_last_revision()
246
repo_fetcher = RepoFetcher(to_repository=self.to_branch.repository,
247
from_repository=self.from_branch.repository,
249
last_revision=self._last_revision)
250
self.failed_revisions = repo_fetcher.failed_revisions
251
self.count_copied = repo_fetcher.count_copied
252
self.count_total = repo_fetcher.count_total
253
self.count_weaves = repo_fetcher.count_weaves
254
self.copied_file_ids = repo_fetcher.copied_file_ids
256
def _find_last_revision(self):
131
257
"""Find the limiting source revision.
133
259
Every ancestor of that revision will be merged across.
135
261
Returns the revision_id, or returns None if there's no history
136
262
in the source branch."""
263
if self._last_revision:
137
265
self.pb.update('get source history')
138
266
from_history = self.from_branch.revision_history()
139
267
self.pb.update('get destination history')
141
self.from_branch.get_revision(last_revision)
144
return from_history[-1]
146
return None # no history in the source branch
149
def _compare_ancestries(self):
150
"""Get a list of revisions that must be copied.
152
That is, every revision that's in the ancestry of the source
153
branch and not in the destination branch."""
154
self.pb.update('get source ancestry')
155
self.from_ancestry = self.from_branch.get_ancestry(self.last_revision)
157
dest_last_rev = self.to_branch.last_revision()
158
self.pb.update('get destination ancestry')
160
dest_ancestry = self.to_branch.get_ancestry(dest_last_rev)
163
ss = set(dest_ancestry)
165
for rev_id in self.from_ancestry:
167
to_fetch.append(rev_id)
168
mutter('need to get revision {%s}', rev_id)
169
mutter('need to get %d revisions in total', len(to_fetch))
170
self.count_total = len(to_fetch)
173
def _copy_revisions(self, revs_to_fetch):
175
for rev_id in revs_to_fetch:
179
if self.to_branch.has_revision(rev_id):
181
self.pb.update('fetch revision', i, self.count_total)
182
self._copy_one_revision(rev_id)
183
self.count_copied += 1
186
def _copy_one_revision(self, rev_id):
187
"""Copy revision and everything referenced by it."""
188
mutter('copying revision {%s}', rev_id)
189
rev_xml = self.from_branch.get_revision_xml(rev_id)
190
inv_xml = self.from_branch.get_inventory_xml(rev_id)
191
rev = serializer_v5.read_revision_from_string(rev_xml)
192
inv = serializer_v5.read_inventory_from_string(inv_xml)
193
assert rev.revision_id == rev_id
194
assert rev.inventory_sha1 == sha_string(inv_xml)
195
mutter(' commiter %s, %d parents',
198
self._copy_new_texts(rev_id, inv)
199
parents = rev.parent_ids
200
for parent in parents:
201
if not self.to_branch.has_revision(parent):
202
parents.pop(parents.index(parent))
203
self._copy_inventory(rev_id, inv_xml, parents)
204
self.to_branch.revision_store.add(StringIO(rev_xml), rev_id)
205
mutter('copied revision %s', rev_id)
208
def _copy_inventory(self, rev_id, inv_xml, parent_ids):
209
self.to_control.add_text('inventory', rev_id,
210
split_lines(inv_xml), parent_ids,
211
self.to_branch.get_transaction())
213
def _copy_new_texts(self, rev_id, inv):
214
"""Copy any new texts occuring in this revision."""
215
# TODO: Rather than writing out weaves every time, hold them
216
# in memory until everything's done? But this way is nicer
217
# if it's interrupted.
218
for path, ie in inv.iter_entries():
219
if ie.revision != rev_id:
221
mutter('%s {%s} is changed in this revision',
223
self._copy_one_weave(rev_id, ie.file_id)
226
def _copy_one_weave(self, rev_id, file_id):
227
"""Copy one file weave."""
228
mutter('copy file {%s} modified in {%s}', file_id, rev_id)
229
if file_id in self.copied_file_ids:
230
mutter('file {%s} already copied', file_id)
232
from_weave = self.from_weaves.get_weave(file_id,
233
self.from_branch.get_transaction())
234
to_weave = self.to_weaves.get_weave_or_empty(file_id,
235
self.to_branch.get_transaction())
237
to_weave.join(from_weave)
238
except errors.WeaveParentMismatch:
239
to_weave.reweave(from_weave)
240
self.to_weaves.put_weave(file_id, to_weave,
241
self.to_branch.get_transaction())
242
self.count_weaves += 1
243
self.copied_file_ids.add(file_id)
244
mutter('copied file {%s}', file_id)
269
self._last_revision = from_history[-1]
271
# no history in the source branch
272
self._last_revision = NULL_REVISION
added
removed
bzrlib/fetch.py
