47
47
def fetch_steps(self, br_a, br_b, writable_a):
48
48
"""A foreign test method for testing fetch locally and remotely."""
50
50
# TODO RBC 20060201 make this a repository test.
51
51
repo_b = br_b.repository
52
52
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
53
53
self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
54
54
self.assertEquals(len(br_b.revision_history()), 7)
55
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[2])[0], 0)
55
br_b.fetch(br_a, br_a.revision_history()[2])
56
56
# branch.fetch is not supposed to alter the revision history
57
57
self.assertEquals(len(br_b.revision_history()), 7)
58
58
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
60
60
# fetching the next revision up in sample data copies one revision
61
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[3])[0], 1)
61
br_b.fetch(br_a, br_a.revision_history()[3])
62
62
self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
63
63
self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
64
64
self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
66
66
# When a non-branch ancestor is missing, it should be unlisted...
67
67
# as its not reference from the inventory weave.
68
68
br_b4 = self.make_branch('br_4')
69
count, failures = br_b4.fetch(br_b)
70
self.assertEqual(count, 7)
71
self.assertEqual(failures, [])
73
self.assertEqual(writable_a.fetch(br_b)[0], 1)
71
writable_a.fetch(br_b)
74
72
self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
75
73
self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
77
75
br_b2 = self.make_branch('br_b2')
78
self.assertEquals(br_b2.fetch(br_b)[0], 7)
79
77
self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
80
78
self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
81
79
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
83
81
br_a2 = self.make_branch('br_a2')
84
self.assertEquals(br_a2.fetch(br_a)[0], 9)
85
83
self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
86
84
self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
87
85
self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
89
87
br_a3 = self.make_branch('br_a3')
90
# pulling a branch with no revisions grabs nothing, regardless of
88
# pulling a branch with no revisions grabs nothing, regardless of
91
89
# whats in the inventory.
92
self.assertEquals(br_a3.fetch(br_a2)[0], 0)
93
91
for revno in range(4):
95
93
br_a3.repository.has_revision(br_a.revision_history()[revno]))
96
self.assertEqual(br_a3.fetch(br_a2, br_a.revision_history()[2])[0], 3)
94
br_a3.fetch(br_a2, br_a.revision_history()[2])
97
95
# pull the 3 revisions introduced by a@u-0-3
98
fetched = br_a3.fetch(br_a2, br_a.revision_history()[3])[0]
99
self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
100
# InstallFailed should be raised if the branch is missing the revision
96
br_a3.fetch(br_a2, br_a.revision_history()[3])
97
# NoSuchRevision should be raised if the branch is missing the revision
101
98
# that was requested.
102
self.assertRaises(errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')
99
self.assertRaises(errors.NoSuchRevision, br_a3.fetch, br_a2, 'pizza')
104
101
# TODO: Test trying to fetch from a branch that points to a revision not
105
102
# actually present in its repository. Not every branch format allows you
250
247
rev_id).get_file_text('this-file-id'), text)
253
class TestHttpFetch(TestCaseWithWebserver):
254
# FIXME RBC 20060124 this really isn't web specific, perhaps an
255
# instrumented readonly transport? Can we do an instrumented
256
# adapter and use self.get_readonly_url ?
258
def test_fetch(self):
259
#highest indices a: 5, b: 7
260
br_a, br_b = make_branches(self)
261
br_rem_a = Branch.open(self.get_readonly_url('branch1'))
262
fetch_steps(self, br_rem_a, br_b, br_a)
264
def _count_log_matches(self, target, logs):
265
"""Count the number of times the target file pattern was fetched in an http log"""
266
get_succeeds_re = re.compile(
267
'.*"GET .*%s HTTP/1.1" 20[06] - "-" "bzr/%s' %
268
( target, bzrlib.__version__))
271
if get_succeeds_re.match(line):
275
def test_weaves_are_retrieved_once(self):
276
self.build_tree(("source/", "source/file", "target/"))
277
# This test depends on knit dasta storage.
278
wt = self.make_branch_and_tree('source', format='dirstate-tags')
280
wt.add(["file"], ["id"])
281
wt.commit("added file")
282
open("source/file", 'w').write("blah\n")
283
wt.commit("changed file")
284
target = BzrDir.create_branch_and_repo("target/")
285
source = Branch.open(self.get_readonly_url("source/"))
286
self.assertEqual(target.fetch(source), (2, []))
287
# this is the path to the literal file. As format changes
288
# occur it needs to be updated. FIXME: ask the store for the
290
self.log("web server logs are:")
291
http_logs = self.get_readonly_server().logs
292
self.log('\n'.join(http_logs))
293
# unfortunately this log entry is branch format specific. We could
294
# factor out the 'what files does this format use' to a method on the
295
# repository, which would let us to this generically. RBC 20060419
296
# RBC 20080408: Or perhaps we can assert that no files are fully read
298
self.assertEqual(1, self._count_log_matches('/ce/id.kndx', http_logs))
299
self.assertEqual(1, self._count_log_matches('/ce/id.knit', http_logs))
300
self.assertEqual(1, self._count_log_matches('inventory.kndx', http_logs))
301
# this r-h check test will prevent regressions, but it currently already
302
# passes, before the patch to cache-rh is applied :[
303
self.assertTrue(1 >= self._count_log_matches('revision-history',
305
self.assertTrue(1 >= self._count_log_matches('last-revision',
307
# FIXME naughty poking in there.
308
self.get_readonly_server().logs = []
309
# check there is nothing more to fetch. We take care to re-use the
310
# existing transport so that the request logs we're about to examine
311
# aren't cluttered with redundant probes for a smart server.
312
# XXX: Perhaps this further parameterisation: test http with smart
313
# server, and test http without smart server?
314
source = Branch.open(
315
self.get_readonly_url("source/"),
316
possible_transports=[source.bzrdir.root_transport])
317
self.assertEqual(target.fetch(source), (0, []))
318
# should make just two requests
319
http_logs = self.get_readonly_server().logs
320
self.log("web server logs are:")
321
self.log('\n'.join(http_logs))
322
self.assertEqual(1, self._count_log_matches('branch-format', http_logs))
323
self.assertEqual(1, self._count_log_matches('branch/format', http_logs))
324
self.assertEqual(1, self._count_log_matches('repository/format',
326
self.assertTrue(1 >= self._count_log_matches('revision-history',
328
self.assertTrue(1 >= self._count_log_matches('last-revision',
330
self.assertEqual(4, len(http_logs))
333
250
class TestKnitToPackFetch(TestCaseWithTransport):
335
def find_get_record_stream(self, calls):
336
"""In a list of calls, find 'get_record_stream' calls.
252
def find_get_record_stream(self, calls, expected_count=1):
253
"""In a list of calls, find the last 'get_record_stream'.
338
This also ensures that there is only one get_record_stream call.
255
:param expected_count: The number of calls we should exepect to find.
256
If a different number is found, an assertion is raised.
340
258
get_record_call = None
341
260
for call in calls:
342
261
if call[0] == 'get_record_stream':
343
self.assertIs(None, get_record_call,
344
"there should only be one call to"
345
" get_record_stream")
346
263
get_record_call = call
347
self.assertIsNot(None, get_record_call,
348
"there should be exactly one call to "
349
" get_record_stream")
264
self.assertEqual(expected_count, call_count)
350
265
return get_record_call
352
267
def test_fetch_with_deltas_no_delta_closure(self):
366
281
source.inventories = versionedfile.RecordingVersionedFilesDecorator(
367
282
source.inventories)
369
self.assertTrue(target._fetch_uses_deltas)
284
self.assertTrue(target._format._fetch_uses_deltas)
370
285
target.fetch(source, revision_id='rev-one')
371
286
self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
372
target._fetch_order, False),
287
target._format._fetch_order, False),
373
288
self.find_get_record_stream(source.texts.calls))
374
289
self.assertEqual(('get_record_stream', [('rev-one',)],
375
target._fetch_order, False),
376
self.find_get_record_stream(source.inventories.calls))
377
# Because of bugs in the old fetch code, revisions could accidentally
378
# have deltas present in knits. However, it was never intended, so we
379
# always for include_delta_closure=True, to make sure we get fulltexts.
290
target._format._fetch_order, False),
291
self.find_get_record_stream(source.inventories.calls, 2))
381
292
self.assertEqual(('get_record_stream', [('rev-one',)],
382
target._fetch_order, True),
293
target._format._fetch_order, False),
383
294
self.find_get_record_stream(source.revisions.calls))
384
295
# XXX: Signatures is special, and slightly broken. The
385
296
# standard item_keys_introduced_by actually does a lookup for every
409
320
source.revisions)
410
321
source.inventories = versionedfile.RecordingVersionedFilesDecorator(
411
322
source.inventories)
412
target._fetch_uses_deltas = False
323
# XXX: This won't work in general, but for the dirstate format it does.
324
self.overrideAttr(target._format, '_fetch_uses_deltas', False)
413
325
target.fetch(source, revision_id='rev-one')
414
326
self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
415
target._fetch_order, True),
327
target._format._fetch_order, True),
416
328
self.find_get_record_stream(source.texts.calls))
417
329
self.assertEqual(('get_record_stream', [('rev-one',)],
418
target._fetch_order, True),
419
self.find_get_record_stream(source.inventories.calls))
330
target._format._fetch_order, True),
331
self.find_get_record_stream(source.inventories.calls, 2))
420
332
self.assertEqual(('get_record_stream', [('rev-one',)],
421
target._fetch_order, True),
333
target._format._fetch_order, True),
422
334
self.find_get_record_stream(source.revisions.calls))
423
335
# XXX: Signatures is special, and slightly broken. The
424
336
# standard item_keys_introduced_by actually does a lookup for every
430
342
signature_calls = source.signatures.calls[-1:]
431
343
self.assertEqual(('get_record_stream', [('rev-one',)],
432
target._fetch_order, True),
344
target._format._fetch_order, True),
433
345
self.find_get_record_stream(signature_calls))
347
def test_fetch_revisions_with_deltas_into_pack(self):
348
# See BUG #261339, dev versions of bzr could accidentally create deltas
349
# in revision texts in knit branches (when fetching from packs). So we
350
# ensure that *if* a knit repository has a delta in revisions, that it
351
# gets properly expanded back into a fulltext when stored in the pack
353
tree = self.make_branch_and_tree('source', format='dirstate')
354
target = self.make_repository('target', format='pack-0.92')
355
self.build_tree(['source/file'])
356
tree.set_root_id('root-id')
357
tree.add('file', 'file-id')
358
tree.commit('one', rev_id='rev-one')
359
# Hack the KVF for revisions so that it "accidentally" allows a delta
360
tree.branch.repository.revisions._max_delta_chain = 200
361
tree.commit('two', rev_id='rev-two')
362
source = tree.branch.repository
363
# Ensure that we stored a delta
365
self.addCleanup(source.unlock)
366
record = source.revisions.get_record_stream([('rev-two',)],
367
'unordered', False).next()
368
self.assertEqual('knit-delta-gz', record.storage_kind)
369
target.fetch(tree.branch.repository, revision_id='rev-two')
370
# The record should get expanded back to a fulltext
372
self.addCleanup(target.unlock)
373
record = target.revisions.get_record_stream([('rev-two',)],
374
'unordered', False).next()
375
self.assertEqual('knit-ft-gz', record.storage_kind)
377
def test_fetch_with_fallback_and_merge(self):
378
builder = self.make_branch_builder('source', format='pack-0.92')
379
builder.start_series()
390
# A & B are present in the base (stacked-on) repository, A-E are
391
# present in the source.
392
# This reproduces bug #304841
393
# We need a large enough inventory that total size of compressed deltas
394
# is shorter than the size of a compressed fulltext. We have to use
395
# random ids because otherwise the inventory fulltext compresses too
396
# well and the deltas get bigger.
398
('add', ('', 'TREE_ROOT', 'directory', None))]
400
fname = 'file%03d' % (i,)
401
fileid = '%s-%s' % (fname, osutils.rand_chars(64))
402
to_add.append(('add', (fname, fileid, 'file', 'content\n')))
403
builder.build_snapshot('A', None, to_add)
404
builder.build_snapshot('B', ['A'], [])
405
builder.build_snapshot('C', ['A'], [])
406
builder.build_snapshot('D', ['C'], [])
407
builder.build_snapshot('E', ['D'], [])
408
builder.build_snapshot('F', ['E', 'B'], [])
409
builder.finish_series()
410
source_branch = builder.get_branch()
411
source_branch.bzrdir.sprout('base', revision_id='B')
412
target_branch = self.make_branch('target', format='1.6')
413
target_branch.set_stacked_on_url('../base')
414
source = source_branch.repository
416
self.addCleanup(source.unlock)
417
source.inventories = versionedfile.OrderingVersionedFilesDecorator(
419
key_priority={('E',): 1, ('D',): 2, ('C',): 4,
421
# Ensure that the content is yielded in the proper order, and given as
423
records = [(record.key, record.storage_kind)
424
for record in source.inventories.get_record_stream(
425
[('D',), ('C',), ('E',), ('F',)], 'unordered', False)]
426
self.assertEqual([(('E',), 'knit-delta-gz'), (('D',), 'knit-delta-gz'),
427
(('F',), 'knit-delta-gz'), (('C',), 'knit-delta-gz')],
430
target_branch.lock_write()
431
self.addCleanup(target_branch.unlock)
432
target = target_branch.repository
433
target.fetch(source, revision_id='F')
434
# 'C' should be expanded to a fulltext, but D and E should still be
436
stream = target.inventories.get_record_stream(
437
[('C',), ('D',), ('E',), ('F',)],
439
kinds = dict((record.key, record.storage_kind) for record in stream)
440
self.assertEqual({('C',): 'knit-ft-gz', ('D',): 'knit-delta-gz',
441
('E',): 'knit-delta-gz', ('F',): 'knit-delta-gz'},
436
445
class Test1To2Fetch(TestCaseWithTransport):
437
446
"""Tests for Model1To2 failure modes"""
added
removed
bzrlib/tests/test_fetch.py
