4988.10.3
by John Arbash Meinel
Merge bzr.dev 5007, resolve conflict, update NEWS |
1 |
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
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
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
16 |
|
17 |
||
18 |
import sys |
|
19 |
||
20 |
from bzrlib import ( |
|
21 |
errors, |
|
3735.2.135
by Robert Collins
Permit fetching bzr.dev [deal with inconsistent inventories.] |
22 |
inventory, |
23 |
osutils, |
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
24 |
repository, |
3735.2.135
by Robert Collins
Permit fetching bzr.dev [deal with inconsistent inventories.] |
25 |
versionedfile, |
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
26 |
)
|
27 |
from bzrlib.errors import ( |
|
28 |
NoSuchRevision, |
|
29 |
)
|
|
6341.1.4
by Jelmer Vernooij
Move more functionality to vf_search. |
30 |
from bzrlib.vf_search import ( |
4476.3.11
by Andrew Bennetts
All fetch and interrepo tests passing. |
31 |
SearchResult, |
32 |
)
|
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
33 |
from bzrlib.revision import ( |
34 |
NULL_REVISION, |
|
35 |
Revision, |
|
36 |
)
|
|
37 |
from bzrlib.tests import ( |
|
38 |
TestNotApplicable, |
|
39 |
)
|
|
4523.1.3
by Martin Pool
Rename to per_interrepository |
40 |
from bzrlib.tests.per_interrepository import ( |
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
41 |
TestCaseWithInterRepository, |
42 |
)
|
|
4523.1.3
by Martin Pool
Rename to per_interrepository |
43 |
from bzrlib.tests.per_interrepository.test_interrepository import ( |
3616.2.3
by Mark Hammond
Fix test failures due to missing check_repo_format_for_funky_id_on_win32 |
44 |
check_repo_format_for_funky_id_on_win32
|
45 |
)
|
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
46 |
|
47 |
||
4634.35.22
by Andrew Bennetts
Use monkey patching to avoid skipping (mostly) tests that try to create damaged repos on 2a. |
48 |
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
49 |
class TestInterRepository(TestCaseWithInterRepository): |
50 |
||
4634.35.22
by Andrew Bennetts
Use monkey patching to avoid skipping (mostly) tests that try to create damaged repos on 2a. |
51 |
def disable_commit_write_group_paranoia(self, repo): |
52 |
pack_coll = getattr(repo, '_pack_collection', None) |
|
53 |
if pack_coll is not None: |
|
54 |
# Monkey-patch the pack collection instance to allow storing
|
|
55 |
# incomplete revisions.
|
|
56 |
pack_coll._check_new_inventories = lambda: [] |
|
57 |
||
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
58 |
def test_fetch(self): |
59 |
tree_a = self.make_branch_and_tree('a') |
|
60 |
self.build_tree(['a/foo']) |
|
61 |
tree_a.add('foo', 'file1') |
|
62 |
tree_a.commit('rev1', rev_id='rev1') |
|
63 |
def check_push_rev1(repo): |
|
64 |
# ensure the revision is missing.
|
|
65 |
self.assertRaises(NoSuchRevision, repo.get_revision, 'rev1') |
|
4110.2.5
by Martin Pool
Deprecate passing pbs in to fetch() |
66 |
# fetch with a limit of NULL_REVISION
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
67 |
repo.fetch(tree_a.branch.repository, |
4110.2.5
by Martin Pool
Deprecate passing pbs in to fetch() |
68 |
revision_id=NULL_REVISION) |
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
69 |
# nothing should have been pushed
|
70 |
self.assertFalse(repo.has_revision('rev1')) |
|
71 |
# fetch with a default limit (grab everything)
|
|
72 |
repo.fetch(tree_a.branch.repository) |
|
73 |
# check that b now has all the data from a's first commit.
|
|
74 |
rev = repo.get_revision('rev1') |
|
75 |
tree = repo.revision_tree('rev1') |
|
76 |
tree.lock_read() |
|
77 |
self.addCleanup(tree.unlock) |
|
78 |
tree.get_file_text('file1') |
|
5837.2.2
by Jelmer Vernooij
Fix more uses of Tree.__iter__ |
79 |
for file_id in tree.all_file_ids(): |
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
80 |
if tree.inventory[file_id].kind == "file": |
81 |
tree.get_file(file_id).read() |
|
82 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
83 |
# makes a target version repo
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
84 |
repo_b = self.make_to_repository('b') |
85 |
check_push_rev1(repo_b) |
|
86 |
||
3735.2.135
by Robert Collins
Permit fetching bzr.dev [deal with inconsistent inventories.] |
87 |
def test_fetch_inconsistent_last_changed_entries(self): |
88 |
"""If an inventory has odd data we should still get what it references.
|
|
3735.31.2
by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts. |
89 |
|
3735.2.135
by Robert Collins
Permit fetching bzr.dev [deal with inconsistent inventories.] |
90 |
This test tests that we do fetch a file text created in a revision not
|
91 |
being fetched, but referenced from the revision we are fetching when the
|
|
92 |
adjacent revisions to the one being fetched do not reference that text.
|
|
93 |
"""
|
|
94 |
tree = self.make_branch_and_tree('source') |
|
95 |
revid = tree.commit('old') |
|
96 |
to_repo = self.make_to_repository('to_repo') |
|
97 |
to_repo.fetch(tree.branch.repository, revid) |
|
98 |
# Make a broken revision and fetch it.
|
|
99 |
source = tree.branch.repository |
|
100 |
source.lock_write() |
|
101 |
self.addCleanup(source.unlock) |
|
102 |
source.start_write_group() |
|
103 |
try: |
|
104 |
# We need two revisions: OLD and NEW. NEW will claim to need a file
|
|
105 |
# 'FOO' changed in 'OLD'. OLD will not have that file at all.
|
|
106 |
source.texts.insert_record_stream([ |
|
107 |
versionedfile.FulltextContentFactory(('foo', revid), (), None, |
|
108 |
'contents')]) |
|
109 |
basis = source.revision_tree(revid) |
|
110 |
parent_id = basis.path2id('') |
|
111 |
entry = inventory.make_entry('file', 'foo-path', parent_id, 'foo') |
|
112 |
entry.revision = revid |
|
113 |
entry.text_size = len('contents') |
|
114 |
entry.text_sha1 = osutils.sha_string('contents') |
|
115 |
inv_sha1, _ = source.add_inventory_by_delta(revid, [ |
|
116 |
(None, 'foo-path', 'foo', entry)], 'new', [revid]) |
|
117 |
rev = Revision(timestamp=0, |
|
118 |
timezone=None, |
|
119 |
committer="Foo Bar <foo@example.com>", |
|
120 |
message="Message", |
|
121 |
inventory_sha1=inv_sha1, |
|
122 |
revision_id='new', |
|
123 |
parent_ids=[revid]) |
|
124 |
source.add_revision(rev.revision_id, rev) |
|
125 |
except: |
|
126 |
source.abort_write_group() |
|
127 |
raise
|
|
128 |
else: |
|
129 |
source.commit_write_group() |
|
130 |
to_repo.fetch(source, 'new') |
|
131 |
to_repo.lock_read() |
|
132 |
self.addCleanup(to_repo.unlock) |
|
133 |
self.assertEqual('contents', |
|
134 |
to_repo.texts.get_record_stream([('foo', revid)], |
|
135 |
'unordered', True).next().get_bytes_as('fulltext')) |
|
136 |
||
4634.61.1
by Andrew Bennetts
Fix cross-format pulls from stacked branches via smart server, add tests for same. |
137 |
def test_fetch_from_stacked_smart(self): |
138 |
self.setup_smart_server_with_call_log() |
|
139 |
self.test_fetch_from_stacked() |
|
140 |
||
141 |
def test_fetch_from_stacked_smart_old(self): |
|
142 |
self.setup_smart_server_with_call_log() |
|
143 |
self.disable_verb('Repository.get_stream_1.19') |
|
144 |
self.test_fetch_from_stacked() |
|
145 |
||
146 |
def test_fetch_from_stacked(self): |
|
147 |
"""Fetch from a stacked branch succeeds."""
|
|
148 |
if not self.repository_format.supports_external_lookups: |
|
149 |
raise TestNotApplicable("Need stacking support in the source.") |
|
150 |
builder = self.make_branch_builder('full-branch') |
|
151 |
builder.start_series() |
|
152 |
builder.build_snapshot('first', None, [ |
|
153 |
('add', ('', 'root-id', 'directory', '')), |
|
154 |
('add', ('file', 'file-id', 'file', 'content\n'))]) |
|
155 |
builder.build_snapshot('second', ['first'], [ |
|
156 |
('modify', ('file-id', 'second content\n'))]) |
|
157 |
builder.build_snapshot('third', ['second'], [ |
|
158 |
('modify', ('file-id', 'third content\n'))]) |
|
159 |
builder.finish_series() |
|
160 |
branch = builder.get_branch() |
|
161 |
repo = self.make_repository('stacking-base') |
|
162 |
trunk = repo.bzrdir.create_branch() |
|
163 |
trunk.repository.fetch(branch.repository, 'second') |
|
164 |
repo = self.make_repository('stacked') |
|
165 |
stacked_branch = repo.bzrdir.create_branch() |
|
166 |
stacked_branch.set_stacked_on_url(trunk.base) |
|
167 |
stacked_branch.repository.fetch(branch.repository, 'third') |
|
168 |
target = self.make_to_repository('target') |
|
169 |
target.fetch(stacked_branch.repository, 'third') |
|
170 |
target.lock_read() |
|
171 |
self.addCleanup(target.unlock) |
|
172 |
all_revs = set(['first', 'second', 'third']) |
|
173 |
self.assertEqual(all_revs, set(target.get_parent_map(all_revs))) |
|
174 |
||
4476.3.15
by Andrew Bennetts
Partially working fallback for pre-1.17 servers. |
175 |
def test_fetch_parent_inventories_at_stacking_boundary_smart(self): |
176 |
self.setup_smart_server_with_call_log() |
|
177 |
self.test_fetch_parent_inventories_at_stacking_boundary() |
|
178 |
||
179 |
def test_fetch_parent_inventories_at_stacking_boundary_smart_old(self): |
|
180 |
self.setup_smart_server_with_call_log() |
|
4476.3.82
by Andrew Bennetts
Mention another bug fix in NEWS, and update verb name, comments, and NEWS additions for landing on 1.19 rather than 1.18. |
181 |
self.disable_verb('Repository.insert_stream_1.19') |
4476.3.15
by Andrew Bennetts
Partially working fallback for pre-1.17 servers. |
182 |
self.test_fetch_parent_inventories_at_stacking_boundary() |
183 |
||
4257.3.1
by Andrew Bennetts
Add failing test. |
184 |
def test_fetch_parent_inventories_at_stacking_boundary(self): |
4257.3.9
by Andrew Bennetts
Add fix to InterDifferingSerializer too, although it's pretty ugly. |
185 |
"""Fetch to a stacked branch copies inventories for parents of
|
186 |
revisions at the stacking boundary.
|
|
187 |
||
188 |
This is necessary so that the server is able to determine the file-ids
|
|
189 |
altered by all revisions it contains, which means that it needs both
|
|
190 |
the inventory for any revision it has, and the inventories of all that
|
|
191 |
revision's parents.
|
|
4597.1.2
by John Arbash Meinel
Fix the second half of bug #402778 |
192 |
|
193 |
However, we should also skip any revisions which are ghosts in the
|
|
194 |
parents.
|
|
4257.3.9
by Andrew Bennetts
Add fix to InterDifferingSerializer too, although it's pretty ugly. |
195 |
"""
|
4597.1.5
by John Arbash Meinel
Split the 'ghost' test into a second test. |
196 |
if not self.repository_format_to.supports_external_lookups: |
4257.3.1
by Andrew Bennetts
Add failing test. |
197 |
raise TestNotApplicable("Need stacking support in the target.") |
198 |
builder = self.make_branch_builder('branch') |
|
199 |
builder.start_series() |
|
200 |
builder.build_snapshot('base', None, [ |
|
4597.1.1
by John Arbash Meinel
fix a critical bug #402778 |
201 |
('add', ('', 'root-id', 'directory', '')), |
202 |
('add', ('file', 'file-id', 'file', 'content\n'))]) |
|
203 |
builder.build_snapshot('left', ['base'], [ |
|
204 |
('modify', ('file-id', 'left content\n'))]) |
|
205 |
builder.build_snapshot('right', ['base'], [ |
|
206 |
('modify', ('file-id', 'right content\n'))]) |
|
4597.1.5
by John Arbash Meinel
Split the 'ghost' test into a second test. |
207 |
builder.build_snapshot('merge', ['left', 'right'], [ |
4597.1.1
by John Arbash Meinel
fix a critical bug #402778 |
208 |
('modify', ('file-id', 'left and right content\n'))]) |
4257.3.1
by Andrew Bennetts
Add failing test. |
209 |
builder.finish_series() |
210 |
branch = builder.get_branch() |
|
211 |
repo = self.make_to_repository('trunk') |
|
212 |
trunk = repo.bzrdir.create_branch() |
|
213 |
trunk.repository.fetch(branch.repository, 'left') |
|
214 |
trunk.repository.fetch(branch.repository, 'right') |
|
215 |
repo = self.make_to_repository('stacked') |
|
216 |
stacked_branch = repo.bzrdir.create_branch() |
|
217 |
stacked_branch.set_stacked_on_url(trunk.base) |
|
218 |
stacked_branch.repository.fetch(branch.repository, 'merge') |
|
219 |
unstacked_repo = stacked_branch.bzrdir.open_repository() |
|
220 |
unstacked_repo.lock_read() |
|
221 |
self.addCleanup(unstacked_repo.unlock) |
|
4476.3.73
by Andrew Bennetts
Remove smelly if guard from interrepo fetch stacking test, it's not necessary. |
222 |
self.assertFalse(unstacked_repo.has_revision('left')) |
223 |
self.assertFalse(unstacked_repo.has_revision('right')) |
|
4257.3.1
by Andrew Bennetts
Add failing test. |
224 |
self.assertEqual( |
4257.3.2
by Andrew Bennetts
Check during fetch if we are going to be missing data necessary to calculate altered fileids for stacked revisions. |
225 |
set([('left',), ('right',), ('merge',)]), |
4257.3.1
by Andrew Bennetts
Add failing test. |
226 |
unstacked_repo.inventories.keys()) |
4597.1.1
by John Arbash Meinel
fix a critical bug #402778 |
227 |
# And the basis inventories have been copied correctly
|
228 |
trunk.lock_read() |
|
229 |
self.addCleanup(trunk.unlock) |
|
230 |
left_tree, right_tree = trunk.repository.revision_trees( |
|
231 |
['left', 'right']) |
|
232 |
stacked_branch.lock_read() |
|
233 |
self.addCleanup(stacked_branch.unlock) |
|
234 |
(stacked_left_tree, |
|
235 |
stacked_right_tree) = stacked_branch.repository.revision_trees( |
|
236 |
['left', 'right']) |
|
237 |
self.assertEqual(left_tree.inventory, stacked_left_tree.inventory) |
|
238 |
self.assertEqual(right_tree.inventory, stacked_right_tree.inventory) |
|
4257.3.1
by Andrew Bennetts
Add failing test. |
239 |
|
4476.3.81
by Andrew Bennetts
Merge bzr.dev. Fix some minor fallout. per_interrepository/test_fetch.py has some duplicated assertions as a first pass at resolving conflicts. |
240 |
# Finally, it's not enough to see that the basis inventories are
|
241 |
# present. The texts introduced in merge (and only those) should be
|
|
242 |
# present, and also generating a stream should succeed without blowing
|
|
243 |
# up.
|
|
4476.3.11
by Andrew Bennetts
All fetch and interrepo tests passing. |
244 |
self.assertTrue(unstacked_repo.has_revision('merge')) |
4476.3.81
by Andrew Bennetts
Merge bzr.dev. Fix some minor fallout. per_interrepository/test_fetch.py has some duplicated assertions as a first pass at resolving conflicts. |
245 |
expected_texts = set([('file-id', 'merge')]) |
246 |
if stacked_branch.repository.texts.get_parent_map([('root-id', |
|
247 |
'merge')]): |
|
248 |
# If a (root-id,merge) text exists, it should be in the stacked
|
|
249 |
# repo.
|
|
250 |
expected_texts.add(('root-id', 'merge')) |
|
251 |
self.assertEqual(expected_texts, unstacked_repo.texts.keys()) |
|
4476.3.11
by Andrew Bennetts
All fetch and interrepo tests passing. |
252 |
self.assertCanStreamRevision(unstacked_repo, 'merge') |
253 |
||
254 |
def assertCanStreamRevision(self, repo, revision_id): |
|
255 |
exclude_keys = set(repo.all_revision_ids()) - set([revision_id]) |
|
256 |
search = SearchResult([revision_id], exclude_keys, 1, [revision_id]) |
|
257 |
source = repo._get_source(repo._format) |
|
258 |
for substream_kind, substream in source.get_stream(search): |
|
259 |
# Consume the substream
|
|
260 |
list(substream) |
|
4257.3.1
by Andrew Bennetts
Add failing test. |
261 |
|
4597.1.5
by John Arbash Meinel
Split the 'ghost' test into a second test. |
262 |
def test_fetch_across_stacking_boundary_ignores_ghost(self): |
263 |
if not self.repository_format_to.supports_external_lookups: |
|
264 |
raise TestNotApplicable("Need stacking support in the target.") |
|
265 |
to_repo = self.make_to_repository('to') |
|
266 |
builder = self.make_branch_builder('branch') |
|
267 |
builder.start_series() |
|
268 |
builder.build_snapshot('base', None, [ |
|
269 |
('add', ('', 'root-id', 'directory', '')), |
|
270 |
('add', ('file', 'file-id', 'file', 'content\n'))]) |
|
271 |
builder.build_snapshot('second', ['base'], [ |
|
272 |
('modify', ('file-id', 'second content\n'))]) |
|
273 |
builder.build_snapshot('third', ['second', 'ghost'], [ |
|
274 |
('modify', ('file-id', 'third content\n'))]) |
|
275 |
builder.finish_series() |
|
276 |
branch = builder.get_branch() |
|
277 |
repo = self.make_to_repository('trunk') |
|
278 |
trunk = repo.bzrdir.create_branch() |
|
279 |
trunk.repository.fetch(branch.repository, 'second') |
|
280 |
repo = self.make_to_repository('stacked') |
|
281 |
stacked_branch = repo.bzrdir.create_branch() |
|
282 |
stacked_branch.set_stacked_on_url(trunk.base) |
|
283 |
stacked_branch.repository.fetch(branch.repository, 'third') |
|
284 |
unstacked_repo = stacked_branch.bzrdir.open_repository() |
|
285 |
unstacked_repo.lock_read() |
|
286 |
self.addCleanup(unstacked_repo.unlock) |
|
287 |
self.assertFalse(unstacked_repo.has_revision('second')) |
|
288 |
self.assertFalse(unstacked_repo.has_revision('ghost')) |
|
289 |
self.assertEqual( |
|
290 |
set([('second',), ('third',)]), |
|
291 |
unstacked_repo.inventories.keys()) |
|
292 |
# And the basis inventories have been copied correctly
|
|
293 |
trunk.lock_read() |
|
294 |
self.addCleanup(trunk.unlock) |
|
295 |
second_tree = trunk.repository.revision_tree('second') |
|
296 |
stacked_branch.lock_read() |
|
297 |
self.addCleanup(stacked_branch.unlock) |
|
298 |
stacked_second_tree = stacked_branch.repository.revision_tree('second') |
|
299 |
self.assertEqual(second_tree.inventory, stacked_second_tree.inventory) |
|
4476.3.81
by Andrew Bennetts
Merge bzr.dev. Fix some minor fallout. per_interrepository/test_fetch.py has some duplicated assertions as a first pass at resolving conflicts. |
300 |
# Finally, it's not enough to see that the basis inventories are
|
301 |
# present. The texts introduced in merge (and only those) should be
|
|
302 |
# present, and also generating a stream should succeed without blowing
|
|
303 |
# up.
|
|
304 |
self.assertTrue(unstacked_repo.has_revision('third')) |
|
305 |
expected_texts = set([('file-id', 'third')]) |
|
306 |
if stacked_branch.repository.texts.get_parent_map([('root-id', |
|
307 |
'third')]): |
|
308 |
# If a (root-id,third) text exists, it should be in the stacked
|
|
309 |
# repo.
|
|
310 |
expected_texts.add(('root-id', 'third')) |
|
311 |
self.assertEqual(expected_texts, unstacked_repo.texts.keys()) |
|
312 |
self.assertCanStreamRevision(unstacked_repo, 'third') |
|
4597.1.5
by John Arbash Meinel
Split the 'ghost' test into a second test. |
313 |
|
4627.3.4
by Andrew Bennetts
Add a (long) test that fails without the fix. |
314 |
def test_fetch_from_stacked_to_stacked_copies_parent_inventories(self): |
315 |
"""Fetch from a stacked branch copies inventories for parents of
|
|
316 |
revisions at the stacking boundary.
|
|
317 |
||
318 |
Specifically, fetch will copy the parent inventories from the
|
|
319 |
source for which the corresponding revisions are not present. This
|
|
320 |
will happen even when the source repository has no fallbacks configured
|
|
321 |
(as is the case during upgrade).
|
|
322 |
"""
|
|
323 |
if not self.repository_format.supports_external_lookups: |
|
324 |
raise TestNotApplicable("Need stacking support in the source.") |
|
325 |
if not self.repository_format_to.supports_external_lookups: |
|
326 |
raise TestNotApplicable("Need stacking support in the target.") |
|
327 |
builder = self.make_branch_builder('branch') |
|
328 |
builder.start_series() |
|
329 |
builder.build_snapshot('base', None, [ |
|
330 |
('add', ('', 'root-id', 'directory', '')), |
|
331 |
('add', ('file', 'file-id', 'file', 'content\n'))]) |
|
332 |
builder.build_snapshot('left', ['base'], [ |
|
333 |
('modify', ('file-id', 'left content\n'))]) |
|
334 |
builder.build_snapshot('right', ['base'], [ |
|
335 |
('modify', ('file-id', 'right content\n'))]) |
|
336 |
builder.build_snapshot('merge', ['left', 'right'], [ |
|
337 |
('modify', ('file-id', 'left and right content\n'))]) |
|
338 |
builder.finish_series() |
|
339 |
branch = builder.get_branch() |
|
340 |
repo = self.make_repository('old-trunk') |
|
341 |
# Make a pair of equivalent trunk repos in the from and to formats.
|
|
342 |
old_trunk = repo.bzrdir.create_branch() |
|
343 |
old_trunk.repository.fetch(branch.repository, 'left') |
|
344 |
old_trunk.repository.fetch(branch.repository, 'right') |
|
345 |
repo = self.make_to_repository('new-trunk') |
|
346 |
new_trunk = repo.bzrdir.create_branch() |
|
347 |
new_trunk.repository.fetch(branch.repository, 'left') |
|
348 |
new_trunk.repository.fetch(branch.repository, 'right') |
|
349 |
# Make the source; a repo stacked on old_trunk contained just the data
|
|
350 |
# for 'merge'.
|
|
351 |
repo = self.make_repository('old-stacked') |
|
352 |
old_stacked_branch = repo.bzrdir.create_branch() |
|
353 |
old_stacked_branch.set_stacked_on_url(old_trunk.base) |
|
354 |
old_stacked_branch.repository.fetch(branch.repository, 'merge') |
|
355 |
# Make the target, a repo stacked on new_trunk.
|
|
356 |
repo = self.make_to_repository('new-stacked') |
|
357 |
new_stacked_branch = repo.bzrdir.create_branch() |
|
358 |
new_stacked_branch.set_stacked_on_url(new_trunk.base) |
|
359 |
old_unstacked_repo = old_stacked_branch.bzrdir.open_repository() |
|
360 |
new_unstacked_repo = new_stacked_branch.bzrdir.open_repository() |
|
361 |
# Reopen the source and target repos without any fallbacks, and fetch
|
|
362 |
# 'merge'.
|
|
363 |
new_unstacked_repo.fetch(old_unstacked_repo, 'merge') |
|
364 |
# Now check the results. new_unstacked_repo should contain all the
|
|
365 |
# data necessary to stream 'merge' (i.e. the parent inventories).
|
|
366 |
new_unstacked_repo.lock_read() |
|
367 |
self.addCleanup(new_unstacked_repo.unlock) |
|
368 |
self.assertFalse(new_unstacked_repo.has_revision('left')) |
|
369 |
self.assertFalse(new_unstacked_repo.has_revision('right')) |
|
370 |
self.assertEqual( |
|
371 |
set([('left',), ('right',), ('merge',)]), |
|
372 |
new_unstacked_repo.inventories.keys()) |
|
373 |
# And the basis inventories have been copied correctly
|
|
374 |
new_trunk.lock_read() |
|
375 |
self.addCleanup(new_trunk.unlock) |
|
376 |
left_tree, right_tree = new_trunk.repository.revision_trees( |
|
377 |
['left', 'right']) |
|
378 |
new_stacked_branch.lock_read() |
|
379 |
self.addCleanup(new_stacked_branch.unlock) |
|
380 |
(stacked_left_tree, |
|
381 |
stacked_right_tree) = new_stacked_branch.repository.revision_trees( |
|
382 |
['left', 'right']) |
|
383 |
self.assertEqual(left_tree.inventory, stacked_left_tree.inventory) |
|
384 |
self.assertEqual(right_tree.inventory, stacked_right_tree.inventory) |
|
385 |
# Finally, it's not enough to see that the basis inventories are
|
|
386 |
# present. The texts introduced in merge (and only those) should be
|
|
387 |
# present, and also generating a stream should succeed without blowing
|
|
388 |
# up.
|
|
389 |
self.assertTrue(new_unstacked_repo.has_revision('merge')) |
|
390 |
expected_texts = set([('file-id', 'merge')]) |
|
391 |
if new_stacked_branch.repository.texts.get_parent_map([('root-id', |
|
392 |
'merge')]): |
|
393 |
# If a (root-id,merge) text exists, it should be in the stacked
|
|
394 |
# repo.
|
|
395 |
expected_texts.add(('root-id', 'merge')) |
|
396 |
self.assertEqual(expected_texts, new_unstacked_repo.texts.keys()) |
|
397 |
self.assertCanStreamRevision(new_unstacked_repo, 'merge') |
|
398 |
||
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
399 |
def test_fetch_missing_basis_text(self): |
400 |
"""If fetching a delta, we should die if a basis is not present."""
|
|
401 |
tree = self.make_branch_and_tree('tree') |
|
402 |
self.build_tree(['tree/a']) |
|
403 |
tree.add(['a'], ['a-id']) |
|
404 |
tree.commit('one', rev_id='rev-one') |
|
405 |
self.build_tree_contents([('tree/a', 'new contents\n')]) |
|
406 |
tree.commit('two', rev_id='rev-two') |
|
407 |
||
408 |
to_repo = self.make_to_repository('to_repo') |
|
409 |
# We build a broken revision so that we can test the fetch code dies
|
|
410 |
# properly. So copy the inventory and revision, but not the text.
|
|
411 |
to_repo.lock_write() |
|
412 |
try: |
|
413 |
to_repo.start_write_group() |
|
4634.35.13
by Andrew Bennetts
Fix test_fetch_missing_basis_text to skip if commit_write_group on the target repo prevents making a broken revision. |
414 |
try: |
415 |
inv = tree.branch.repository.get_inventory('rev-one') |
|
416 |
to_repo.add_inventory('rev-one', inv, []) |
|
417 |
rev = tree.branch.repository.get_revision('rev-one') |
|
418 |
to_repo.add_revision('rev-one', rev, inv=inv) |
|
4634.35.22
by Andrew Bennetts
Use monkey patching to avoid skipping (mostly) tests that try to create damaged repos on 2a. |
419 |
self.disable_commit_write_group_paranoia(to_repo) |
420 |
to_repo.commit_write_group() |
|
4634.35.13
by Andrew Bennetts
Fix test_fetch_missing_basis_text to skip if commit_write_group on the target repo prevents making a broken revision. |
421 |
except: |
422 |
to_repo.abort_write_group(suppress_errors=True) |
|
423 |
raise
|
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
424 |
finally: |
425 |
to_repo.unlock() |
|
426 |
||
3350.3.21
by Robert Collins
Merge bzr.dev. |
427 |
# Implementations can either ensure that the target of the delta is
|
428 |
# reconstructable, or raise an exception (which stream based copies
|
|
429 |
# generally do).
|
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
430 |
try: |
431 |
to_repo.fetch(tree.branch.repository, 'rev-two') |
|
3830.3.12
by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks |
432 |
except (errors.BzrCheckError, errors.RevisionNotPresent), e: |
433 |
# If an exception is raised, the revision should not be in the
|
|
434 |
# target.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
435 |
#
|
3830.3.9
by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests |
436 |
# Can also just raise a generic check errors; stream insertion
|
437 |
# does this to include all the missing data
|
|
438 |
self.assertRaises((errors.NoSuchRevision, errors.RevisionNotPresent), |
|
439 |
to_repo.revision_tree, 'rev-two') |
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
440 |
else: |
3350.3.21
by Robert Collins
Merge bzr.dev. |
441 |
# If not exception is raised, then the text should be
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
442 |
# available.
|
443 |
to_repo.lock_read() |
|
444 |
try: |
|
3350.3.21
by Robert Collins
Merge bzr.dev. |
445 |
rt = to_repo.revision_tree('rev-two') |
446 |
self.assertEqual('new contents\n', |
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
447 |
rt.get_file_text('a-id')) |
448 |
finally: |
|
449 |
to_repo.unlock() |
|
450 |
||
451 |
def test_fetch_missing_revision_same_location_fails(self): |
|
452 |
repo_a = self.make_repository('.') |
|
453 |
repo_b = repository.Repository.open('.') |
|
5728.3.1
by Martin Pool
Remove apparently no-longer-called check_old_format_lock_error |
454 |
self.assertRaises(errors.NoSuchRevision, |
455 |
repo_b.fetch, repo_a, revision_id='XXX') |
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
456 |
|
457 |
def test_fetch_same_location_trivial_works(self): |
|
458 |
repo_a = self.make_repository('.') |
|
459 |
repo_b = repository.Repository.open('.') |
|
5728.3.1
by Martin Pool
Remove apparently no-longer-called check_old_format_lock_error |
460 |
repo_a.fetch(repo_b) |
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
461 |
|
462 |
def test_fetch_missing_text_other_location_fails(self): |
|
463 |
source_tree = self.make_branch_and_tree('source') |
|
464 |
source = source_tree.branch.repository |
|
465 |
target = self.make_to_repository('target') |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
466 |
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
467 |
# start by adding a file so the data knit for the file exists in
|
468 |
# repositories that have specific files for each fileid.
|
|
469 |
self.build_tree(['source/id']) |
|
470 |
source_tree.add(['id'], ['id']) |
|
471 |
source_tree.commit('a', rev_id='a') |
|
472 |
# now we manually insert a revision with an inventory referencing
|
|
4634.35.14
by Andrew Bennetts
Fix more tests to cope with new commit_write_group strictness. |
473 |
# file 'id' at revision 'b', but we do not insert revision b.
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
474 |
# this should ensure that the new versions of files are being checked
|
475 |
# for during pull operations
|
|
476 |
inv = source.get_inventory('a') |
|
477 |
source.lock_write() |
|
3380.1.5
by Aaron Bentley
Merge with make-it-work |
478 |
self.addCleanup(source.unlock) |
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
479 |
source.start_write_group() |
480 |
inv['id'].revision = 'b' |
|
481 |
inv.revision_id = 'b' |
|
482 |
sha1 = source.add_inventory('b', inv, ['a']) |
|
483 |
rev = Revision(timestamp=0, |
|
484 |
timezone=None, |
|
485 |
committer="Foo Bar <foo@example.com>", |
|
486 |
message="Message", |
|
487 |
inventory_sha1=sha1, |
|
488 |
revision_id='b') |
|
489 |
rev.parent_ids = ['a'] |
|
490 |
source.add_revision('b', rev) |
|
4634.35.22
by Andrew Bennetts
Use monkey patching to avoid skipping (mostly) tests that try to create damaged repos on 2a. |
491 |
self.disable_commit_write_group_paranoia(source) |
492 |
source.commit_write_group() |
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
493 |
self.assertRaises(errors.RevisionNotPresent, target.fetch, source) |
494 |
self.assertFalse(target.has_revision('b')) |
|
495 |
||
496 |
def test_fetch_funky_file_id(self): |
|
497 |
from_tree = self.make_branch_and_tree('tree') |
|
498 |
if sys.platform == 'win32': |
|
499 |
from_repo = from_tree.branch.repository |
|
500 |
check_repo_format_for_funky_id_on_win32(from_repo) |
|
501 |
self.build_tree(['tree/filename']) |
|
502 |
from_tree.add('filename', 'funky-chars<>%&;"\'') |
|
503 |
from_tree.commit('commit filename') |
|
504 |
to_repo = self.make_to_repository('to') |
|
3350.3.21
by Robert Collins
Merge bzr.dev. |
505 |
to_repo.fetch(from_tree.branch.repository, from_tree.get_parent_ids()[0]) |
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
506 |
|
3380.1.6
by Aaron Bentley
Ensure fetching munges sha1s |
507 |
def test_fetch_revision_hash(self): |
508 |
"""Ensure that inventory hashes are updated by fetch"""
|
|
509 |
from_tree = self.make_branch_and_tree('tree') |
|
510 |
from_tree.commit('foo', rev_id='foo-id') |
|
511 |
to_repo = self.make_to_repository('to') |
|
512 |
to_repo.fetch(from_tree.branch.repository) |
|
4988.3.2
by Jelmer Vernooij
Call get_revision on the right object. |
513 |
recorded_inv_sha1 = to_repo.get_revision('foo-id').inventory_sha1 |
4597.1.4
by John Arbash Meinel
Fix one test that assumed get_inventory_xml worked. |
514 |
to_repo.lock_read() |
515 |
self.addCleanup(to_repo.unlock) |
|
516 |
stream = to_repo.inventories.get_record_stream([('foo-id',)], |
|
517 |
'unordered', True) |
|
518 |
bytes = stream.next().get_bytes_as('fulltext') |
|
519 |
computed_inv_sha1 = osutils.sha_string(bytes) |
|
3380.1.6
by Aaron Bentley
Ensure fetching munges sha1s |
520 |
self.assertEqual(computed_inv_sha1, recorded_inv_sha1) |
521 |
||
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
522 |
|
523 |
class TestFetchDependentData(TestCaseWithInterRepository): |
|
524 |
||
525 |
def test_reference(self): |
|
526 |
from_tree = self.make_branch_and_tree('tree') |
|
527 |
to_repo = self.make_to_repository('to') |
|
528 |
if (not from_tree.supports_tree_reference() or |
|
529 |
not from_tree.branch.repository._format.supports_tree_reference or |
|
530 |
not to_repo._format.supports_tree_reference): |
|
531 |
raise TestNotApplicable("Need subtree support.") |
|
532 |
subtree = self.make_branch_and_tree('tree/subtree') |
|
533 |
subtree.commit('subrev 1') |
|
534 |
from_tree.add_reference(subtree) |
|
535 |
tree_rev = from_tree.commit('foo') |
|
536 |
# now from_tree has a last-modified of subtree of the rev id of the
|
|
537 |
# commit for foo, and a reference revision of the rev id of the commit
|
|
538 |
# for subrev 1
|
|
539 |
to_repo.fetch(from_tree.branch.repository, tree_rev) |
|
540 |
# to_repo should have a file_graph for from_tree.path2id('subtree') and
|
|
541 |
# revid tree_rev.
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
542 |
file_id = from_tree.path2id('subtree') |
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
543 |
to_repo.lock_read() |
544 |
try: |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
545 |
self.assertEqual({(file_id, tree_rev):()}, |
546 |
to_repo.texts.get_parent_map([(file_id, tree_rev)])) |
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
547 |
finally: |
548 |
to_repo.unlock() |