bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
974.1.27
by aaron.bentley at utoronto
Initial greedy fetch work |
1 |
# Copyright (C) 2005 by Canonical Ltd
|
2 |
||
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.
|
|
7 |
||
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.
|
|
12 |
||
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 |
|
1480
by Robert Collins
BUGFIX: fetch was not skipping all missing parents for inventory insertion |
17 |
from copy import copy |
1218
by Martin Pool
- fix up import |
18 |
import os |
1231
by Martin Pool
- more progress on fetch on top of weaves |
19 |
from cStringIO import StringIO |
1218
by Martin Pool
- fix up import |
20 |
|
1185.13.4
by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch |
21 |
import bzrlib |
22 |
import bzrlib.errors as errors |
|
1185.35.42
by Aaron Bentley
Fixed fetch to be safer wrt ghosts and corrupt branches |
23 |
from bzrlib.errors import (InstallFailed, NoSuchRevision, WeaveError, |
24 |
MissingText) |
|
1231
by Martin Pool
- more progress on fetch on top of weaves |
25 |
from bzrlib.trace import mutter, note, warning |
1352
by Martin Pool
- store control weaves in .bzr/, not mixed in with file weaves |
26 |
from bzrlib.branch import Branch |
974.1.28
by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch |
27 |
from bzrlib.progress import ProgressBar |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
28 |
from bzrlib.revision import NULL_REVISION |
1231
by Martin Pool
- more progress on fetch on top of weaves |
29 |
from bzrlib.xml5 import serializer_v5 |
30 |
from bzrlib.osutils import sha_string, split_lines |
|
31 |
||
32 |
"""Copying of history from one branch to another.
|
|
33 |
||
34 |
The basic plan is that every branch knows the history of everything
|
|
35 |
that has merged into it. As the first step of a merge, pull, or
|
|
36 |
branch operation we copy history from the source into the destination
|
|
37 |
branch.
|
|
38 |
||
39 |
The copying is done in a slightly complicated order. We don't want to
|
|
40 |
add a revision to the store until everything it refers to is also
|
|
41 |
stored, so that if a revision is present we can totally recreate it.
|
|
42 |
However, we can't know what files are included in a revision until we
|
|
43 |
read its inventory. Therefore, we first pull the XML and hold it in
|
|
44 |
memory until we've updated all of the files referenced.
|
|
45 |
"""
|
|
46 |
||
47 |
# TODO: Avoid repeatedly opening weaves so many times.
|
|
974.1.27
by aaron.bentley at utoronto
Initial greedy fetch work |
48 |
|
1238
by Martin Pool
- remove a lot of dead code from fetch |
49 |
# XXX: This doesn't handle ghost (not present in branch) revisions at
|
1240
by Martin Pool
- clean up fetch code and add progress bar |
50 |
# all yet. I'm not sure they really should be supported.
|
51 |
||
1262
by Martin Pool
- fetch should also copy ancestry records |
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.
|
|
1238
by Martin Pool
- remove a lot of dead code from fetch |
54 |
|
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
|
|
58 |
# parents.
|
|
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
|
|
63 |
||
64 |
||
1219
by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves |
65 |
|
1260
by Martin Pool
- some updates for fetch/update function |
66 |
def greedy_fetch(to_branch, from_branch, revision=None, pb=None): |
1219
by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves |
67 |
f = Fetcher(to_branch, from_branch, revision, pb) |
68 |
return f.count_copied, f.failed_revisions |
|
69 |
||
70 |
||
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
71 |
class RepoFetcher(object): |
72 |
"""Pull revisions and texts from one repository to another. |
|
73 |
||
74 |
last_revision
|
|
75 |
if set, try to limit to the data this revision references.
|
|
76 |
||
77 |
after running:
|
|
1260
by Martin Pool
- some updates for fetch/update function |
78 |
count_copied -- number of revisions copied
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
79 |
count_weaves -- number of file weaves copied
|
1260
by Martin Pool
- some updates for fetch/update function |
80 |
"""
|
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. |
81 |
def __init__(self, to_repository, from_repository, last_revision=None, pb=None): |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
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
|
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
89 |
self._last_revision = last_revision |
90 |
if pb is None: |
|
91 |
self.pb = bzrlib.ui.ui_factory.progress_bar() |
|
92 |
else: |
|
93 |
self.pb = pb |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
94 |
self.from_repository.lock_read() |
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
95 |
try: |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
96 |
self.to_repository.lock_write() |
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
97 |
try: |
98 |
self.__fetch() |
|
99 |
finally: |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
100 |
self.to_repository.unlock() |
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
101 |
finally: |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
102 |
self.from_repository.unlock() |
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
103 |
|
104 |
def __fetch(self): |
|
105 |
"""Primary worker function. |
|
106 |
||
107 |
This initialises all the needed variables, and then fetches the
|
|
108 |
requested revisions, finally clearing the progress bar.
|
|
109 |
"""
|
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
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 |
|
1231
by Martin Pool
- more progress on fetch on top of weaves |
114 |
self.failed_revisions = [] |
115 |
self.count_copied = 0 |
|
1240
by Martin Pool
- clean up fetch code and add progress bar |
116 |
self.count_total = 0 |
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
117 |
self.count_weaves = 0 |
1404
by Robert Collins
only pull remote text weaves once per fetch operation |
118 |
self.copied_file_ids = set() |
1185.33.55
by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli) |
119 |
self.file_ids_names = {} |
1392
by Robert Collins
reinstate testfetch test case |
120 |
try: |
1185.65.30
by Robert Collins
Merge integration. |
121 |
revs = self._revids_to_fetch() |
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
122 |
# nothing to do
|
123 |
if revs: |
|
1534.1.11
by Robert Collins
Format tweaks for latest merges. |
124 |
self._fetch_weave_texts(revs) |
125 |
self._fetch_inventory_weave(revs) |
|
126 |
self._fetch_revision_texts(revs) |
|
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
127 |
self.count_copied += len(revs) |
1185.12.15
by Aaron Bentley
Cleared progress bar properly after fetch |
128 |
finally: |
129 |
self.pb.clear() |
|
1231
by Martin Pool
- more progress on fetch on top of weaves |
130 |
|
1185.65.30
by Robert Collins
Merge integration. |
131 |
def _revids_to_fetch(self): |
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
132 |
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. |
133 |
if self._last_revision is NULL_REVISION: |
134 |
# explicit limit of no revisions needed
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
135 |
return None |
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. |
136 |
if (self._last_revision != None and |
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
137 |
self.to_repository.has_revision(self._last_revision)): |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
138 |
return None |
139 |
||
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 |
140 |
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. |
141 |
return self.to_repository.missing_revision_ids(self.from_repository, |
142 |
self._last_revision) |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
143 |
except errors.NoSuchRevision: |
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
144 |
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 |
145 |
|
1534.1.11
by Robert Collins
Format tweaks for latest merges. |
146 |
def _fetch_revision_texts(self, revs): |
1185.65.30
by Robert Collins
Merge integration. |
147 |
self.to_repository.revision_store.copy_multi( |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
148 |
self.from_repository.revision_store, |
149 |
revs, |
|
150 |
pb=self.pb) |
|
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
151 |
|
1534.1.11
by Robert Collins
Format tweaks for latest merges. |
152 |
def _fetch_weave_texts(self, revs): |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
153 |
file_ids = self.from_repository.fileid_involved_by_set(revs) |
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
154 |
count = 0 |
155 |
num_file_ids = len(file_ids) |
|
156 |
for file_id in file_ids: |
|
1185.77.1
by John Arbash Meinel
Simplifying what bzr displays when merging |
157 |
self.pb.update("merge weaves", count, num_file_ids) |
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
158 |
count +=1 |
159 |
to_weave = self.to_weaves.get_weave_or_empty(file_id, |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
160 |
self.to_repository.get_transaction()) |
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
161 |
from_weave = self.from_weaves.get_weave(file_id, |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
162 |
self.from_repository.get_transaction()) |
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
163 |
|
164 |
if to_weave.numversions() > 0: |
|
165 |
# destination has contents, must merge
|
|
166 |
try: |
|
167 |
to_weave.join(from_weave) |
|
168 |
except errors.WeaveParentMismatch: |
|
169 |
to_weave.reweave(from_weave) |
|
170 |
else: |
|
171 |
# destination is empty, just replace it
|
|
1534.1.11
by Robert Collins
Format tweaks for latest merges. |
172 |
to_weave = from_weave.copy() |
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
173 |
|
174 |
self.to_weaves.put_weave(file_id, to_weave, |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
175 |
self.to_repository.get_transaction()) |
1534.1.11
by Robert Collins
Format tweaks for latest merges. |
176 |
self.pb.clear() |
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
177 |
|
1534.1.11
by Robert Collins
Format tweaks for latest merges. |
178 |
def _fetch_inventory_weave(self, revs): |
1549.1.2
by John Arbash Meinel
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy |
179 |
self.pb.update("inventory fetch", 0, 2) |
1185.65.30
by Robert Collins
Merge integration. |
180 |
from_weave = self.from_repository.get_inventory_weave() |
181 |
to_weave = self.to_repository.get_inventory_weave() |
|
1549.1.2
by John Arbash Meinel
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy |
182 |
self.pb.update("inventory fetch", 1, 2) |
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
183 |
to_weave = self.to_control.get_weave('inventory', |
1534.4.43
by Robert Collins
Merge from integration |
184 |
self.to_repository.get_transaction()) |
1549.1.2
by John Arbash Meinel
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy |
185 |
self.pb.update("inventory fetch", 2, 2) |
1185.64.4
by Goffredo Baroncelli
Apply some style changes on the basis of Robert suggest |
186 |
|
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
187 |
if to_weave.numversions() > 0: |
188 |
# destination has contents, must merge
|
|
189 |
try: |
|
1549.1.2
by John Arbash Meinel
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy |
190 |
to_weave.join(from_weave, pb=self.pb, msg='merge inventory') |
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
191 |
except errors.WeaveParentMismatch: |
1549.1.2
by John Arbash Meinel
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy |
192 |
to_weave.reweave(from_weave, pb=self.pb, msg='reweave inventory') |
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
193 |
else: |
194 |
# destination is empty, just replace it
|
|
1534.1.11
by Robert Collins
Format tweaks for latest merges. |
195 |
to_weave = from_weave.copy() |
1185.64.3
by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and |
196 |
|
197 |
self.to_control.put_weave('inventory', to_weave, |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
198 |
self.to_repository.get_transaction()) |
1185.64.4
by Goffredo Baroncelli
Apply some style changes on the basis of Robert suggest |
199 |
|
1534.1.11
by Robert Collins
Format tweaks for latest merges. |
200 |
self.pb.clear() |
1240
by Martin Pool
- clean up fetch code and add progress bar |
201 |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
202 |
|
203 |
class Fetcher(object): |
|
204 |
"""Pull revisions and texts from one branch to another. |
|
205 |
||
206 |
This doesn't update the destination's history; that can be done
|
|
207 |
separately if desired.
|
|
208 |
||
209 |
revision_limit
|
|
210 |
If set, pull only up to this revision_id.
|
|
211 |
||
212 |
After running:
|
|
213 |
||
214 |
last_revision -- if last_revision
|
|
215 |
is given it will be that, otherwise the last revision of
|
|
216 |
from_branch
|
|
217 |
||
218 |
count_copied -- number of revisions copied
|
|
219 |
||
220 |
count_weaves -- number of file weaves copied
|
|
221 |
"""
|
|
222 |
def __init__(self, to_branch, from_branch, last_revision=None, pb=None): |
|
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)) |
|
226 |
||
227 |
self.to_branch = to_branch |
|
228 |
self.from_branch = from_branch |
|
229 |
self._last_revision = last_revision |
|
230 |
if pb is None: |
|
231 |
self.pb = bzrlib.ui.ui_factory.progress_bar() |
|
232 |
else: |
|
233 |
self.pb = pb |
|
234 |
self.from_branch.lock_read() |
|
235 |
try: |
|
236 |
self.to_branch.lock_write() |
|
237 |
try: |
|
238 |
self.__fetch() |
|
239 |
finally: |
|
240 |
self.to_branch.unlock() |
|
241 |
finally: |
|
242 |
self.from_branch.unlock() |
|
243 |
||
244 |
def __fetch(self): |
|
245 |
self._find_last_revision() |
|
246 |
repo_fetcher = RepoFetcher(to_repository=self.to_branch.repository, |
|
247 |
from_repository=self.from_branch.repository, |
|
248 |
pb=self.pb, |
|
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 |
|
255 |
||
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
256 |
def _find_last_revision(self): |
1240
by Martin Pool
- clean up fetch code and add progress bar |
257 |
"""Find the limiting source revision. |
258 |
||
259 |
Every ancestor of that revision will be merged across.
|
|
260 |
||
261 |
Returns the revision_id, or returns None if there's no history
|
|
262 |
in the source branch."""
|
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
263 |
if self._last_revision: |
264 |
return
|
|
1240
by Martin Pool
- clean up fetch code and add progress bar |
265 |
self.pb.update('get source history') |
266 |
from_history = self.from_branch.revision_history() |
|
267 |
self.pb.update('get destination history') |
|
1185.12.21
by aaron.bentley at utoronto
Cleaned up Fetcher._find_last_revision |
268 |
if from_history: |
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
269 |
self._last_revision = from_history[-1] |
1240
by Martin Pool
- clean up fetch code and add progress bar |
270 |
else: |
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
271 |
# no history in the source branch
|
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. |
272 |
self._last_revision = NULL_REVISION |
1265
by Martin Pool
- add function-style synonym 'fetch' |
273 |
|
274 |
fetch = Fetcher |