1
# Copyright (C) 2005-2011 Canonical Ltd
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.
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.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23
from bzrlib.branch import Branch
24
from bzrlib.repofmt import knitrepo
25
from bzrlib.tests import TestCaseWithTransport
26
from bzrlib.tests.test_revision import make_branches
27
from bzrlib.upgrade import Convert
28
from bzrlib.workingtree import WorkingTree
30
# These tests are a bit old; please instead add new tests into
31
# per_interrepository/ so they'll run on all relevant
35
def has_revision(branch, revision_id):
36
return branch.repository.has_revision(revision_id)
38
def fetch_steps(self, br_a, br_b, writable_a):
39
"""A foreign test method for testing fetch locally and remotely."""
41
# TODO RBC 20060201 make this a repository test.
42
repo_b = br_b.repository
43
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
44
self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
45
self.assertEquals(len(br_b.revision_history()), 7)
46
br_b.fetch(br_a, br_a.revision_history()[2])
47
# branch.fetch is not supposed to alter the revision history
48
self.assertEquals(len(br_b.revision_history()), 7)
49
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
51
# fetching the next revision up in sample data copies one revision
52
br_b.fetch(br_a, br_a.revision_history()[3])
53
self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
54
self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
55
self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
57
# When a non-branch ancestor is missing, it should be unlisted...
58
# as its not reference from the inventory weave.
59
br_b4 = self.make_branch('br_4')
62
writable_a.fetch(br_b)
63
self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
64
self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
66
br_b2 = self.make_branch('br_b2')
68
self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
69
self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
70
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
72
br_a2 = self.make_branch('br_a2')
74
self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
75
self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
76
self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
78
br_a3 = self.make_branch('br_a3')
79
# pulling a branch with no revisions grabs nothing, regardless of
80
# whats in the inventory.
82
for revno in range(4):
84
br_a3.repository.has_revision(br_a.revision_history()[revno]))
85
br_a3.fetch(br_a2, br_a.revision_history()[2])
86
# pull the 3 revisions introduced by a@u-0-3
87
br_a3.fetch(br_a2, br_a.revision_history()[3])
88
# NoSuchRevision should be raised if the branch is missing the revision
90
self.assertRaises(errors.NoSuchRevision, br_a3.fetch, br_a2, 'pizza')
92
# TODO: Test trying to fetch from a branch that points to a revision not
93
# actually present in its repository. Not every branch format allows you
94
# to directly point to such revisions, so it's a bit complicated to
95
# construct. One way would be to uncommit and gc the revision, but not
96
# every branch supports that. -- mbp 20070814
98
#TODO: test that fetch correctly does reweaving when needed. RBC 20051008
99
# Note that this means - updating the weave when ghosts are filled in to
100
# add the right parents.
103
class TestFetch(TestCaseWithTransport):
105
def test_fetch(self):
106
#highest indices a: 5, b: 7
107
br_a, br_b = make_branches(self, format='dirstate-tags')
108
fetch_steps(self, br_a, br_b, br_a)
110
def test_fetch_self(self):
111
wt = self.make_branch_and_tree('br')
112
wt.branch.fetch(wt.branch)
114
def test_fetch_root_knit(self):
115
"""Ensure that knit2.fetch() updates the root knit
117
This tests the case where the root has a new revision, but there are no
118
corresponding filename, parent, contents or other changes.
120
knit1_format = bzrdir.BzrDirMetaFormat1()
121
knit1_format.repository_format = knitrepo.RepositoryFormatKnit1()
122
knit2_format = bzrdir.BzrDirMetaFormat1()
123
knit2_format.repository_format = knitrepo.RepositoryFormatKnit3()
124
# we start with a knit1 repository because that causes the
125
# root revision to change for each commit, even though the content,
126
# parent, name, and other attributes are unchanged.
127
tree = self.make_branch_and_tree('tree', knit1_format)
128
tree.set_root_id('tree-root')
129
tree.commit('rev1', rev_id='rev1')
130
tree.commit('rev2', rev_id='rev2')
132
# Now we convert it to a knit2 repository so that it has a root knit
133
Convert(tree.basedir, knit2_format)
134
tree = WorkingTree.open(tree.basedir)
135
branch = self.make_branch('branch', format=knit2_format)
136
branch.pull(tree.branch, stop_revision='rev1')
137
repo = branch.repository
140
# Make sure fetch retrieved only what we requested
141
self.assertEqual({('tree-root', 'rev1'):()},
142
repo.texts.get_parent_map(
143
[('tree-root', 'rev1'), ('tree-root', 'rev2')]))
146
branch.pull(tree.branch)
147
# Make sure that the next revision in the root knit was retrieved,
148
# even though the text, name, parent_id, etc., were unchanged.
151
# Make sure fetch retrieved only what we requested
152
self.assertEqual({('tree-root', 'rev2'):(('tree-root', 'rev1'),)},
153
repo.texts.get_parent_map([('tree-root', 'rev2')]))
157
def test_fetch_incompatible(self):
158
knit_tree = self.make_branch_and_tree('knit', format='knit')
159
knit3_tree = self.make_branch_and_tree('knit3',
160
format='dirstate-with-subtree')
161
knit3_tree.commit('blah')
162
e = self.assertRaises(errors.IncompatibleRepositories,
163
knit_tree.branch.fetch, knit3_tree.branch)
164
self.assertContainsRe(str(e),
165
r"(?m).*/knit.*\nis not compatible with\n.*/knit3/.*\n"
166
r"different rich-root support")
169
class TestMergeFetch(TestCaseWithTransport):
171
def test_merge_fetches_unrelated(self):
172
"""Merge brings across history from unrelated source"""
173
wt1 = self.make_branch_and_tree('br1')
175
wt1.commit(message='rev 1-1', rev_id='1-1')
176
wt1.commit(message='rev 1-2', rev_id='1-2')
177
wt2 = self.make_branch_and_tree('br2')
179
wt2.commit(message='rev 2-1', rev_id='2-1')
180
wt2.merge_from_branch(br1, from_revision='null:')
181
self._check_revs_present(br2)
183
def test_merge_fetches(self):
184
"""Merge brings across history from source"""
185
wt1 = self.make_branch_and_tree('br1')
187
wt1.commit(message='rev 1-1', rev_id='1-1')
188
dir_2 = br1.bzrdir.sprout('br2')
189
br2 = dir_2.open_branch()
190
wt1.commit(message='rev 1-2', rev_id='1-2')
191
wt2 = dir_2.open_workingtree()
192
wt2.commit(message='rev 2-1', rev_id='2-1')
193
wt2.merge_from_branch(br1)
194
self._check_revs_present(br2)
196
def _check_revs_present(self, br2):
197
for rev_id in '1-1', '1-2', '2-1':
198
self.assertTrue(br2.repository.has_revision(rev_id))
199
rev = br2.repository.get_revision(rev_id)
200
self.assertEqual(rev.revision_id, rev_id)
201
self.assertTrue(br2.repository.get_inventory(rev_id))
204
class TestMergeFileHistory(TestCaseWithTransport):
207
super(TestMergeFileHistory, self).setUp()
208
wt1 = self.make_branch_and_tree('br1')
210
self.build_tree_contents([('br1/file', 'original contents\n')])
211
wt1.add('file', 'this-file-id')
212
wt1.commit(message='rev 1-1', rev_id='1-1')
213
dir_2 = br1.bzrdir.sprout('br2')
214
br2 = dir_2.open_branch()
215
wt2 = dir_2.open_workingtree()
216
self.build_tree_contents([('br1/file', 'original from 1\n')])
217
wt1.commit(message='rev 1-2', rev_id='1-2')
218
self.build_tree_contents([('br1/file', 'agreement\n')])
219
wt1.commit(message='rev 1-3', rev_id='1-3')
220
self.build_tree_contents([('br2/file', 'contents in 2\n')])
221
wt2.commit(message='rev 2-1', rev_id='2-1')
222
self.build_tree_contents([('br2/file', 'agreement\n')])
223
wt2.commit(message='rev 2-2', rev_id='2-2')
225
def test_merge_fetches_file_history(self):
226
"""Merge brings across file histories"""
227
br2 = Branch.open('br2')
228
br1 = Branch.open('br1')
229
wt2 = WorkingTree.open('br2').merge_from_branch(br1)
231
self.addCleanup(br2.unlock)
232
for rev_id, text in [('1-2', 'original from 1\n'),
233
('1-3', 'agreement\n'),
234
('2-1', 'contents in 2\n'),
235
('2-2', 'agreement\n')]:
236
self.assertEqualDiff(
237
br2.repository.revision_tree(
238
rev_id).get_file_text('this-file-id'), text)
241
class TestKnitToPackFetch(TestCaseWithTransport):
243
def find_get_record_stream(self, calls, expected_count=1):
244
"""In a list of calls, find the last 'get_record_stream'.
246
:param expected_count: The number of calls we should exepect to find.
247
If a different number is found, an assertion is raised.
249
get_record_call = None
252
if call[0] == 'get_record_stream':
254
get_record_call = call
255
self.assertEqual(expected_count, call_count)
256
return get_record_call
258
def test_fetch_with_deltas_no_delta_closure(self):
259
tree = self.make_branch_and_tree('source', format='dirstate')
260
target = self.make_repository('target', format='pack-0.92')
261
self.build_tree(['source/file'])
262
tree.set_root_id('root-id')
263
tree.add('file', 'file-id')
264
tree.commit('one', rev_id='rev-one')
265
source = tree.branch.repository
266
source.texts = versionedfile.RecordingVersionedFilesDecorator(
268
source.signatures = versionedfile.RecordingVersionedFilesDecorator(
270
source.revisions = versionedfile.RecordingVersionedFilesDecorator(
272
source.inventories = versionedfile.RecordingVersionedFilesDecorator(
275
self.assertTrue(target._format._fetch_uses_deltas)
276
target.fetch(source, revision_id='rev-one')
277
self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
278
target._format._fetch_order, False),
279
self.find_get_record_stream(source.texts.calls))
280
self.assertEqual(('get_record_stream', [('rev-one',)],
281
target._format._fetch_order, False),
282
self.find_get_record_stream(source.inventories.calls, 2))
283
self.assertEqual(('get_record_stream', [('rev-one',)],
284
target._format._fetch_order, False),
285
self.find_get_record_stream(source.revisions.calls))
286
# XXX: Signatures is special, and slightly broken. The
287
# standard item_keys_introduced_by actually does a lookup for every
288
# signature to see if it exists, rather than waiting to do them all at
289
# once at the end. The fetch code then does an all-at-once and just
290
# allows for some of them to be missing.
291
# So we know there will be extra calls, but the *last* one is the one
293
signature_calls = source.signatures.calls[-1:]
294
self.assertEqual(('get_record_stream', [('rev-one',)],
295
target._format._fetch_order, False),
296
self.find_get_record_stream(signature_calls))
298
def test_fetch_no_deltas_with_delta_closure(self):
299
tree = self.make_branch_and_tree('source', format='dirstate')
300
target = self.make_repository('target', format='pack-0.92')
301
self.build_tree(['source/file'])
302
tree.set_root_id('root-id')
303
tree.add('file', 'file-id')
304
tree.commit('one', rev_id='rev-one')
305
source = tree.branch.repository
306
source.texts = versionedfile.RecordingVersionedFilesDecorator(
308
source.signatures = versionedfile.RecordingVersionedFilesDecorator(
310
source.revisions = versionedfile.RecordingVersionedFilesDecorator(
312
source.inventories = versionedfile.RecordingVersionedFilesDecorator(
314
# XXX: This won't work in general, but for the dirstate format it does.
315
self.overrideAttr(target._format, '_fetch_uses_deltas', False)
316
target.fetch(source, revision_id='rev-one')
317
self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
318
target._format._fetch_order, True),
319
self.find_get_record_stream(source.texts.calls))
320
self.assertEqual(('get_record_stream', [('rev-one',)],
321
target._format._fetch_order, True),
322
self.find_get_record_stream(source.inventories.calls, 2))
323
self.assertEqual(('get_record_stream', [('rev-one',)],
324
target._format._fetch_order, True),
325
self.find_get_record_stream(source.revisions.calls))
326
# XXX: Signatures is special, and slightly broken. The
327
# standard item_keys_introduced_by actually does a lookup for every
328
# signature to see if it exists, rather than waiting to do them all at
329
# once at the end. The fetch code then does an all-at-once and just
330
# allows for some of them to be missing.
331
# So we know there will be extra calls, but the *last* one is the one
333
signature_calls = source.signatures.calls[-1:]
334
self.assertEqual(('get_record_stream', [('rev-one',)],
335
target._format._fetch_order, True),
336
self.find_get_record_stream(signature_calls))
338
def test_fetch_revisions_with_deltas_into_pack(self):
339
# See BUG #261339, dev versions of bzr could accidentally create deltas
340
# in revision texts in knit branches (when fetching from packs). So we
341
# ensure that *if* a knit repository has a delta in revisions, that it
342
# gets properly expanded back into a fulltext when stored in the pack
344
tree = self.make_branch_and_tree('source', format='dirstate')
345
target = self.make_repository('target', format='pack-0.92')
346
self.build_tree(['source/file'])
347
tree.set_root_id('root-id')
348
tree.add('file', 'file-id')
349
tree.commit('one', rev_id='rev-one')
350
# Hack the KVF for revisions so that it "accidentally" allows a delta
351
tree.branch.repository.revisions._max_delta_chain = 200
352
tree.commit('two', rev_id='rev-two')
353
source = tree.branch.repository
354
# Ensure that we stored a delta
356
self.addCleanup(source.unlock)
357
record = source.revisions.get_record_stream([('rev-two',)],
358
'unordered', False).next()
359
self.assertEqual('knit-delta-gz', record.storage_kind)
360
target.fetch(tree.branch.repository, revision_id='rev-two')
361
# The record should get expanded back to a fulltext
363
self.addCleanup(target.unlock)
364
record = target.revisions.get_record_stream([('rev-two',)],
365
'unordered', False).next()
366
self.assertEqual('knit-ft-gz', record.storage_kind)
368
def test_fetch_with_fallback_and_merge(self):
369
builder = self.make_branch_builder('source', format='pack-0.92')
370
builder.start_series()
381
# A & B are present in the base (stacked-on) repository, A-E are
382
# present in the source.
383
# This reproduces bug #304841
384
# We need a large enough inventory that total size of compressed deltas
385
# is shorter than the size of a compressed fulltext. We have to use
386
# random ids because otherwise the inventory fulltext compresses too
387
# well and the deltas get bigger.
389
('add', ('', 'TREE_ROOT', 'directory', None))]
391
fname = 'file%03d' % (i,)
392
fileid = '%s-%s' % (fname, osutils.rand_chars(64))
393
to_add.append(('add', (fname, fileid, 'file', 'content\n')))
394
builder.build_snapshot('A', None, to_add)
395
builder.build_snapshot('B', ['A'], [])
396
builder.build_snapshot('C', ['A'], [])
397
builder.build_snapshot('D', ['C'], [])
398
builder.build_snapshot('E', ['D'], [])
399
builder.build_snapshot('F', ['E', 'B'], [])
400
builder.finish_series()
401
source_branch = builder.get_branch()
402
source_branch.bzrdir.sprout('base', revision_id='B')
403
target_branch = self.make_branch('target', format='1.6')
404
target_branch.set_stacked_on_url('../base')
405
source = source_branch.repository
407
self.addCleanup(source.unlock)
408
source.inventories = versionedfile.OrderingVersionedFilesDecorator(
410
key_priority={('E',): 1, ('D',): 2, ('C',): 4,
412
# Ensure that the content is yielded in the proper order, and given as
414
records = [(record.key, record.storage_kind)
415
for record in source.inventories.get_record_stream(
416
[('D',), ('C',), ('E',), ('F',)], 'unordered', False)]
417
self.assertEqual([(('E',), 'knit-delta-gz'), (('D',), 'knit-delta-gz'),
418
(('F',), 'knit-delta-gz'), (('C',), 'knit-delta-gz')],
421
target_branch.lock_write()
422
self.addCleanup(target_branch.unlock)
423
target = target_branch.repository
424
target.fetch(source, revision_id='F')
425
# 'C' should be expanded to a fulltext, but D and E should still be
427
stream = target.inventories.get_record_stream(
428
[('C',), ('D',), ('E',), ('F',)],
430
kinds = dict((record.key, record.storage_kind) for record in stream)
431
self.assertEqual({('C',): 'knit-ft-gz', ('D',): 'knit-delta-gz',
432
('E',): 'knit-delta-gz', ('F',): 'knit-delta-gz'},
436
class Test1To2Fetch(TestCaseWithTransport):
437
"""Tests for Model1To2 failure modes"""
439
def make_tree_and_repo(self):
440
self.tree = self.make_branch_and_tree('tree', format='pack-0.92')
441
self.repo = self.make_repository('rich-repo', format='rich-root-pack')
442
self.repo.lock_write()
443
self.addCleanup(self.repo.unlock)
445
def do_fetch_order_test(self, first, second):
446
"""Test that fetch works no matter what the set order of revision is.
448
This test depends on the order of items in a set, which is
449
implementation-dependant, so we test A, B and then B, A.
451
self.make_tree_and_repo()
452
self.tree.commit('Commit 1', rev_id=first)
453
self.tree.commit('Commit 2', rev_id=second)
454
self.repo.fetch(self.tree.branch.repository, second)
456
def test_fetch_order_AB(self):
457
"""See do_fetch_order_test"""
458
self.do_fetch_order_test('A', 'B')
460
def test_fetch_order_BA(self):
461
"""See do_fetch_order_test"""
462
self.do_fetch_order_test('B', 'A')
464
def get_parents(self, file_id, revision_id):
465
self.repo.lock_read()
467
parent_map = self.repo.texts.get_parent_map([(file_id, revision_id)])
468
return parent_map[(file_id, revision_id)]
472
def test_fetch_ghosts(self):
473
self.make_tree_and_repo()
474
self.tree.commit('first commit', rev_id='left-parent')
475
self.tree.add_parent_tree_id('ghost-parent')
476
fork = self.tree.bzrdir.sprout('fork', 'null:').open_workingtree()
477
fork.commit('not a ghost', rev_id='not-ghost-parent')
478
self.tree.branch.repository.fetch(fork.branch.repository,
480
self.tree.add_parent_tree_id('not-ghost-parent')
481
self.tree.commit('second commit', rev_id='second-id')
482
self.repo.fetch(self.tree.branch.repository, 'second-id')
483
root_id = self.tree.get_root_id()
485
((root_id, 'left-parent'), (root_id, 'not-ghost-parent')),
486
self.get_parents(root_id, 'second-id'))
488
def make_two_commits(self, change_root, fetch_twice):
489
self.make_tree_and_repo()
490
self.tree.commit('first commit', rev_id='first-id')
492
self.tree.set_root_id('unique-id')
493
self.tree.commit('second commit', rev_id='second-id')
495
self.repo.fetch(self.tree.branch.repository, 'first-id')
496
self.repo.fetch(self.tree.branch.repository, 'second-id')
498
def test_fetch_changed_root(self):
499
self.make_two_commits(change_root=True, fetch_twice=False)
500
self.assertEqual((), self.get_parents('unique-id', 'second-id'))
502
def test_two_fetch_changed_root(self):
503
self.make_two_commits(change_root=True, fetch_twice=True)
504
self.assertEqual((), self.get_parents('unique-id', 'second-id'))
506
def test_two_fetches(self):
507
self.make_two_commits(change_root=False, fetch_twice=True)
508
self.assertEqual((('TREE_ROOT', 'first-id'),),
509
self.get_parents('TREE_ROOT', 'second-id'))
added
removed
bzrlib/tests/test_fetch.py
