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.symbol_versioning import (
34
from bzrlib.tests import TestCaseWithTransport
35
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
36
from bzrlib.tests.test_revision import make_branches
37
from bzrlib.trace import mutter
38
from bzrlib.upgrade import Convert
39
from bzrlib.workingtree import WorkingTree
42
def has_revision(branch, revision_id):
43
return branch.repository.has_revision(revision_id)
45
def fetch_steps(self, br_a, br_b, writable_a):
46
"""A foreign test method for testing fetch locally and remotely."""
48
# TODO RBC 20060201 make this a repository test.
49
repo_b = br_b.repository
50
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
51
self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
52
self.assertEquals(len(br_b.revision_history()), 7)
53
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[2])[0], 0)
54
# branch.fetch is not supposed to alter the revision history
55
self.assertEquals(len(br_b.revision_history()), 7)
56
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
58
# fetching the next revision up in sample data copies one revision
59
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[3])[0], 1)
60
self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
61
self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
62
self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
64
# When a non-branch ancestor is missing, it should be unlisted...
65
# as its not reference from the inventory weave.
66
br_b4 = self.make_branch('br_4')
67
count, failures = br_b4.fetch(br_b)
68
self.assertEqual(count, 7)
69
self.assertEqual(failures, [])
71
self.assertEqual(writable_a.fetch(br_b)[0], 1)
72
self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
73
self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
75
br_b2 = self.make_branch('br_b2')
76
self.assertEquals(br_b2.fetch(br_b)[0], 7)
77
self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
78
self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
79
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
81
br_a2 = self.make_branch('br_a2')
82
self.assertEquals(br_a2.fetch(br_a)[0], 9)
83
self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
84
self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
85
self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
87
br_a3 = self.make_branch('br_a3')
88
# pulling a branch with no revisions grabs nothing, regardless of
89
# whats in the inventory.
90
self.assertEquals(br_a3.fetch(br_a2)[0], 0)
91
for revno in range(4):
93
br_a3.repository.has_revision(br_a.revision_history()[revno]))
94
self.assertEqual(br_a3.fetch(br_a2, br_a.revision_history()[2])[0], 3)
95
# pull the 3 revisions introduced by a@u-0-3
96
fetched = br_a3.fetch(br_a2, br_a.revision_history()[3])[0]
97
self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
98
# InstallFailed should be raised if the branch is missing the revision
100
self.assertRaises(errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')
102
# TODO: Test trying to fetch from a branch that points to a revision not
103
# actually present in its repository. Not every branch format allows you
104
# to directly point to such revisions, so it's a bit complicated to
105
# construct. One way would be to uncommit and gc the revision, but not
106
# every branch supports that. -- mbp 20070814
108
#TODO: test that fetch correctly does reweaving when needed. RBC 20051008
109
# Note that this means - updating the weave when ghosts are filled in to
110
# add the right parents.
113
class TestFetch(TestCaseWithTransport):
115
def test_fetch(self):
116
#highest indices a: 5, b: 7
117
br_a, br_b = make_branches(self)
118
fetch_steps(self, br_a, br_b, br_a)
120
def test_fetch_self(self):
121
wt = self.make_branch_and_tree('br')
122
self.assertEqual(wt.branch.fetch(wt.branch), (0, []))
124
def test_fetch_root_knit(self):
125
"""Ensure that knit2.fetch() updates the root knit
127
This tests the case where the root has a new revision, but there are no
128
corresponding filename, parent, contents or other changes.
130
knit1_format = bzrdir.BzrDirMetaFormat1()
131
knit1_format.repository_format = knitrepo.RepositoryFormatKnit1()
132
knit2_format = bzrdir.BzrDirMetaFormat1()
133
knit2_format.repository_format = knitrepo.RepositoryFormatKnit3()
134
# we start with a knit1 repository because that causes the
135
# root revision to change for each commit, even though the content,
136
# parent, name, and other attributes are unchanged.
137
tree = self.make_branch_and_tree('tree', knit1_format)
138
tree.set_root_id('tree-root')
139
tree.commit('rev1', rev_id='rev1')
140
tree.commit('rev2', rev_id='rev2')
142
# Now we convert it to a knit2 repository so that it has a root knit
143
Convert(tree.basedir, knit2_format)
144
tree = WorkingTree.open(tree.basedir)
145
branch = self.make_branch('branch', format=knit2_format)
146
branch.pull(tree.branch, stop_revision='rev1')
147
repo = branch.repository
148
root_knit = repo.weave_store.get_weave('tree-root',
149
repo.get_transaction())
150
# Make sure fetch retrieved only what we requested
151
self.assertTrue('rev1' in root_knit)
152
self.assertTrue('rev2' not in root_knit)
153
branch.pull(tree.branch)
154
root_knit = repo.weave_store.get_weave('tree-root',
155
repo.get_transaction())
156
# Make sure that the next revision in the root knit was retrieved,
157
# even though the text, name, parent_id, etc., were unchanged.
158
self.assertTrue('rev2' in root_knit)
160
def test_fetch_incompatible(self):
161
knit_tree = self.make_branch_and_tree('knit', format='knit')
162
knit3_tree = self.make_branch_and_tree('knit3',
163
format='dirstate-with-subtree')
164
knit3_tree.commit('blah')
165
self.assertRaises(errors.IncompatibleRepositories,
166
knit_tree.branch.fetch, knit3_tree.branch)
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)
230
for rev_id, text in [('1-2', 'original from 1\n'),
231
('1-3', 'agreement\n'),
232
('2-1', 'contents in 2\n'),
233
('2-2', 'agreement\n')]:
234
self.assertEqualDiff(
235
br2.repository.revision_tree(
236
rev_id).get_file_text('this-file-id'), text)
239
class TestHttpFetch(TestCaseWithWebserver):
240
# FIXME RBC 20060124 this really isn't web specific, perhaps an
241
# instrumented readonly transport? Can we do an instrumented
242
# adapter and use self.get_readonly_url ?
244
def test_fetch(self):
245
#highest indices a: 5, b: 7
246
br_a, br_b = make_branches(self)
247
br_rem_a = Branch.open(self.get_readonly_url('branch1'))
248
fetch_steps(self, br_rem_a, br_b, br_a)
250
def _count_log_matches(self, target, logs):
251
"""Count the number of times the target file pattern was fetched in an http log"""
252
get_succeeds_re = re.compile(
253
'.*"GET .*%s HTTP/1.1" 20[06] - "-" "bzr/%s' %
254
( target, bzrlib.__version__))
257
if get_succeeds_re.match(line):
261
def test_weaves_are_retrieved_once(self):
262
self.build_tree(("source/", "source/file", "target/"))
263
wt = self.make_branch_and_tree('source')
265
wt.add(["file"], ["id"])
266
wt.commit("added file")
267
print >>open("source/file", 'w'), "blah"
268
wt.commit("changed file")
269
target = BzrDir.create_branch_and_repo("target/")
270
source = Branch.open(self.get_readonly_url("source/"))
271
self.assertEqual(target.fetch(source), (2, []))
272
# this is the path to the literal file. As format changes
273
# occur it needs to be updated. FIXME: ask the store for the
275
self.log("web server logs are:")
276
http_logs = self.get_readonly_server().logs
277
self.log('\n'.join(http_logs))
278
# unfortunately this log entry is branch format specific. We could
279
# factor out the 'what files does this format use' to a method on the
280
# repository, which would let us to this generically. RBC 20060419
281
self.assertEqual(1, self._count_log_matches('/ce/id.kndx', http_logs))
282
self.assertEqual(1, self._count_log_matches('/ce/id.knit', http_logs))
283
self.assertEqual(1, self._count_log_matches('inventory.kndx', http_logs))
284
# this r-h check test will prevent regressions, but it currently already
285
# passes, before the patch to cache-rh is applied :[
286
self.assertTrue(1 >= self._count_log_matches('revision-history',
288
self.assertTrue(1 >= self._count_log_matches('last-revision',
290
# FIXME naughty poking in there.
291
self.get_readonly_server().logs = []
292
# check there is nothing more to fetch
293
source = Branch.open(self.get_readonly_url("source/"))
294
self.assertEqual(target.fetch(source), (0, []))
295
# should make just two requests
296
http_logs = self.get_readonly_server().logs
297
self.log("web server logs are:")
298
self.log('\n'.join(http_logs))
299
self.assertEqual(1, self._count_log_matches('branch-format', http_logs))
300
self.assertEqual(1, self._count_log_matches('branch/format', http_logs))
301
self.assertEqual(1, self._count_log_matches('repository/format', http_logs))
302
self.assertTrue(1 >= self._count_log_matches('revision-history',
304
self.assertTrue(1 >= self._count_log_matches('last-revision',
306
self.assertEqual(4, len(http_logs))
added
removed
bzrlib/tests/test_fetch.py
