1
# Copyright (C) 2005-2011, 2016 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
20
revision as _mod_revision,
26
from ..branch import Branch
27
from ..bzr import knitrepo
28
from . import TestCaseWithTransport
29
from .test_revision import make_branches
30
from ..upgrade import Convert
31
from ..workingtree import WorkingTree
33
# These tests are a bit old; please instead add new tests into
34
# per_interrepository/ so they'll run on all relevant
38
def has_revision(branch, revision_id):
39
return branch.repository.has_revision(revision_id)
42
def revision_history(branch):
45
graph = branch.repository.get_graph()
46
history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
47
[_mod_revision.NULL_REVISION]))
54
def fetch_steps(self, br_a, br_b, writable_a):
55
"""A foreign test method for testing fetch locally and remotely."""
57
# TODO RBC 20060201 make this a repository test.
58
repo_b = br_b.repository
59
self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
60
self.assertTrue(repo_b.has_revision(revision_history(br_a)[2]))
61
self.assertEqual(len(revision_history(br_b)), 7)
62
br_b.fetch(br_a, revision_history(br_a)[2])
63
# branch.fetch is not supposed to alter the revision history
64
self.assertEqual(len(revision_history(br_b)), 7)
65
self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
67
# fetching the next revision up in sample data copies one revision
68
br_b.fetch(br_a, revision_history(br_a)[3])
69
self.assertTrue(repo_b.has_revision(revision_history(br_a)[3]))
70
self.assertFalse(has_revision(br_a, revision_history(br_b)[6]))
71
self.assertTrue(br_a.repository.has_revision(revision_history(br_b)[5]))
73
# When a non-branch ancestor is missing, it should be unlisted...
74
# as its not reference from the inventory weave.
75
br_b4 = self.make_branch('br_4')
78
writable_a.fetch(br_b)
79
self.assertTrue(has_revision(br_a, revision_history(br_b)[3]))
80
self.assertTrue(has_revision(br_a, revision_history(br_b)[4]))
82
br_b2 = self.make_branch('br_b2')
84
self.assertTrue(has_revision(br_b2, revision_history(br_b)[4]))
85
self.assertTrue(has_revision(br_b2, revision_history(br_a)[2]))
86
self.assertFalse(has_revision(br_b2, revision_history(br_a)[3]))
88
br_a2 = self.make_branch('br_a2')
90
self.assertTrue(has_revision(br_a2, revision_history(br_b)[4]))
91
self.assertTrue(has_revision(br_a2, revision_history(br_a)[3]))
92
self.assertTrue(has_revision(br_a2, revision_history(br_a)[2]))
94
br_a3 = self.make_branch('br_a3')
95
# pulling a branch with no revisions grabs nothing, regardless of
96
# whats in the inventory.
98
for revno in range(4):
100
br_a3.repository.has_revision(revision_history(br_a)[revno]))
101
br_a3.fetch(br_a2, revision_history(br_a)[2])
102
# pull the 3 revisions introduced by a@u-0-3
103
br_a3.fetch(br_a2, revision_history(br_a)[3])
104
# NoSuchRevision should be raised if the branch is missing the revision
105
# that was requested.
106
self.assertRaises(errors.NoSuchRevision, br_a3.fetch, br_a2, 'pizza')
108
# TODO: Test trying to fetch from a branch that points to a revision not
109
# actually present in its repository. Not every branch format allows you
110
# to directly point to such revisions, so it's a bit complicated to
111
# construct. One way would be to uncommit and gc the revision, but not
112
# every branch supports that. -- mbp 20070814
114
# TODO: test that fetch correctly does reweaving when needed. RBC 20051008
115
# Note that this means - updating the weave when ghosts are filled in to
116
# add the right parents.
119
class TestFetch(TestCaseWithTransport):
121
def test_fetch(self):
122
# highest indices a: 5, b: 7
123
br_a, br_b = make_branches(self, format='dirstate-tags')
124
fetch_steps(self, br_a, br_b, br_a)
126
def test_fetch_self(self):
127
wt = self.make_branch_and_tree('br')
128
wt.branch.fetch(wt.branch)
130
def test_fetch_root_knit(self):
131
"""Ensure that knit2.fetch() updates the root knit
133
This tests the case where the root has a new revision, but there are no
134
corresponding filename, parent, contents or other changes.
136
knit1_format = bzrdir.BzrDirMetaFormat1()
137
knit1_format.repository_format = knitrepo.RepositoryFormatKnit1()
138
knit2_format = bzrdir.BzrDirMetaFormat1()
139
knit2_format.repository_format = knitrepo.RepositoryFormatKnit3()
140
# we start with a knit1 repository because that causes the
141
# root revision to change for each commit, even though the content,
142
# parent, name, and other attributes are unchanged.
143
tree = self.make_branch_and_tree('tree', knit1_format)
144
tree.set_root_id(b'tree-root')
145
tree.commit('rev1', rev_id=b'rev1')
146
tree.commit('rev2', rev_id=b'rev2')
148
# Now we convert it to a knit2 repository so that it has a root knit
149
Convert(tree.basedir, knit2_format)
150
tree = WorkingTree.open(tree.basedir)
151
branch = self.make_branch('branch', format=knit2_format)
152
branch.pull(tree.branch, stop_revision=b'rev1')
153
repo = branch.repository
156
# Make sure fetch retrieved only what we requested
157
self.assertEqual({(b'tree-root', b'rev1'): ()},
158
repo.texts.get_parent_map(
159
[(b'tree-root', b'rev1'), (b'tree-root', b'rev2')]))
162
branch.pull(tree.branch)
163
# Make sure that the next revision in the root knit was retrieved,
164
# even though the text, name, parent_id, etc., were unchanged.
167
# Make sure fetch retrieved only what we requested
168
self.assertEqual({(b'tree-root', b'rev2'): ((b'tree-root', b'rev1'),)},
169
repo.texts.get_parent_map([(b'tree-root', b'rev2')]))
173
def test_fetch_incompatible(self):
174
knit_tree = self.make_branch_and_tree('knit', format='knit')
175
knit3_tree = self.make_branch_and_tree('knit3',
176
format='dirstate-with-subtree')
177
knit3_tree.commit('blah')
178
e = self.assertRaises(errors.IncompatibleRepositories,
179
knit_tree.branch.fetch, knit3_tree.branch)
180
self.assertContainsRe(str(e),
181
r"(?m).*/knit.*\nis not compatible with\n.*/knit3/.*\n"
182
r"different rich-root support")
185
class TestMergeFetch(TestCaseWithTransport):
187
def test_merge_fetches_unrelated(self):
188
"""Merge brings across history from unrelated source"""
189
wt1 = self.make_branch_and_tree('br1')
191
wt1.commit(message='rev 1-1', rev_id=b'1-1')
192
wt1.commit(message='rev 1-2', rev_id=b'1-2')
193
wt2 = self.make_branch_and_tree('br2')
195
wt2.commit(message='rev 2-1', rev_id=b'2-1')
196
wt2.merge_from_branch(br1, from_revision=b'null:')
197
self._check_revs_present(br2)
199
def test_merge_fetches(self):
200
"""Merge brings across history from source"""
201
wt1 = self.make_branch_and_tree('br1')
203
wt1.commit(message='rev 1-1', rev_id=b'1-1')
204
dir_2 = br1.controldir.sprout('br2')
205
br2 = dir_2.open_branch()
206
wt1.commit(message='rev 1-2', rev_id=b'1-2')
207
wt2 = dir_2.open_workingtree()
208
wt2.commit(message='rev 2-1', rev_id=b'2-1')
209
wt2.merge_from_branch(br1)
210
self._check_revs_present(br2)
212
def _check_revs_present(self, br2):
213
for rev_id in [b'1-1', b'1-2', b'2-1']:
214
self.assertTrue(br2.repository.has_revision(rev_id))
215
rev = br2.repository.get_revision(rev_id)
216
self.assertEqual(rev.revision_id, rev_id)
217
self.assertTrue(br2.repository.get_inventory(rev_id))
220
class TestMergeFileHistory(TestCaseWithTransport):
223
super(TestMergeFileHistory, self).setUp()
224
wt1 = self.make_branch_and_tree('br1')
226
self.build_tree_contents([('br1/file', b'original contents\n')])
227
wt1.add('file', b'this-file-id')
228
wt1.commit(message='rev 1-1', rev_id=b'1-1')
229
dir_2 = br1.controldir.sprout('br2')
230
br2 = dir_2.open_branch()
231
wt2 = dir_2.open_workingtree()
232
self.build_tree_contents([('br1/file', b'original from 1\n')])
233
wt1.commit(message='rev 1-2', rev_id=b'1-2')
234
self.build_tree_contents([('br1/file', b'agreement\n')])
235
wt1.commit(message='rev 1-3', rev_id=b'1-3')
236
self.build_tree_contents([('br2/file', b'contents in 2\n')])
237
wt2.commit(message='rev 2-1', rev_id=b'2-1')
238
self.build_tree_contents([('br2/file', b'agreement\n')])
239
wt2.commit(message='rev 2-2', rev_id=b'2-2')
241
def test_merge_fetches_file_history(self):
242
"""Merge brings across file histories"""
243
br2 = Branch.open('br2')
244
br1 = Branch.open('br1')
245
wt2 = WorkingTree.open('br2').merge_from_branch(br1)
247
self.addCleanup(br2.unlock)
248
for rev_id, text in [(b'1-2', b'original from 1\n'),
249
(b'1-3', b'agreement\n'),
250
(b'2-1', b'contents in 2\n'),
251
(b'2-2', b'agreement\n')]:
252
self.assertEqualDiff(
253
br2.repository.revision_tree(
254
rev_id).get_file_text('file'), text)
257
class TestKnitToPackFetch(TestCaseWithTransport):
259
def find_get_record_stream(self, calls, expected_count=1):
260
"""In a list of calls, find the last 'get_record_stream'.
262
:param expected_count: The number of calls we should exepect to find.
263
If a different number is found, an assertion is raised.
265
get_record_call = None
268
if call[0] == 'get_record_stream':
270
get_record_call = call
271
self.assertEqual(expected_count, call_count)
272
return get_record_call
274
def test_fetch_with_deltas_no_delta_closure(self):
275
tree = self.make_branch_and_tree('source', format='dirstate')
276
target = self.make_repository('target', format='pack-0.92')
277
self.build_tree(['source/file'])
278
tree.set_root_id(b'root-id')
279
tree.add('file', b'file-id')
280
tree.commit('one', rev_id=b'rev-one')
281
source = tree.branch.repository
282
source.texts = versionedfile.RecordingVersionedFilesDecorator(
284
source.signatures = versionedfile.RecordingVersionedFilesDecorator(
286
source.revisions = versionedfile.RecordingVersionedFilesDecorator(
288
source.inventories = versionedfile.RecordingVersionedFilesDecorator(
291
self.assertTrue(target._format._fetch_uses_deltas)
292
target.fetch(source, revision_id=b'rev-one')
293
self.assertEqual(('get_record_stream', [(b'file-id', b'rev-one')],
294
target._format._fetch_order, False),
295
self.find_get_record_stream(source.texts.calls))
296
self.assertEqual(('get_record_stream', [(b'rev-one',)],
297
target._format._fetch_order, False),
298
self.find_get_record_stream(source.inventories.calls, 2))
299
self.assertEqual(('get_record_stream', [(b'rev-one',)],
300
target._format._fetch_order, False),
301
self.find_get_record_stream(source.revisions.calls))
302
# XXX: Signatures is special, and slightly broken. The
303
# standard item_keys_introduced_by actually does a lookup for every
304
# signature to see if it exists, rather than waiting to do them all at
305
# once at the end. The fetch code then does an all-at-once and just
306
# allows for some of them to be missing.
307
# So we know there will be extra calls, but the *last* one is the one
309
signature_calls = source.signatures.calls[-1:]
310
self.assertEqual(('get_record_stream', [(b'rev-one',)],
311
target._format._fetch_order, False),
312
self.find_get_record_stream(signature_calls))
314
def test_fetch_no_deltas_with_delta_closure(self):
315
tree = self.make_branch_and_tree('source', format='dirstate')
316
target = self.make_repository('target', format='pack-0.92')
317
self.build_tree(['source/file'])
318
tree.set_root_id(b'root-id')
319
tree.add('file', b'file-id')
320
tree.commit('one', rev_id=b'rev-one')
321
source = tree.branch.repository
322
source.texts = versionedfile.RecordingVersionedFilesDecorator(
324
source.signatures = versionedfile.RecordingVersionedFilesDecorator(
326
source.revisions = versionedfile.RecordingVersionedFilesDecorator(
328
source.inventories = versionedfile.RecordingVersionedFilesDecorator(
330
# XXX: This won't work in general, but for the dirstate format it does.
331
self.overrideAttr(target._format, '_fetch_uses_deltas', False)
332
target.fetch(source, revision_id=b'rev-one')
333
self.assertEqual(('get_record_stream', [(b'file-id', b'rev-one')],
334
target._format._fetch_order, True),
335
self.find_get_record_stream(source.texts.calls))
336
self.assertEqual(('get_record_stream', [(b'rev-one',)],
337
target._format._fetch_order, True),
338
self.find_get_record_stream(source.inventories.calls, 2))
339
self.assertEqual(('get_record_stream', [(b'rev-one',)],
340
target._format._fetch_order, True),
341
self.find_get_record_stream(source.revisions.calls))
342
# XXX: Signatures is special, and slightly broken. The
343
# standard item_keys_introduced_by actually does a lookup for every
344
# signature to see if it exists, rather than waiting to do them all at
345
# once at the end. The fetch code then does an all-at-once and just
346
# allows for some of them to be missing.
347
# So we know there will be extra calls, but the *last* one is the one
349
signature_calls = source.signatures.calls[-1:]
350
self.assertEqual(('get_record_stream', [(b'rev-one',)],
351
target._format._fetch_order, True),
352
self.find_get_record_stream(signature_calls))
354
def test_fetch_revisions_with_deltas_into_pack(self):
355
# See BUG #261339, dev versions of bzr could accidentally create deltas
356
# in revision texts in knit branches (when fetching from packs). So we
357
# ensure that *if* a knit repository has a delta in revisions, that it
358
# gets properly expanded back into a fulltext when stored in the pack
360
tree = self.make_branch_and_tree('source', format='dirstate')
361
target = self.make_repository('target', format='pack-0.92')
362
self.build_tree(['source/file'])
363
tree.set_root_id(b'root-id')
364
tree.add('file', b'file-id')
365
tree.commit('one', rev_id=b'rev-one')
366
# Hack the KVF for revisions so that it "accidentally" allows a delta
367
tree.branch.repository.revisions._max_delta_chain = 200
368
tree.commit('two', rev_id=b'rev-two')
369
source = tree.branch.repository
370
# Ensure that we stored a delta
372
self.addCleanup(source.unlock)
373
record = next(source.revisions.get_record_stream([(b'rev-two',)],
375
self.assertEqual('knit-delta-gz', record.storage_kind)
376
target.fetch(tree.branch.repository, revision_id=b'rev-two')
377
# The record should get expanded back to a fulltext
379
self.addCleanup(target.unlock)
380
record = next(target.revisions.get_record_stream([(b'rev-two',)],
382
self.assertEqual('knit-ft-gz', record.storage_kind)
384
def test_fetch_with_fallback_and_merge(self):
385
builder = self.make_branch_builder('source', format='pack-0.92')
386
builder.start_series()
397
# A & B are present in the base (stacked-on) repository, A-E are
398
# present in the source.
399
# This reproduces bug #304841
400
# We need a large enough inventory that total size of compressed deltas
401
# is shorter than the size of a compressed fulltext. We have to use
402
# random ids because otherwise the inventory fulltext compresses too
403
# well and the deltas get bigger.
405
('add', ('', b'TREE_ROOT', 'directory', None))]
407
fname = 'file%03d' % (i,)
409
(fname, osutils.rand_chars(64))).encode('ascii')
410
to_add.append(('add', (fname, fileid, 'file', b'content\n')))
411
builder.build_snapshot(None, to_add, revision_id=b'A')
412
builder.build_snapshot([b'A'], [], revision_id=b'B')
413
builder.build_snapshot([b'A'], [], revision_id=b'C')
414
builder.build_snapshot([b'C'], [], revision_id=b'D')
415
builder.build_snapshot([b'D'], [], revision_id=b'E')
416
builder.build_snapshot([b'E', b'B'], [], revision_id=b'F')
417
builder.finish_series()
418
source_branch = builder.get_branch()
419
source_branch.controldir.sprout('base', revision_id=b'B')
420
target_branch = self.make_branch('target', format='1.6')
421
target_branch.set_stacked_on_url('../base')
422
source = source_branch.repository
424
self.addCleanup(source.unlock)
425
source.inventories = versionedfile.OrderingVersionedFilesDecorator(
427
key_priority={(b'E',): 1, (b'D',): 2, (b'C',): 4,
429
# Ensure that the content is yielded in the proper order, and given as
431
records = [(record.key, record.storage_kind)
432
for record in source.inventories.get_record_stream(
433
[(b'D',), (b'C',), (b'E',), (b'F',)], 'unordered', False)]
434
self.assertEqual([((b'E',), 'knit-delta-gz'), ((b'D',), 'knit-delta-gz'),
435
((b'F',), 'knit-delta-gz'), ((b'C',), 'knit-delta-gz')],
438
target_branch.lock_write()
439
self.addCleanup(target_branch.unlock)
440
target = target_branch.repository
441
target.fetch(source, revision_id=b'F')
442
# 'C' should be expanded to a fulltext, but D and E should still be
444
stream = target.inventories.get_record_stream(
445
[(b'C',), (b'D',), (b'E',), (b'F',)],
447
kinds = dict((record.key, record.storage_kind) for record in stream)
448
self.assertEqual({(b'C',): 'knit-ft-gz', (b'D',): 'knit-delta-gz',
449
(b'E',): 'knit-delta-gz', (b'F',): 'knit-delta-gz'},
453
class Test1To2Fetch(TestCaseWithTransport):
454
"""Tests for Model1To2 failure modes"""
456
def make_tree_and_repo(self):
457
self.tree = self.make_branch_and_tree('tree', format='pack-0.92')
458
self.repo = self.make_repository('rich-repo', format='rich-root-pack')
459
self.repo.lock_write()
460
self.addCleanup(self.repo.unlock)
462
def do_fetch_order_test(self, first, second):
463
"""Test that fetch works no matter what the set order of revision is.
465
This test depends on the order of items in a set, which is
466
implementation-dependant, so we test A, B and then B, A.
468
self.make_tree_and_repo()
469
self.tree.commit('Commit 1', rev_id=first)
470
self.tree.commit('Commit 2', rev_id=second)
471
self.repo.fetch(self.tree.branch.repository, second)
473
def test_fetch_order_AB(self):
474
"""See do_fetch_order_test"""
475
self.do_fetch_order_test(b'A', b'B')
477
def test_fetch_order_BA(self):
478
"""See do_fetch_order_test"""
479
self.do_fetch_order_test(b'B', b'A')
481
def get_parents(self, file_id, revision_id):
482
self.repo.lock_read()
484
parent_map = self.repo.texts.get_parent_map(
485
[(file_id, revision_id)])
486
return parent_map[(file_id, revision_id)]
490
def test_fetch_ghosts(self):
491
self.make_tree_and_repo()
492
self.tree.commit('first commit', rev_id=b'left-parent')
493
self.tree.add_parent_tree_id(b'ghost-parent')
494
fork = self.tree.controldir.sprout('fork', b'null:').open_workingtree()
495
fork.commit('not a ghost', rev_id=b'not-ghost-parent')
496
self.tree.branch.repository.fetch(fork.branch.repository,
498
self.tree.add_parent_tree_id(b'not-ghost-parent')
499
self.tree.commit('second commit', rev_id=b'second-id')
500
self.repo.fetch(self.tree.branch.repository, b'second-id')
501
root_id = self.tree.path2id('')
503
((root_id, b'left-parent'), (root_id, b'not-ghost-parent')),
504
self.get_parents(root_id, b'second-id'))
506
def make_two_commits(self, change_root, fetch_twice):
507
self.make_tree_and_repo()
508
self.tree.commit('first commit', rev_id=b'first-id')
510
self.tree.set_root_id(b'unique-id')
511
self.tree.commit('second commit', rev_id=b'second-id')
513
self.repo.fetch(self.tree.branch.repository, b'first-id')
514
self.repo.fetch(self.tree.branch.repository, b'second-id')
516
def test_fetch_changed_root(self):
517
self.make_two_commits(change_root=True, fetch_twice=False)
518
self.assertEqual((), self.get_parents(b'unique-id', b'second-id'))
520
def test_two_fetch_changed_root(self):
521
self.make_two_commits(change_root=True, fetch_twice=True)
522
self.assertEqual((), self.get_parents(b'unique-id', b'second-id'))
524
def test_two_fetches(self):
525
self.make_two_commits(change_root=False, fetch_twice=True)
526
self.assertEqual(((b'TREE_ROOT', b'first-id'),),
527
self.get_parents(b'TREE_ROOT', b'second-id'))
added
removed
breezy/tests/test_fetch.py
