1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
|
# Copyright (C) 2007-2010 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Tests for fetch between repositories of the same type."""
from bzrlib import (
bzrdir,
errors,
gpg,
graph,
remote,
repository,
tests,
)
from bzrlib.inventory import ROOT_ID
from bzrlib.tests import TestSkipped
from bzrlib.tests.per_repository import TestCaseWithRepository
class TestFetchSameRepository(TestCaseWithRepository):
def test_fetch(self):
# smoke test fetch to ensure that the convenience function works.
# it is defined as a convenience function with the underlying
# functionality provided by an InterRepository
tree_a = self.make_branch_and_tree('a')
self.build_tree(['a/foo'])
tree_a.add('foo', 'file1')
tree_a.commit('rev1', rev_id='rev1')
# fetch with a default limit (grab everything)
repo = self.make_repository('b')
if (tree_a.branch.repository.supports_rich_root() and not
repo.supports_rich_root()):
raise TestSkipped('Cannot fetch from model2 to model1')
repo.fetch(tree_a.branch.repository,
revision_id=None)
def test_fetch_fails_in_write_group(self):
# fetch() manages a write group itself, fetching within one isn't safe.
repo = self.make_repository('a')
repo.lock_write()
self.addCleanup(repo.unlock)
repo.start_write_group()
self.addCleanup(repo.abort_write_group)
# Don't need a specific class - not expecting flow control based on
# this.
self.assertRaises(errors.BzrError, repo.fetch, repo)
def test_fetch_to_knit3(self):
# create a repository of the sort we are testing.
tree_a = self.make_branch_and_tree('a')
self.build_tree(['a/foo'])
tree_a.add('foo', 'file1')
tree_a.commit('rev1', rev_id='rev1')
# create a knit-3 based format to fetch into
f = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
try:
format = tree_a.branch.repository._format
format.check_conversion_target(f.repository_format)
# if we cannot convert data to knit3, skip the test.
except errors.BadConversionTarget, e:
raise TestSkipped(str(e))
self.get_transport().mkdir('b')
b_bzrdir = f.initialize(self.get_url('b'))
knit3_repo = b_bzrdir.create_repository()
# fetch with a default limit (grab everything)
knit3_repo.fetch(tree_a.branch.repository, revision_id=None)
# Reopen to avoid any in-memory caching - ensure its reading from
# disk.
knit3_repo = b_bzrdir.open_repository()
rev1_tree = knit3_repo.revision_tree('rev1')
rev1_tree.lock_read()
try:
lines = rev1_tree.get_file_lines(rev1_tree.get_root_id())
finally:
rev1_tree.unlock()
self.assertEqual([], lines)
b_branch = b_bzrdir.create_branch()
b_branch.pull(tree_a.branch)
try:
tree_b = b_bzrdir.create_workingtree()
except errors.NotLocalUrl:
try:
tree_b = b_branch.create_checkout('b', lightweight=True)
except errors.NotLocalUrl:
raise TestSkipped("cannot make working tree with transport %r"
% b_bzrdir.transport)
tree_b.commit('no change', rev_id='rev2')
rev2_tree = knit3_repo.revision_tree('rev2')
self.assertEqual('rev1', rev2_tree.inventory.root.revision)
def do_test_fetch_to_rich_root_sets_parents_correctly(self, result,
snapshots, root_id=ROOT_ID, allow_lefthand_ghost=False):
"""Assert that result is the parents of 'tip' after fetching snapshots.
This helper constructs a 1.9 format source, and a test-format target
and fetches the result of building snapshots in the source, then
asserts that the parents of tip are result.
:param result: A parents list for the inventories.get_parent_map call.
:param snapshots: An iterable of snapshot parameters for
BranchBuilder.build_snapshot.
'"""
# This overlaps slightly with the tests for commit builder about graph
# consistency.
# Cases:
repo = self.make_repository('target')
remote_format = isinstance(repo, remote.RemoteRepository)
if not repo._format.rich_root_data and not remote_format:
return # not relevant
builder = self.make_branch_builder('source', format='1.9')
builder.start_series()
for revision_id, parent_ids, actions in snapshots:
builder.build_snapshot(revision_id, parent_ids, actions,
allow_leftmost_as_ghost=allow_lefthand_ghost)
builder.finish_series()
source = builder.get_branch()
if remote_format and not repo._format.rich_root_data:
# use a manual rich root format to ensure the code path is tested.
repo = self.make_repository('remote-target',
format='1.9-rich-root')
repo.lock_write()
self.addCleanup(repo.unlock)
repo.fetch(source.repository)
self.assertEqual(result,
repo.texts.get_parent_map([(root_id, 'tip')])[(root_id, 'tip')])
def test_fetch_to_rich_root_set_parent_no_parents(self):
# No parents rev -> No parents
self.do_test_fetch_to_rich_root_sets_parents_correctly((),
[('tip', None, [('add', ('', ROOT_ID, 'directory', ''))]),
])
def test_fetch_to_rich_root_set_parent_1_parent(self):
# 1 parent rev -> 1 parent
self.do_test_fetch_to_rich_root_sets_parents_correctly(
((ROOT_ID, 'base'),),
[('base', None, [('add', ('', ROOT_ID, 'directory', ''))]),
('tip', None, []),
])
def test_fetch_to_rich_root_set_parent_1_ghost_parent(self):
# 1 ghost parent -> No parents
self.do_test_fetch_to_rich_root_sets_parents_correctly((),
[('tip', ['ghost'], [('add', ('', ROOT_ID, 'directory', ''))]),
], allow_lefthand_ghost=True)
def test_fetch_to_rich_root_set_parent_2_head_parents(self):
# 2 parents both heads -> 2 parents
self.do_test_fetch_to_rich_root_sets_parents_correctly(
((ROOT_ID, 'left'), (ROOT_ID, 'right')),
[('base', None, [('add', ('', ROOT_ID, 'directory', ''))]),
('left', None, []),
('right', ['base'], []),
('tip', ['left', 'right'], []),
])
def test_fetch_to_rich_root_set_parent_2_parents_1_head(self):
# 2 parents one head -> 1 parent
self.do_test_fetch_to_rich_root_sets_parents_correctly(
((ROOT_ID, 'right'),),
[('left', None, [('add', ('', ROOT_ID, 'directory', ''))]),
('right', None, []),
('tip', ['left', 'right'], []),
])
def test_fetch_to_rich_root_set_parent_1_parent_different_id_gone(self):
# 1 parent different fileid, ours missing -> no parents
self.do_test_fetch_to_rich_root_sets_parents_correctly(
(),
[('base', None, [('add', ('', ROOT_ID, 'directory', ''))]),
('tip', None, [('unversion', ROOT_ID),
('add', ('', 'my-root', 'directory', '')),
]),
], root_id='my-root')
def test_fetch_to_rich_root_set_parent_1_parent_different_id_moved(self):
# 1 parent different fileid, ours moved -> 1 parent
# (and that parent honours the changing revid of the other location)
self.do_test_fetch_to_rich_root_sets_parents_correctly(
(('my-root', 'origin'),),
[('origin', None, [('add', ('', ROOT_ID, 'directory', '')),
('add', ('child', 'my-root', 'directory', ''))]),
('base', None, []),
('tip', None, [('unversion', 'my-root'),
('unversion', ROOT_ID),
('add', ('', 'my-root', 'directory', '')),
]),
], root_id='my-root')
def test_fetch_to_rich_root_set_parent_2_parent_1_different_id_gone(self):
# 2 parents, 1 different fileid, our second missing -> 1 parent
self.do_test_fetch_to_rich_root_sets_parents_correctly(
(('my-root', 'right'),),
[('base', None, [('add', ('', ROOT_ID, 'directory', ''))]),
('right', None, [('unversion', ROOT_ID),
('add', ('', 'my-root', 'directory', ''))]),
('tip', ['base', 'right'], [('unversion', ROOT_ID),
('add', ('', 'my-root', 'directory', '')),
]),
], root_id='my-root')
def test_fetch_to_rich_root_set_parent_2_parent_2_different_id_moved(self):
# 2 parents, 1 different fileid, our second moved -> 2 parent
# (and that parent honours the changing revid of the other location)
self.do_test_fetch_to_rich_root_sets_parents_correctly(
(('my-root', 'right'),),
# 'my-root' at 'child'.
[('origin', None, [('add', ('', ROOT_ID, 'directory', '')),
('add', ('child', 'my-root', 'directory', ''))]),
('base', None, []),
# 'my-root' at root
('right', None, [('unversion', 'my-root'),
('unversion', ROOT_ID),
('add', ('', 'my-root', 'directory', ''))]),
('tip', ['base', 'right'], [('unversion', 'my-root'),
('unversion', ROOT_ID),
('add', ('', 'my-root', 'directory', '')),
]),
], root_id='my-root')
def test_fetch_all_from_self(self):
tree = self.make_branch_and_tree('.')
rev_id = tree.commit('one')
# This needs to be a new copy of the repository, if this changes, the
# test needs to be rewritten
repo = tree.branch.repository.bzrdir.open_repository()
# This fetch should be a no-op see bug #158333
tree.branch.repository.fetch(repo, None)
def test_fetch_from_self(self):
tree = self.make_branch_and_tree('.')
rev_id = tree.commit('one')
repo = tree.branch.repository.bzrdir.open_repository()
# This fetch should be a no-op see bug #158333
tree.branch.repository.fetch(repo, rev_id)
def test_fetch_missing_from_self(self):
tree = self.make_branch_and_tree('.')
rev_id = tree.commit('one')
# Even though the fetch() is a NO-OP it should assert the revision id
# is present
repo = tree.branch.repository.bzrdir.open_repository()
self.assertRaises(errors.NoSuchRevision, tree.branch.repository.fetch,
repo, 'no-such-revision')
def makeARepoWithSignatures(self):
wt = self.make_branch_and_tree('a-repo-with-sigs')
wt.commit('rev1', allow_pointless=True, rev_id='rev1')
repo = wt.branch.repository
repo.lock_write()
repo.start_write_group()
repo.sign_revision('rev1', gpg.LoopbackGPGStrategy(None))
repo.commit_write_group()
repo.unlock()
return repo
def test_fetch_copies_signatures(self):
source_repo = self.makeARepoWithSignatures()
target_repo = self.make_repository('target')
target_repo.fetch(source_repo, revision_id=None)
self.assertEqual(
source_repo.get_signature_text('rev1'),
target_repo.get_signature_text('rev1'))
def make_repository_with_one_revision(self):
wt = self.make_branch_and_tree('source')
wt.commit('rev1', allow_pointless=True, rev_id='rev1')
return wt.branch.repository
def test_fetch_revision_already_exists(self):
# Make a repository with one revision.
source_repo = self.make_repository_with_one_revision()
# Fetch that revision into a second repository.
target_repo = self.make_repository('target')
target_repo.fetch(source_repo, revision_id='rev1')
# Now fetch again; there will be nothing to do. This should work
# without causing any errors.
target_repo.fetch(source_repo, revision_id='rev1')
def test_fetch_all_same_revisions_twice(self):
# Blind-fetching all the same revisions twice should succeed and be a
# no-op the second time.
repo = self.make_repository('repo')
tree = self.make_branch_and_tree('tree')
revision_id = tree.commit('test')
repo.fetch(tree.branch.repository)
repo.fetch(tree.branch.repository)
def make_simple_branch_with_ghost(self):
builder = self.make_branch_builder('source')
builder.start_series()
builder.build_snapshot('A-id', None, [
('add', ('', 'root-id', 'directory', None)),
('add', ('file', 'file-id', 'file', 'content\n'))])
builder.build_snapshot('B-id', ['A-id', 'ghost-id'], [])
builder.finish_series()
source_b = builder.get_branch()
source_b.lock_read()
self.addCleanup(source_b.unlock)
return source_b
def test_fetch_with_ghost(self):
source_b = self.make_simple_branch_with_ghost()
target = self.make_repository('target')
target.lock_write()
self.addCleanup(target.unlock)
target.fetch(source_b.repository, revision_id='B-id')
def test_fetch_into_smart_with_ghost(self):
trans = self.make_smart_server('target')
source_b = self.make_simple_branch_with_ghost()
target = self.make_repository('target')
# Re-open the repository over the smart protocol
target = repository.Repository.open(trans.base)
target.lock_write()
self.addCleanup(target.unlock)
try:
target.fetch(source_b.repository, revision_id='B-id')
except errors.TokenLockingNotSupported:
# The code inside fetch() that tries to lock and then fails, also
# causes weird problems with 'lock_not_held' later on...
target.lock_read()
raise tests.KnownFailure('some repositories fail to fetch'
' via the smart server because of locking issues.')
def test_fetch_from_smart_with_ghost(self):
trans = self.make_smart_server('source')
source_b = self.make_simple_branch_with_ghost()
target = self.make_repository('target')
target.lock_write()
self.addCleanup(target.unlock)
# Re-open the repository over the smart protocol
source = repository.Repository.open(trans.base)
source.lock_read()
self.addCleanup(source.unlock)
target.fetch(source, revision_id='B-id')
class TestSource(TestCaseWithRepository):
"""Tests for/about the results of Repository._get_source."""
def test_no_absent_records_in_stream_with_ghosts(self):
# XXX: Arguably should be in per_interrepository but
# doesn't actually gain coverage there; need a specific set of
# permutations to cover it.
# bug lp:376255 was reported about this.
builder = self.make_branch_builder('repo')
builder.start_series()
builder.build_snapshot('tip', ['ghost'],
[('add', ('', 'ROOT_ID', 'directory', ''))],
allow_leftmost_as_ghost=True)
builder.finish_series()
b = builder.get_branch()
b.lock_read()
self.addCleanup(b.unlock)
repo = b.repository
source = repo._get_source(repo._format)
search = graph.PendingAncestryResult(['tip'], repo)
stream = source.get_stream(search)
for substream_type, substream in stream:
for record in substream:
self.assertNotEqual('absent', record.storage_kind,
"Absent record for %s" % (((substream_type,) + record.key),))
|