13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22
17
from bzrlib import (
21
revision as _mod_revision,
29
24
from bzrlib.branch import Branch
30
from bzrlib.bzrdir import BzrDir
31
25
from bzrlib.repofmt import knitrepo
32
26
from bzrlib.tests import TestCaseWithTransport
33
from bzrlib.tests.http_utils import TestCaseWithWebserver
34
27
from bzrlib.tests.test_revision import make_branches
35
from bzrlib.trace import mutter
36
28
from bzrlib.upgrade import Convert
37
29
from bzrlib.workingtree import WorkingTree
39
31
# These tests are a bit old; please instead add new tests into
40
# interrepository_implementations/ so they'll run on all relevant
32
# per_interrepository/ so they'll run on all relevant
44
36
def has_revision(branch, revision_id):
45
37
return branch.repository.has_revision(revision_id)
40
def revision_history(branch):
43
graph = branch.repository.get_graph()
44
history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
45
[_mod_revision.NULL_REVISION]))
47
52
def fetch_steps(self, br_a, br_b, writable_a):
48
53
"""A foreign test method for testing fetch locally and remotely."""
50
55
# TODO RBC 20060201 make this a repository test.
51
56
repo_b = br_b.repository
52
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
53
self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
54
self.assertEquals(len(br_b.revision_history()), 7)
55
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[2])[0], 0)
57
self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
58
self.assertTrue(repo_b.has_revision(revision_history(br_a)[2]))
59
self.assertEqual(len(revision_history(br_b)), 7)
60
br_b.fetch(br_a, revision_history(br_a)[2])
56
61
# branch.fetch is not supposed to alter the revision history
57
self.assertEquals(len(br_b.revision_history()), 7)
58
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
62
self.assertEqual(len(revision_history(br_b)), 7)
63
self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
60
65
# 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)
62
self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
63
self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
64
self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
66
br_b.fetch(br_a, revision_history(br_a)[3])
67
self.assertTrue(repo_b.has_revision(revision_history(br_a)[3]))
68
self.assertFalse(has_revision(br_a, revision_history(br_b)[6]))
69
self.assertTrue(br_a.repository.has_revision(revision_history(br_b)[5]))
66
71
# When a non-branch ancestor is missing, it should be unlisted...
67
72
# as its not reference from the inventory weave.
68
73
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)
74
self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
75
self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
76
writable_a.fetch(br_b)
77
self.assertTrue(has_revision(br_a, revision_history(br_b)[3]))
78
self.assertTrue(has_revision(br_a, revision_history(br_b)[4]))
77
80
br_b2 = self.make_branch('br_b2')
78
self.assertEquals(br_b2.fetch(br_b)[0], 7)
79
self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
80
self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
81
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
82
self.assertTrue(has_revision(br_b2, revision_history(br_b)[4]))
83
self.assertTrue(has_revision(br_b2, revision_history(br_a)[2]))
84
self.assertFalse(has_revision(br_b2, revision_history(br_a)[3]))
83
86
br_a2 = self.make_branch('br_a2')
84
self.assertEquals(br_a2.fetch(br_a)[0], 9)
85
self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
86
self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
87
self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
88
self.assertTrue(has_revision(br_a2, revision_history(br_b)[4]))
89
self.assertTrue(has_revision(br_a2, revision_history(br_a)[3]))
90
self.assertTrue(has_revision(br_a2, revision_history(br_a)[2]))
89
92
br_a3 = self.make_branch('br_a3')
90
# pulling a branch with no revisions grabs nothing, regardless of
93
# pulling a branch with no revisions grabs nothing, regardless of
91
94
# whats in the inventory.
92
self.assertEquals(br_a3.fetch(br_a2)[0], 0)
93
96
for revno in range(4):
95
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)
98
br_a3.repository.has_revision(revision_history(br_a)[revno]))
99
br_a3.fetch(br_a2, revision_history(br_a)[2])
97
100
# 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
101
br_a3.fetch(br_a2, revision_history(br_a)[3])
102
# NoSuchRevision should be raised if the branch is missing the revision
101
103
# that was requested.
102
self.assertRaises(errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')
104
self.assertRaises(errors.NoSuchRevision, br_a3.fetch, br_a2, 'pizza')
104
106
# TODO: Test trying to fetch from a branch that points to a revision not
105
107
# actually present in its repository. Not every branch format allows you
250
252
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
255
class TestKnitToPackFetch(TestCaseWithTransport):
335
def find_get_record_stream(self, calls):
336
"""In a list of calls, find 'get_record_stream' calls.
257
def find_get_record_stream(self, calls, expected_count=1):
258
"""In a list of calls, find the last 'get_record_stream'.
338
This also ensures that there is only one get_record_stream call.
260
:param expected_count: The number of calls we should exepect to find.
261
If a different number is found, an assertion is raised.
340
263
get_record_call = None
341
265
for call in calls:
342
266
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
268
get_record_call = call
347
self.assertIsNot(None, get_record_call,
348
"there should be exactly one call to "
349
" get_record_stream")
269
self.assertEqual(expected_count, call_count)
350
270
return get_record_call
352
272
def test_fetch_with_deltas_no_delta_closure(self):
366
286
source.inventories = versionedfile.RecordingVersionedFilesDecorator(
367
287
source.inventories)
369
self.assertTrue(target._fetch_uses_deltas)
289
self.assertTrue(target._format._fetch_uses_deltas)
370
290
target.fetch(source, revision_id='rev-one')
371
291
self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
372
target._fetch_order, False),
292
target._format._fetch_order, False),
373
293
self.find_get_record_stream(source.texts.calls))
374
294
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.
295
target._format._fetch_order, False),
296
self.find_get_record_stream(source.inventories.calls, 2))
381
297
self.assertEqual(('get_record_stream', [('rev-one',)],
382
target._fetch_order, True),
298
target._format._fetch_order, False),
383
299
self.find_get_record_stream(source.revisions.calls))
384
300
# XXX: Signatures is special, and slightly broken. The
385
301
# standard item_keys_introduced_by actually does a lookup for every
409
325
source.revisions)
410
326
source.inventories = versionedfile.RecordingVersionedFilesDecorator(
411
327
source.inventories)
412
target._fetch_uses_deltas = False
328
# XXX: This won't work in general, but for the dirstate format it does.
329
self.overrideAttr(target._format, '_fetch_uses_deltas', False)
413
330
target.fetch(source, revision_id='rev-one')
414
331
self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
415
target._fetch_order, True),
332
target._format._fetch_order, True),
416
333
self.find_get_record_stream(source.texts.calls))
417
334
self.assertEqual(('get_record_stream', [('rev-one',)],
418
target._fetch_order, True),
419
self.find_get_record_stream(source.inventories.calls))
335
target._format._fetch_order, True),
336
self.find_get_record_stream(source.inventories.calls, 2))
420
337
self.assertEqual(('get_record_stream', [('rev-one',)],
421
target._fetch_order, True),
338
target._format._fetch_order, True),
422
339
self.find_get_record_stream(source.revisions.calls))
423
340
# XXX: Signatures is special, and slightly broken. The
424
341
# standard item_keys_introduced_by actually does a lookup for every
430
347
signature_calls = source.signatures.calls[-1:]
431
348
self.assertEqual(('get_record_stream', [('rev-one',)],
432
target._fetch_order, True),
349
target._format._fetch_order, True),
433
350
self.find_get_record_stream(signature_calls))
352
def test_fetch_revisions_with_deltas_into_pack(self):
353
# See BUG #261339, dev versions of bzr could accidentally create deltas
354
# in revision texts in knit branches (when fetching from packs). So we
355
# ensure that *if* a knit repository has a delta in revisions, that it
356
# gets properly expanded back into a fulltext when stored in the pack
358
tree = self.make_branch_and_tree('source', format='dirstate')
359
target = self.make_repository('target', format='pack-0.92')
360
self.build_tree(['source/file'])
361
tree.set_root_id('root-id')
362
tree.add('file', 'file-id')
363
tree.commit('one', rev_id='rev-one')
364
# Hack the KVF for revisions so that it "accidentally" allows a delta
365
tree.branch.repository.revisions._max_delta_chain = 200
366
tree.commit('two', rev_id='rev-two')
367
source = tree.branch.repository
368
# Ensure that we stored a delta
370
self.addCleanup(source.unlock)
371
record = source.revisions.get_record_stream([('rev-two',)],
372
'unordered', False).next()
373
self.assertEqual('knit-delta-gz', record.storage_kind)
374
target.fetch(tree.branch.repository, revision_id='rev-two')
375
# The record should get expanded back to a fulltext
377
self.addCleanup(target.unlock)
378
record = target.revisions.get_record_stream([('rev-two',)],
379
'unordered', False).next()
380
self.assertEqual('knit-ft-gz', record.storage_kind)
382
def test_fetch_with_fallback_and_merge(self):
383
builder = self.make_branch_builder('source', format='pack-0.92')
384
builder.start_series()
395
# A & B are present in the base (stacked-on) repository, A-E are
396
# present in the source.
397
# This reproduces bug #304841
398
# We need a large enough inventory that total size of compressed deltas
399
# is shorter than the size of a compressed fulltext. We have to use
400
# random ids because otherwise the inventory fulltext compresses too
401
# well and the deltas get bigger.
403
('add', ('', 'TREE_ROOT', 'directory', None))]
405
fname = 'file%03d' % (i,)
406
fileid = '%s-%s' % (fname, osutils.rand_chars(64))
407
to_add.append(('add', (fname, fileid, 'file', 'content\n')))
408
builder.build_snapshot('A', None, to_add)
409
builder.build_snapshot('B', ['A'], [])
410
builder.build_snapshot('C', ['A'], [])
411
builder.build_snapshot('D', ['C'], [])
412
builder.build_snapshot('E', ['D'], [])
413
builder.build_snapshot('F', ['E', 'B'], [])
414
builder.finish_series()
415
source_branch = builder.get_branch()
416
source_branch.bzrdir.sprout('base', revision_id='B')
417
target_branch = self.make_branch('target', format='1.6')
418
target_branch.set_stacked_on_url('../base')
419
source = source_branch.repository
421
self.addCleanup(source.unlock)
422
source.inventories = versionedfile.OrderingVersionedFilesDecorator(
424
key_priority={('E',): 1, ('D',): 2, ('C',): 4,
426
# Ensure that the content is yielded in the proper order, and given as
428
records = [(record.key, record.storage_kind)
429
for record in source.inventories.get_record_stream(
430
[('D',), ('C',), ('E',), ('F',)], 'unordered', False)]
431
self.assertEqual([(('E',), 'knit-delta-gz'), (('D',), 'knit-delta-gz'),
432
(('F',), 'knit-delta-gz'), (('C',), 'knit-delta-gz')],
435
target_branch.lock_write()
436
self.addCleanup(target_branch.unlock)
437
target = target_branch.repository
438
target.fetch(source, revision_id='F')
439
# 'C' should be expanded to a fulltext, but D and E should still be
441
stream = target.inventories.get_record_stream(
442
[('C',), ('D',), ('E',), ('F',)],
444
kinds = dict((record.key, record.storage_kind) for record in stream)
445
self.assertEqual({('C',): 'knit-ft-gz', ('D',): 'knit-delta-gz',
446
('E',): 'knit-delta-gz', ('F',): 'knit-delta-gz'},
436
450
class Test1To2Fetch(TestCaseWithTransport):
437
451
"""Tests for Model1To2 failure modes"""
added
removed
bzrlib/tests/test_fetch.py
