1
# Copyright (C) 2005, 2007 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
28
from bzrlib.branch import Branch
29
from bzrlib.bzrdir import BzrDir
30
from bzrlib.repofmt import knitrepo
31
from bzrlib.tests import TestCaseWithTransport
32
from bzrlib.tests.http_utils import TestCaseWithWebserver
33
from bzrlib.tests.test_revision import make_branches
34
from bzrlib.trace import mutter
35
from bzrlib.upgrade import Convert
36
from bzrlib.workingtree import WorkingTree
38
# These tests are a bit old; please instead add new tests into
39
# interrepository_implementations/ so they'll run on all relevant
43
def has_revision(branch, revision_id):
44
return branch.repository.has_revision(revision_id)
46
def fetch_steps(self, br_a, br_b, writable_a):
47
"""A foreign test method for testing fetch locally and remotely."""
49
# TODO RBC 20060201 make this a repository test.
50
repo_b = br_b.repository
51
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
52
self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
53
self.assertEquals(len(br_b.revision_history()), 7)
54
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[2])[0], 0)
55
# branch.fetch is not supposed to alter the revision history
56
self.assertEquals(len(br_b.revision_history()), 7)
57
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
59
# fetching the next revision up in sample data copies one revision
60
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[3])[0], 1)
61
self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
62
self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
63
self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
65
# When a non-branch ancestor is missing, it should be unlisted...
66
# as its not reference from the inventory weave.
67
br_b4 = self.make_branch('br_4')
68
count, failures = br_b4.fetch(br_b)
69
self.assertEqual(count, 7)
70
self.assertEqual(failures, [])
72
self.assertEqual(writable_a.fetch(br_b)[0], 1)
73
self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
74
self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
76
br_b2 = self.make_branch('br_b2')
77
self.assertEquals(br_b2.fetch(br_b)[0], 7)
78
self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
79
self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
80
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
82
br_a2 = self.make_branch('br_a2')
83
self.assertEquals(br_a2.fetch(br_a)[0], 9)
84
self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
85
self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
86
self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
88
br_a3 = self.make_branch('br_a3')
89
# pulling a branch with no revisions grabs nothing, regardless of
90
# whats in the inventory.
91
self.assertEquals(br_a3.fetch(br_a2)[0], 0)
92
for revno in range(4):
94
br_a3.repository.has_revision(br_a.revision_history()[revno]))
95
self.assertEqual(br_a3.fetch(br_a2, br_a.revision_history()[2])[0], 3)
96
# pull the 3 revisions introduced by a@u-0-3
97
fetched = br_a3.fetch(br_a2, br_a.revision_history()[3])[0]
98
self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
99
# InstallFailed should be raised if the branch is missing the revision
100
# that was requested.
101
self.assertRaises(errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')
103
# TODO: Test trying to fetch from a branch that points to a revision not
104
# actually present in its repository. Not every branch format allows you
105
# to directly point to such revisions, so it's a bit complicated to
106
# construct. One way would be to uncommit and gc the revision, but not
107
# every branch supports that. -- mbp 20070814
109
#TODO: test that fetch correctly does reweaving when needed. RBC 20051008
110
# Note that this means - updating the weave when ghosts are filled in to
111
# add the right parents.
114
class TestFetch(TestCaseWithTransport):
116
def test_fetch(self):
117
#highest indices a: 5, b: 7
118
br_a, br_b = make_branches(self, format='dirstate-tags')
119
fetch_steps(self, br_a, br_b, br_a)
121
def test_fetch_self(self):
122
wt = self.make_branch_and_tree('br')
123
self.assertEqual(wt.branch.fetch(wt.branch), (0, []))
125
def test_fetch_root_knit(self):
126
"""Ensure that knit2.fetch() updates the root knit
128
This tests the case where the root has a new revision, but there are no
129
corresponding filename, parent, contents or other changes.
131
knit1_format = bzrdir.BzrDirMetaFormat1()
132
knit1_format.repository_format = knitrepo.RepositoryFormatKnit1()
133
knit2_format = bzrdir.BzrDirMetaFormat1()
134
knit2_format.repository_format = knitrepo.RepositoryFormatKnit3()
135
# we start with a knit1 repository because that causes the
136
# root revision to change for each commit, even though the content,
137
# parent, name, and other attributes are unchanged.
138
tree = self.make_branch_and_tree('tree', knit1_format)
139
tree.set_root_id('tree-root')
140
tree.commit('rev1', rev_id='rev1')
141
tree.commit('rev2', rev_id='rev2')
143
# Now we convert it to a knit2 repository so that it has a root knit
144
Convert(tree.basedir, knit2_format)
145
tree = WorkingTree.open(tree.basedir)
146
branch = self.make_branch('branch', format=knit2_format)
147
branch.pull(tree.branch, stop_revision='rev1')
148
repo = branch.repository
151
# Make sure fetch retrieved only what we requested
152
self.assertEqual({('tree-root', 'rev1'):()},
153
repo.texts.get_parent_map(
154
[('tree-root', 'rev1'), ('tree-root', 'rev2')]))
157
branch.pull(tree.branch)
158
# Make sure that the next revision in the root knit was retrieved,
159
# even though the text, name, parent_id, etc., were unchanged.
162
# Make sure fetch retrieved only what we requested
163
self.assertEqual({('tree-root', 'rev2'):(('tree-root', 'rev1'),)},
164
repo.texts.get_parent_map([('tree-root', 'rev2')]))
168
def test_fetch_incompatible(self):
169
knit_tree = self.make_branch_and_tree('knit', format='knit')
170
knit3_tree = self.make_branch_and_tree('knit3',
171
format='dirstate-with-subtree')
172
knit3_tree.commit('blah')
173
self.assertRaises(errors.IncompatibleRepositories,
174
knit_tree.branch.fetch, knit3_tree.branch)
177
class TestMergeFetch(TestCaseWithTransport):
179
def test_merge_fetches_unrelated(self):
180
"""Merge brings across history from unrelated source"""
181
wt1 = self.make_branch_and_tree('br1')
183
wt1.commit(message='rev 1-1', rev_id='1-1')
184
wt1.commit(message='rev 1-2', rev_id='1-2')
185
wt2 = self.make_branch_and_tree('br2')
187
wt2.commit(message='rev 2-1', rev_id='2-1')
188
wt2.merge_from_branch(br1, from_revision='null:')
189
self._check_revs_present(br2)
191
def test_merge_fetches(self):
192
"""Merge brings across history from source"""
193
wt1 = self.make_branch_and_tree('br1')
195
wt1.commit(message='rev 1-1', rev_id='1-1')
196
dir_2 = br1.bzrdir.sprout('br2')
197
br2 = dir_2.open_branch()
198
wt1.commit(message='rev 1-2', rev_id='1-2')
199
wt2 = dir_2.open_workingtree()
200
wt2.commit(message='rev 2-1', rev_id='2-1')
201
wt2.merge_from_branch(br1)
202
self._check_revs_present(br2)
204
def _check_revs_present(self, br2):
205
for rev_id in '1-1', '1-2', '2-1':
206
self.assertTrue(br2.repository.has_revision(rev_id))
207
rev = br2.repository.get_revision(rev_id)
208
self.assertEqual(rev.revision_id, rev_id)
209
self.assertTrue(br2.repository.get_inventory(rev_id))
212
class TestMergeFileHistory(TestCaseWithTransport):
215
super(TestMergeFileHistory, self).setUp()
216
wt1 = self.make_branch_and_tree('br1')
218
self.build_tree_contents([('br1/file', 'original contents\n')])
219
wt1.add('file', 'this-file-id')
220
wt1.commit(message='rev 1-1', rev_id='1-1')
221
dir_2 = br1.bzrdir.sprout('br2')
222
br2 = dir_2.open_branch()
223
wt2 = dir_2.open_workingtree()
224
self.build_tree_contents([('br1/file', 'original from 1\n')])
225
wt1.commit(message='rev 1-2', rev_id='1-2')
226
self.build_tree_contents([('br1/file', 'agreement\n')])
227
wt1.commit(message='rev 1-3', rev_id='1-3')
228
self.build_tree_contents([('br2/file', 'contents in 2\n')])
229
wt2.commit(message='rev 2-1', rev_id='2-1')
230
self.build_tree_contents([('br2/file', 'agreement\n')])
231
wt2.commit(message='rev 2-2', rev_id='2-2')
233
def test_merge_fetches_file_history(self):
234
"""Merge brings across file histories"""
235
br2 = Branch.open('br2')
236
br1 = Branch.open('br1')
237
wt2 = WorkingTree.open('br2').merge_from_branch(br1)
239
self.addCleanup(br2.unlock)
240
for rev_id, text in [('1-2', 'original from 1\n'),
241
('1-3', 'agreement\n'),
242
('2-1', 'contents in 2\n'),
243
('2-2', 'agreement\n')]:
244
self.assertEqualDiff(
245
br2.repository.revision_tree(
246
rev_id).get_file_text('this-file-id'), text)
249
class TestHttpFetch(TestCaseWithWebserver):
250
# FIXME RBC 20060124 this really isn't web specific, perhaps an
251
# instrumented readonly transport? Can we do an instrumented
252
# adapter and use self.get_readonly_url ?
254
def test_fetch(self):
255
#highest indices a: 5, b: 7
256
br_a, br_b = make_branches(self)
257
br_rem_a = Branch.open(self.get_readonly_url('branch1'))
258
fetch_steps(self, br_rem_a, br_b, br_a)
260
def _count_log_matches(self, target, logs):
261
"""Count the number of times the target file pattern was fetched in an http log"""
262
get_succeeds_re = re.compile(
263
'.*"GET .*%s HTTP/1.1" 20[06] - "-" "bzr/%s' %
264
( target, bzrlib.__version__))
267
if get_succeeds_re.match(line):
271
def test_weaves_are_retrieved_once(self):
272
self.build_tree(("source/", "source/file", "target/"))
273
# This test depends on knit dasta storage.
274
wt = self.make_branch_and_tree('source', format='dirstate-tags')
276
wt.add(["file"], ["id"])
277
wt.commit("added file")
278
open("source/file", 'w').write("blah\n")
279
wt.commit("changed file")
280
target = BzrDir.create_branch_and_repo("target/")
281
source = Branch.open(self.get_readonly_url("source/"))
282
self.assertEqual(target.fetch(source), (2, []))
283
# this is the path to the literal file. As format changes
284
# occur it needs to be updated. FIXME: ask the store for the
286
self.log("web server logs are:")
287
http_logs = self.get_readonly_server().logs
288
self.log('\n'.join(http_logs))
289
# unfortunately this log entry is branch format specific. We could
290
# factor out the 'what files does this format use' to a method on the
291
# repository, which would let us to this generically. RBC 20060419
292
# RBC 20080408: Or perhaps we can assert that no files are fully read
294
self.assertEqual(1, self._count_log_matches('/ce/id.kndx', http_logs))
295
self.assertEqual(1, self._count_log_matches('/ce/id.knit', http_logs))
296
self.assertEqual(1, self._count_log_matches('inventory.kndx', http_logs))
297
# this r-h check test will prevent regressions, but it currently already
298
# passes, before the patch to cache-rh is applied :[
299
self.assertTrue(1 >= self._count_log_matches('revision-history',
301
self.assertTrue(1 >= self._count_log_matches('last-revision',
303
# FIXME naughty poking in there.
304
self.get_readonly_server().logs = []
305
# check there is nothing more to fetch. We take care to re-use the
306
# existing transport so that the request logs we're about to examine
307
# aren't cluttered with redundant probes for a smart server.
308
# XXX: Perhaps this further parameterisation: test http with smart
309
# server, and test http without smart server?
310
source = Branch.open(
311
self.get_readonly_url("source/"),
312
possible_transports=[source.bzrdir.root_transport])
313
self.assertEqual(target.fetch(source), (0, []))
314
# should make just two requests
315
http_logs = self.get_readonly_server().logs
316
self.log("web server logs are:")
317
self.log('\n'.join(http_logs))
318
self.assertEqual(1, self._count_log_matches('branch-format', http_logs))
319
self.assertEqual(1, self._count_log_matches('branch/format', http_logs))
320
self.assertEqual(1, self._count_log_matches('repository/format',
322
self.assertTrue(1 >= self._count_log_matches('revision-history',
324
self.assertTrue(1 >= self._count_log_matches('last-revision',
326
self.assertEqual(4, len(http_logs))
329
class Test1To2Fetch(TestCaseWithTransport):
330
"""Tests for Model1To2 failure modes"""
332
def make_tree_and_repo(self):
333
self.tree = self.make_branch_and_tree('tree', format='pack-0.92')
334
self.repo = self.make_repository('rich-repo', format='rich-root-pack')
335
self.repo.lock_write()
336
self.addCleanup(self.repo.unlock)
338
def do_fetch_order_test(self, first, second):
339
"""Test that fetch works no matter what the set order of revision is.
341
This test depends on the order of items in a set, which is
342
implementation-dependant, so we test A, B and then B, A.
344
self.make_tree_and_repo()
345
self.tree.commit('Commit 1', rev_id=first)
346
self.tree.commit('Commit 2', rev_id=second)
347
self.repo.fetch(self.tree.branch.repository, second)
349
def test_fetch_order_AB(self):
350
"""See do_fetch_order_test"""
351
self.do_fetch_order_test('A', 'B')
353
def test_fetch_order_BA(self):
354
"""See do_fetch_order_test"""
355
self.do_fetch_order_test('B', 'A')
357
def get_parents(self, file_id, revision_id):
358
self.repo.lock_read()
360
parent_map = self.repo.texts.get_parent_map([(file_id, revision_id)])
361
return parent_map[(file_id, revision_id)]
365
def test_fetch_ghosts(self):
366
self.make_tree_and_repo()
367
self.tree.commit('first commit', rev_id='left-parent')
368
self.tree.add_parent_tree_id('ghost-parent')
369
fork = self.tree.bzrdir.sprout('fork', 'null:').open_workingtree()
370
fork.commit('not a ghost', rev_id='not-ghost-parent')
371
self.tree.branch.repository.fetch(fork.branch.repository,
373
self.tree.add_parent_tree_id('not-ghost-parent')
374
self.tree.commit('second commit', rev_id='second-id')
375
self.repo.fetch(self.tree.branch.repository, 'second-id')
376
root_id = self.tree.get_root_id()
378
((root_id, 'left-parent'), (root_id, 'ghost-parent'),
379
(root_id, 'not-ghost-parent')),
380
self.get_parents(root_id, 'second-id'))
382
def make_two_commits(self, change_root, fetch_twice):
383
self.make_tree_and_repo()
384
self.tree.commit('first commit', rev_id='first-id')
386
self.tree.set_root_id('unique-id')
387
self.tree.commit('second commit', rev_id='second-id')
389
self.repo.fetch(self.tree.branch.repository, 'first-id')
390
self.repo.fetch(self.tree.branch.repository, 'second-id')
392
def test_fetch_changed_root(self):
393
self.make_two_commits(change_root=True, fetch_twice=False)
394
self.assertEqual((), self.get_parents('unique-id', 'second-id'))
396
def test_two_fetch_changed_root(self):
397
self.make_two_commits(change_root=True, fetch_twice=True)
398
self.assertEqual((), self.get_parents('unique-id', 'second-id'))
400
def test_two_fetches(self):
401
self.make_two_commits(change_root=False, fetch_twice=True)
402
self.assertEqual((('TREE_ROOT', 'first-id'),),
403
self.get_parents('TREE_ROOT', 'second-id'))
added
removed
bzrlib/tests/test_fetch.py
