bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2005, 2006 Canonical Ltd
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
|
974.1.27
by aaron.bentley at utoronto
Initial greedy fetch work |
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.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
|
974.1.27
by aaron.bentley at utoronto
Initial greedy fetch work |
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.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
|
974.1.27
by aaron.bentley at utoronto
Initial greedy fetch work |
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
|
|
|
1218
by Martin Pool
- fix up import |
16 |
|
|
1231
by Martin Pool
- more progress on fetch on top of weaves |
17 |
|
18 |
"""Copying of history from one branch to another.
|
|
19 |
||
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
|
|
23 |
branch.
|
|
24 |
||
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
|
|
|
1563.2.34
by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction |
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
|
|
31 |
the inventories.
|
|
|
1231
by Martin Pool
- more progress on fetch on top of weaves |
32 |
"""
|
33 |
||
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
34 |
import bzrlib |
35 |
import bzrlib.errors as errors |
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
36 |
from bzrlib.errors import (InstallFailed, |
37 |
)
|
|
38 |
from bzrlib.progress import ProgressPhase |
|
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
39 |
from bzrlib.revision import NULL_REVISION |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
40 |
from bzrlib.symbol_versioning import (deprecated_function, |
41 |
deprecated_method, |
|
42 |
zero_eight, |
|
43 |
)
|
|
|
2094.3.5
by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used |
44 |
from bzrlib.trace import mutter |
45 |
import bzrlib.ui |
|
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
46 |
|
|
2018.5.94
by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test). |
47 |
from bzrlib.lazy_import import lazy_import |
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
48 |
|
|
1231
by Martin Pool
- more progress on fetch on top of weaves |
49 |
# TODO: Avoid repeatedly opening weaves so many times.
|
|
974.1.27
by aaron.bentley at utoronto
Initial greedy fetch work |
50 |
|
|
1238
by Martin Pool
- remove a lot of dead code from fetch |
51 |
# XXX: This doesn't handle ghost (not present in branch) revisions at
|
|
1240
by Martin Pool
- clean up fetch code and add progress bar |
52 |
# all yet. I'm not sure they really should be supported.
|
53 |
||
|
1262
by Martin Pool
- fetch should also copy ancestry records |
54 |
# NOTE: This doesn't copy revisions which may be present but not
|
55 |
# merged into the last revision. I'm not sure we want to do that.
|
|
|
1238
by Martin Pool
- remove a lot of dead code from fetch |
56 |
|
57 |
# - get a list of revisions that need to be pulled in
|
|
58 |
# - for each one, pull in that revision file
|
|
59 |
# and get the inventory, and store the inventory with right
|
|
60 |
# parents.
|
|
61 |
# - and get the ancestry, and store that with right parents too
|
|
62 |
# - and keep a note of all file ids and version seen
|
|
63 |
# - then go through all files; for each one get the weave,
|
|
64 |
# and add in all file versions
|
|
65 |
||
66 |
||
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
67 |
@deprecated_function(zero_eight) |
|
1260
by Martin Pool
- some updates for fetch/update function |
68 |
def greedy_fetch(to_branch, from_branch, revision=None, pb=None): |
|
1534.1.32
by Robert Collins
Deprecate direct use of fetch.Fetcher. |
69 |
"""Legacy API, please see branch.fetch(from_branch, last_revision, pb).""" |
|
1219
by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves |
70 |
f = Fetcher(to_branch, from_branch, revision, pb) |
71 |
return f.count_copied, f.failed_revisions |
|
72 |
||
|
1534.1.32
by Robert Collins
Deprecate direct use of fetch.Fetcher. |
73 |
fetch = greedy_fetch |
74 |
||
|
1219
by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves |
75 |
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
76 |
class RepoFetcher(object): |
77 |
"""Pull revisions and texts from one repository to another. |
|
78 |
||
79 |
last_revision
|
|
80 |
if set, try to limit to the data this revision references.
|
|
81 |
||
82 |
after running:
|
|
|
1260
by Martin Pool
- some updates for fetch/update function |
83 |
count_copied -- number of revisions copied
|
|
1534.1.33
by Robert Collins
Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations. |
84 |
|
85 |
This should not be used directory, its essential a object to encapsulate
|
|
86 |
the logic in InterRepository.fetch().
|
|
|
1260
by Martin Pool
- some updates for fetch/update function |
87 |
"""
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
88 |
def __init__(self, to_repository, from_repository, last_revision=None, pb=None): |
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
89 |
# result variables.
|
90 |
self.failed_revisions = [] |
|
91 |
self.count_copied = 0 |
|
|
2668.2.4
by Andrew Bennetts
Get rid of RepoFetcher._same_repo by using Repository.__eq__. |
92 |
if to_repository == from_repository: |
93 |
if last_revision not in (None, NULL_REVISION): |
|
94 |
to_repository.get_revision(last_revision) |
|
|
1534.6.13
by Robert Collins
Allow push/pull and branch between branches in the same shared repository. |
95 |
return
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
96 |
self.to_repository = to_repository |
97 |
self.from_repository = from_repository |
|
98 |
# must not mutate self._last_revision as its potentially a shared instance
|
|
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
99 |
self._last_revision = last_revision |
100 |
if pb is None: |
|
|
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
101 |
self.pb = bzrlib.ui.ui_factory.nested_progress_bar() |
102 |
self.nested_pb = self.pb |
|
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
103 |
else: |
104 |
self.pb = pb |
|
|
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
105 |
self.nested_pb = None |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
106 |
self.from_repository.lock_read() |
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
107 |
try: |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
108 |
self.to_repository.lock_write() |
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
109 |
try: |
110 |
self.__fetch() |
|
111 |
finally: |
|
|
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
112 |
if self.nested_pb is not None: |
113 |
self.nested_pb.finished() |
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
114 |
self.to_repository.unlock() |
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
115 |
finally: |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
116 |
self.from_repository.unlock() |
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
117 |
|
118 |
def __fetch(self): |
|
119 |
"""Primary worker function. |
|
120 |
||
121 |
This initialises all the needed variables, and then fetches the
|
|
122 |
requested revisions, finally clearing the progress bar.
|
|
123 |
"""
|
|
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
124 |
self.to_weaves = self.to_repository.weave_store |
125 |
self.to_control = self.to_repository.control_weaves |
|
126 |
self.from_weaves = self.from_repository.weave_store |
|
127 |
self.from_control = self.from_repository.control_weaves |
|
|
1240
by Martin Pool
- clean up fetch code and add progress bar |
128 |
self.count_total = 0 |
|
1185.33.55
by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli) |
129 |
self.file_ids_names = {} |
|
1733.2.6
by Michael Ellerman
Fix phase handling in fetch code. |
130 |
pp = ProgressPhase('Fetch phase', 4, self.pb) |
|
1392
by Robert Collins
reinstate testfetch test case |
131 |
try: |
|
1733.2.6
by Michael Ellerman
Fix phase handling in fetch code. |
132 |
pp.next_phase() |
|
1185.65.30
by Robert Collins
Merge integration. |
133 |
revs = self._revids_to_fetch() |
|
2668.2.1
by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids. |
134 |
self._fetch_everything_for_revisions(revs, pp) |
|
1185.12.15
by Aaron Bentley
Cleared progress bar properly after fetch |
135 |
finally: |
136 |
self.pb.clear() |
|
|
1231
by Martin Pool
- more progress on fetch on top of weaves |
137 |
|
|
2668.2.1
by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids. |
138 |
def _fetch_everything_for_revisions(self, revs, pp): |
139 |
"""Fetch all data for the given set of revisions.""" |
|
140 |
if revs is None: |
|
141 |
return
|
|
142 |
# The first phase is "file". We pass the progress bar for it directly
|
|
143 |
# into get_data_about_revision_ids, which has more information about how
|
|
144 |
# that phase is progressing than we do. Progress updates for the other
|
|
145 |
# phases are taken care of in this function.
|
|
146 |
# XXX: there should be a clear owner of the progress reporting. Perhaps
|
|
147 |
# get_data_about_revision_ids should have a richer API than it does at
|
|
148 |
# the moment, so that it can feed the progress information back to this
|
|
149 |
# function?
|
|
150 |
phase = 'file' |
|
151 |
pb = bzrlib.ui.ui_factory.nested_progress_bar() |
|
152 |
try: |
|
153 |
what_to_do = self.from_repository.get_data_about_revision_ids(revs, pb) |
|
154 |
for knit_kind, file_id, revisions in what_to_do: |
|
155 |
if knit_kind != phase: |
|
156 |
phase = knit_kind |
|
157 |
# Make a new progress bar for this phase
|
|
158 |
pb.finished() |
|
159 |
pp.next_phase() |
|
160 |
pb = bzrlib.ui.ui_factory.nested_progress_bar() |
|
161 |
if knit_kind == "file": |
|
162 |
self._fetch_weave_text(file_id, revisions) |
|
163 |
elif knit_kind == "inventory": |
|
164 |
# XXX:
|
|
165 |
# Once we've processed all the files, then we generate the root
|
|
166 |
# texts (if necessary), then we process the inventory. It's a
|
|
167 |
# bit distasteful to have knit_kind == "inventory" mean this,
|
|
168 |
# perhaps it should happen on the first non-"file" knit, in case
|
|
169 |
# it's not always inventory?
|
|
170 |
self._generate_root_texts(revs) |
|
171 |
self._fetch_inventory_weave(revs, pb) |
|
172 |
elif knit_kind == "signatures": |
|
173 |
# Nothing to do here; this will be taken care of when
|
|
174 |
# _fetch_revision_texts happens.
|
|
175 |
pass
|
|
176 |
elif knit_kind == "revisions": |
|
177 |
self._fetch_revision_texts(revs, pb) |
|
178 |
else: |
|
179 |
raise AssertionError("Unknown knit kind %r" % knit_kind) |
|
180 |
finally: |
|
181 |
if pb is not None: |
|
182 |
pb.finished() |
|
183 |
self.count_copied += len(revs) |
|
184 |
||
|
1185.65.30
by Robert Collins
Merge integration. |
185 |
def _revids_to_fetch(self): |
|
2668.2.1
by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids. |
186 |
"""Determines the exact revisions needed from self.from_repository to |
187 |
install self._last_revision in self.to_repository.
|
|
188 |
||
189 |
If no revisions need to be fetched, then this just returns None.
|
|
190 |
"""
|
|
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
191 |
mutter('fetch up to rev {%s}', self._last_revision) |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
192 |
if self._last_revision is NULL_REVISION: |
193 |
# explicit limit of no revisions needed
|
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
194 |
return None |
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
195 |
if (self._last_revision is not None and |
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
196 |
self.to_repository.has_revision(self._last_revision)): |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
197 |
return None |
198 |
||
|
1417.1.13
by Robert Collins
do not download remote ancestry.weave if the target revision we are stopping at is in our local store |
199 |
try: |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
200 |
return self.to_repository.missing_revision_ids(self.from_repository, |
201 |
self._last_revision) |
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
202 |
except errors.NoSuchRevision: |
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
203 |
raise InstallFailed([self._last_revision]) |
|
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
204 |
|
|
2668.2.1
by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids. |
205 |
def _fetch_weave_text(self, file_id, required_versions): |
206 |
to_weave = self.to_weaves.get_weave_or_empty(file_id, |
|
207 |
self.to_repository.get_transaction()) |
|
208 |
from_weave = self.from_weaves.get_weave(file_id, |
|
209 |
self.from_repository.get_transaction()) |
|
210 |
# we fetch all the texts, because texts do
|
|
211 |
# not reference anything, and its cheap enough
|
|
212 |
to_weave.join(from_weave, version_ids=required_versions) |
|
213 |
# we don't need *all* of this data anymore, but we dont know
|
|
214 |
# what we do. This cache clearing will result in a new read
|
|
215 |
# of the knit data when we do the checkout, but probably we
|
|
216 |
# want to emit the needed data on the fly rather than at the
|
|
217 |
# end anyhow.
|
|
218 |
# the from weave should know not to cache data being joined,
|
|
219 |
# but its ok to ask it to clear.
|
|
220 |
from_weave.clear_cache() |
|
221 |
to_weave.clear_cache() |
|
222 |
||
223 |
def _fetch_inventory_weave(self, revs, pb): |
|
224 |
pb.update("fetch inventory", 0, 2) |
|
225 |
to_weave = self.to_control.get_weave('inventory', |
|
226 |
self.to_repository.get_transaction()) |
|
227 |
||
228 |
child_pb = bzrlib.ui.ui_factory.nested_progress_bar() |
|
229 |
try: |
|
230 |
# just merge, this is optimisable and its means we don't
|
|
231 |
# copy unreferenced data such as not-needed inventories.
|
|
232 |
pb.update("fetch inventory", 1, 3) |
|
233 |
from_weave = self.from_repository.get_inventory_weave() |
|
234 |
pb.update("fetch inventory", 2, 3) |
|
235 |
# we fetch only the referenced inventories because we do not
|
|
236 |
# know for unselected inventories whether all their required
|
|
237 |
# texts are present in the other repository - it could be
|
|
238 |
# corrupt.
|
|
239 |
to_weave.join(from_weave, pb=child_pb, msg='merge inventory', |
|
240 |
version_ids=revs) |
|
241 |
from_weave.clear_cache() |
|
242 |
finally: |
|
243 |
child_pb.finished() |
|
244 |
||
245 |
def _generate_root_texts(self, revs): |
|
246 |
"""This will be called by __fetch between fetching weave texts and |
|
247 |
fetching the inventory weave.
|
|
248 |
||
249 |
Subclasses should override this if they need to generate root texts
|
|
250 |
after fetching weave texts.
|
|
251 |
"""
|
|
252 |
pass
|
|
253 |
||
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
254 |
|
|
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
255 |
class GenericRepoFetcher(RepoFetcher): |
256 |
"""This is a generic repo to repo fetcher. |
|
257 |
||
258 |
This makes minimal assumptions about repo layout and contents.
|
|
259 |
It triggers a reconciliation after fetching to ensure integrity.
|
|
260 |
"""
|
|
261 |
||
|
2668.2.1
by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids. |
262 |
def _fetch_revision_texts(self, revs, pb): |
|
1615.1.2
by Martin Pool
[merge] robert's knit-performance work |
263 |
"""Fetch revision object texts""" |
|
2668.2.1
by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids. |
264 |
to_txn = self.to_transaction = self.to_repository.get_transaction() |
265 |
count = 0 |
|
266 |
total = len(revs) |
|
267 |
to_store = self.to_repository._revision_store |
|
268 |
for rev in revs: |
|
269 |
pb.update('copying revisions', count, total) |
|
270 |
try: |
|
271 |
sig_text = self.from_repository.get_signature_text(rev) |
|
272 |
to_store.add_revision_signature_text(rev, sig_text, to_txn) |
|
273 |
except errors.NoSuchRevision: |
|
274 |
# not signed.
|
|
275 |
pass
|
|
276 |
to_store.add_revision(self.from_repository.get_revision(rev), |
|
277 |
to_txn) |
|
278 |
count += 1 |
|
279 |
# fixup inventory if needed:
|
|
280 |
# this is expensive because we have no inverse index to current ghosts.
|
|
281 |
# but on local disk its a few seconds and sftp push is already insane.
|
|
282 |
# so we just-do-it.
|
|
283 |
# FIXME: repository should inform if this is needed.
|
|
284 |
self.to_repository.reconcile() |
|
|
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
285 |
|
286 |
||
287 |
class KnitRepoFetcher(RepoFetcher): |
|
288 |
"""This is a knit format repository specific fetcher. |
|
289 |
||
290 |
This differs from the GenericRepoFetcher by not doing a
|
|
291 |
reconciliation after copying, and using knit joining to
|
|
292 |
copy revision texts.
|
|
293 |
"""
|
|
294 |
||
|
2668.2.1
by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids. |
295 |
def _fetch_revision_texts(self, revs, pb): |
|
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
296 |
# may need to be a InterRevisionStore call here.
|
297 |
from_transaction = self.from_repository.get_transaction() |
|
298 |
to_transaction = self.to_repository.get_transaction() |
|
|
1563.2.35
by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too. |
299 |
to_sf = self.to_repository._revision_store.get_signature_file( |
|
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
300 |
to_transaction) |
|
1563.2.35
by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too. |
301 |
from_sf = self.from_repository._revision_store.get_signature_file( |
|
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
302 |
from_transaction) |
|
1596.2.22
by Robert Collins
Fetch changes to use new pb. |
303 |
to_sf.join(from_sf, version_ids=revs, ignore_missing=True) |
|
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
304 |
to_rf = self.to_repository._revision_store.get_revision_file( |
305 |
to_transaction) |
|
306 |
from_rf = self.from_repository._revision_store.get_revision_file( |
|
307 |
from_transaction) |
|
|
1596.2.22
by Robert Collins
Fetch changes to use new pb. |
308 |
to_rf.join(from_rf, version_ids=revs) |
|
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
309 |
|
310 |
||
|
1910.2.24
by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types |
311 |
class Inter1and2Helper(object): |
|
1910.2.48
by Aaron Bentley
Update from review comments |
312 |
"""Helper for operations that convert data from model 1 and 2 |
313 |
|
|
314 |
This is for use by fetchers and converters.
|
|
315 |
"""
|
|
316 |
||
317 |
def __init__(self, source, target): |
|
318 |
"""Constructor. |
|
319 |
||
320 |
:param source: The repository data comes from
|
|
321 |
:param target: The repository data goes to
|
|
322 |
"""
|
|
323 |
self.source = source |
|
324 |
self.target = target |
|
325 |
||
326 |
def iter_rev_trees(self, revs): |
|
327 |
"""Iterate through RevisionTrees efficiently. |
|
328 |
||
329 |
Additionally, the inventory's revision_id is set if unset.
|
|
330 |
||
331 |
Trees are retrieved in batches of 100, and then yielded in the order
|
|
332 |
they were requested.
|
|
333 |
||
334 |
:param revs: A list of revision ids
|
|
335 |
"""
|
|
336 |
while revs: |
|
337 |
for tree in self.source.revision_trees(revs[:100]): |
|
|
1910.2.44
by Aaron Bentley
Retrieve only 500 revision trees at once |
338 |
if tree.inventory.revision_id is None: |
339 |
tree.inventory.revision_id = tree.get_revision_id() |
|
340 |
yield tree |
|
|
1910.2.48
by Aaron Bentley
Update from review comments |
341 |
revs = revs[100:] |
|
1910.2.44
by Aaron Bentley
Retrieve only 500 revision trees at once |
342 |
|
|
1910.2.48
by Aaron Bentley
Update from review comments |
343 |
def generate_root_texts(self, revs): |
344 |
"""Generate VersionedFiles for all root ids. |
|
345 |
|
|
346 |
:param revs: the revisions to include
|
|
347 |
"""
|
|
348 |
inventory_weave = self.source.get_inventory_weave() |
|
349 |
parent_texts = {} |
|
350 |
versionedfile = {} |
|
351 |
to_store = self.target.weave_store |
|
352 |
for tree in self.iter_rev_trees(revs): |
|
|
1910.2.18
by Aaron Bentley
Implement creation of knits for tree roots |
353 |
revision_id = tree.inventory.root.revision |
|
1910.2.48
by Aaron Bentley
Update from review comments |
354 |
root_id = tree.inventory.root.file_id |
|
1910.2.18
by Aaron Bentley
Implement creation of knits for tree roots |
355 |
parents = inventory_weave.get_parents(revision_id) |
|
1910.2.48
by Aaron Bentley
Update from review comments |
356 |
if root_id not in versionedfile: |
357 |
versionedfile[root_id] = to_store.get_weave_or_empty(root_id, |
|
358 |
self.target.get_transaction()) |
|
359 |
parent_texts[root_id] = versionedfile[root_id].add_lines( |
|
360 |
revision_id, parents, [], parent_texts) |
|
361 |
||
362 |
def regenerate_inventory(self, revs): |
|
363 |
"""Generate a new inventory versionedfile in target, convertin data. |
|
364 |
|
|
365 |
The inventory is retrieved from the source, (deserializing it), and
|
|
366 |
stored in the target (reserializing it in a different format).
|
|
367 |
:param revs: The revisions to include
|
|
368 |
"""
|
|
369 |
inventory_weave = self.source.get_inventory_weave() |
|
370 |
for tree in self.iter_rev_trees(revs): |
|
|
1910.2.22
by Aaron Bentley
Make commits preserve root entry data |
371 |
parents = inventory_weave.get_parents(tree.get_revision_id()) |
|
1910.2.48
by Aaron Bentley
Update from review comments |
372 |
self.target.add_inventory(tree.get_revision_id(), tree.inventory, |
373 |
parents) |
|
|
1910.2.24
by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types |
374 |
|
375 |
||
376 |
class Model1toKnit2Fetcher(GenericRepoFetcher): |
|
377 |
"""Fetch from a Model1 repository into a Knit2 repository |
|
378 |
"""
|
|
|
1910.2.48
by Aaron Bentley
Update from review comments |
379 |
def __init__(self, to_repository, from_repository, last_revision=None, |
380 |
pb=None): |
|
381 |
self.helper = Inter1and2Helper(from_repository, to_repository) |
|
382 |
GenericRepoFetcher.__init__(self, to_repository, from_repository, |
|
383 |
last_revision, pb) |
|
|
1910.2.24
by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types |
384 |
|
|
2668.2.1
by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids. |
385 |
def _generate_root_texts(self, revs): |
|
1910.2.48
by Aaron Bentley
Update from review comments |
386 |
self.helper.generate_root_texts(revs) |
|
1910.2.24
by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types |
387 |
|
|
2668.2.1
by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids. |
388 |
def _fetch_inventory_weave(self, revs, pb): |
|
1910.2.48
by Aaron Bentley
Update from review comments |
389 |
self.helper.regenerate_inventory(revs) |
|
1910.2.24
by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types |
390 |
|
391 |
||
392 |
class Knit1to2Fetcher(KnitRepoFetcher): |
|
393 |
"""Fetch from a Knit1 repository into a Knit2 repository""" |
|
394 |
||
|
1910.2.48
by Aaron Bentley
Update from review comments |
395 |
def __init__(self, to_repository, from_repository, last_revision=None, |
396 |
pb=None): |
|
397 |
self.helper = Inter1and2Helper(from_repository, to_repository) |
|
398 |
KnitRepoFetcher.__init__(self, to_repository, from_repository, |
|
399 |
last_revision, pb) |
|
400 |
||
|
2668.2.1
by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids. |
401 |
def _generate_root_texts(self, revs): |
|
1910.2.48
by Aaron Bentley
Update from review comments |
402 |
self.helper.generate_root_texts(revs) |
|
1910.2.24
by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types |
403 |
|
|
2668.2.1
by Andrew Bennetts
Split out fetch refactoring from repo-refactor, adding Repository.get_data_about_revision_ids. |
404 |
def _fetch_inventory_weave(self, revs, pb): |
|
1910.2.48
by Aaron Bentley
Update from review comments |
405 |
self.helper.regenerate_inventory(revs) |
|
1910.2.24
by Aaron Bentley
Got intra-repository fetch working between model1 and 2 for all types |
406 |
|
|
1910.2.17
by Aaron Bentley
Get fetching from 1 to 2 under test |
407 |
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
408 |
class Fetcher(object): |
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
409 |
"""Backwards compatibility glue for branch.fetch().""" |
|
1534.1.32
by Robert Collins
Deprecate direct use of fetch.Fetcher. |
410 |
|
411 |
@deprecated_method(zero_eight) |
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
412 |
def __init__(self, to_branch, from_branch, last_revision=None, pb=None): |
|
1534.1.32
by Robert Collins
Deprecate direct use of fetch.Fetcher. |
413 |
"""Please see branch.fetch().""" |
414 |
to_branch.fetch(from_branch, last_revision, pb) |