20
from bzrlib.branch import Branch
21
from bzrlib.bzrdir import BzrDir
22
from bzrlib.builtins import merge
20
23
import bzrlib.errors
21
from bzrlib.selftest.testrevision import make_branches
24
from bzrlib.tests import TestCaseWithTransport
25
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
26
from bzrlib.tests.test_revision import make_branches
22
27
from bzrlib.trace import mutter
23
from bzrlib.branch import Branch
24
from bzrlib.fetch import greedy_fetch
26
from bzrlib.selftest import TestCaseInTempDir
27
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
28
from bzrlib.workingtree import WorkingTree
30
31
def has_revision(branch, revision_id):
32
branch.get_revision_xml_file(revision_id)
34
except bzrlib.errors.NoSuchRevision:
32
return branch.repository.has_revision(revision_id)
37
34
def fetch_steps(self, br_a, br_b, writable_a):
38
35
"""A foreign test method for testing fetch locally and remotely."""
41
return Branch.initialize(name)
43
assert not has_revision(br_b, br_a.revision_history()[3])
44
assert has_revision(br_b, br_a.revision_history()[2])
45
assert len(br_b.revision_history()) == 7
46
assert greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0] == 0
48
# greedy_fetch is not supposed to alter the revision history
49
assert len(br_b.revision_history()) == 7
50
assert not has_revision(br_b, br_a.revision_history()[3])
52
assert len(br_b.revision_history()) == 7
53
assert greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0] == 1
54
assert has_revision(br_b, br_a.revision_history()[3])
55
assert not has_revision(br_a, br_b.revision_history()[6])
56
assert has_revision(br_a, br_b.revision_history()[5])
37
# TODO RBC 20060201 make this a repository test.
38
repo_b = br_b.repository
39
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
40
self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
41
self.assertEquals(len(br_b.revision_history()), 7)
42
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[2])[0], 0)
43
# branch.fetch is not supposed to alter the revision history
44
self.assertEquals(len(br_b.revision_history()), 7)
45
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
47
# fetching the next revision up in sample data copies one revision
48
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[3])[0], 1)
49
self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
50
self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
51
self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
58
53
# When a non-branch ancestor is missing, it should be unlisted...
59
54
# as its not reference from the inventory weave.
60
br_b4 = new_branch('br_4')
61
count, failures = greedy_fetch(br_b4, br_b)
55
br_b4 = self.make_branch('br_4')
56
count, failures = br_b4.fetch(br_b)
62
57
self.assertEqual(count, 7)
63
58
self.assertEqual(failures, [])
65
self.assertEqual(greedy_fetch(writable_a, br_b)[0], 1)
66
assert has_revision(br_a, br_b.revision_history()[3])
67
assert has_revision(br_a, br_b.revision_history()[4])
60
self.assertEqual(writable_a.fetch(br_b)[0], 1)
61
self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
62
self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
69
br_b2 = new_branch('br_b2')
70
assert greedy_fetch(br_b2, br_b)[0] == 7
71
assert has_revision(br_b2, br_b.revision_history()[4])
72
assert has_revision(br_b2, br_a.revision_history()[2])
73
assert not has_revision(br_b2, br_a.revision_history()[3])
75
br_a2 = new_branch('br_a2')
76
assert greedy_fetch(br_a2, br_a)[0] == 9
77
assert has_revision(br_a2, br_b.revision_history()[4])
78
assert has_revision(br_a2, br_a.revision_history()[3])
79
assert has_revision(br_a2, br_a.revision_history()[2])
81
br_a3 = new_branch('br_a3')
82
assert greedy_fetch(br_a3, br_a2)[0] == 0
64
br_b2 = self.make_branch('br_b2')
65
self.assertEquals(br_b2.fetch(br_b)[0], 7)
66
self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
67
self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
68
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
70
br_a2 = self.make_branch('br_a2')
71
self.assertEquals(br_a2.fetch(br_a)[0], 9)
72
self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
73
self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
74
self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
76
br_a3 = self.make_branch('br_a3')
77
# pulling a branch with no revisions grabs nothing, regardless of
78
# whats in the inventory.
79
self.assertEquals(br_a3.fetch(br_a2)[0], 0)
83
80
for revno in range(4):
84
assert not has_revision(br_a3, br_a.revision_history()[revno])
85
self.assertEqual(greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0], 3)
86
fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
87
assert fetched == 3, "fetched %d instead of 3" % fetched
82
br_a3.repository.has_revision(br_a.revision_history()[revno]))
83
self.assertEqual(br_a3.fetch(br_a2, br_a.revision_history()[2])[0], 3)
84
# pull the 3 revisions introduced by a@u-0-3
85
fetched = br_a3.fetch(br_a2, br_a.revision_history()[3])[0]
86
self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
88
87
# InstallFailed should be raised if the branch is missing the revision
89
88
# that was requested.
90
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
89
self.assertRaises(bzrlib.errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')
92
90
# InstallFailed should be raised if the branch is missing a revision
93
91
# from its own revision history
94
92
br_a2.append_revision('a-b-c')
95
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
93
self.assertRaises(bzrlib.errors.InstallFailed, br_a3.fetch, br_a2)
99
94
#TODO: test that fetch correctly does reweaving when needed. RBC 20051008
101
class TestFetch(TestCaseInTempDir):
95
# Note that this means - updating the weave when ghosts are filled in to
96
# add the right parents.
99
class TestFetch(TestCaseWithTransport):
103
101
def test_fetch(self):
104
102
#highest indices a: 5, b: 7
105
br_a, br_b = make_branches()
103
br_a, br_b = make_branches(self)
106
104
fetch_steps(self, br_a, br_b, br_a)
107
class TestMergeFetch(TestCaseWithTransport):
109
def test_merge_fetches_unrelated(self):
110
"""Merge brings across history from unrelated source"""
111
wt1 = self.make_branch_and_tree('br1')
113
wt1.commit(message='rev 1-1', rev_id='1-1')
114
wt1.commit(message='rev 1-2', rev_id='1-2')
115
wt2 = self.make_branch_and_tree('br2')
117
wt2.commit(message='rev 2-1', rev_id='2-1')
118
merge(other_revision=['br1', -1], base_revision=['br1', 0],
120
self._check_revs_present(br2)
122
def test_merge_fetches(self):
123
"""Merge brings across history from source"""
124
wt1 = self.make_branch_and_tree('br1')
126
wt1.commit(message='rev 1-1', rev_id='1-1')
127
dir_2 = br1.bzrdir.sprout('br2')
128
br2 = dir_2.open_branch()
129
wt1.commit(message='rev 1-2', rev_id='1-2')
130
dir_2.open_workingtree().commit(message='rev 2-1', rev_id='2-1')
131
merge(other_revision=['br1', -1], base_revision=[None, None],
133
self._check_revs_present(br2)
135
def _check_revs_present(self, br2):
136
for rev_id in '1-1', '1-2', '2-1':
137
self.assertTrue(br2.repository.has_revision(rev_id))
138
rev = br2.repository.get_revision(rev_id)
139
self.assertEqual(rev.revision_id, rev_id)
140
self.assertTrue(br2.repository.get_inventory(rev_id))
143
class TestMergeFileHistory(TestCaseWithTransport):
146
super(TestMergeFileHistory, self).setUp()
147
wt1 = self.make_branch_and_tree('br1')
149
self.build_tree_contents([('br1/file', 'original contents\n')])
150
wt1.add('file', 'this-file-id')
151
wt1.commit(message='rev 1-1', rev_id='1-1')
152
dir_2 = br1.bzrdir.sprout('br2')
153
br2 = dir_2.open_branch()
154
wt2 = dir_2.open_workingtree()
155
self.build_tree_contents([('br1/file', 'original from 1\n')])
156
wt1.commit(message='rev 1-2', rev_id='1-2')
157
self.build_tree_contents([('br1/file', 'agreement\n')])
158
wt1.commit(message='rev 1-3', rev_id='1-3')
159
self.build_tree_contents([('br2/file', 'contents in 2\n')])
160
wt2.commit(message='rev 2-1', rev_id='2-1')
161
self.build_tree_contents([('br2/file', 'agreement\n')])
162
wt2.commit(message='rev 2-2', rev_id='2-2')
164
def test_merge_fetches_file_history(self):
165
"""Merge brings across file histories"""
166
br2 = Branch.open('br2')
167
merge(other_revision=['br1', -1], base_revision=[None, None],
169
for rev_id, text in [('1-2', 'original from 1\n'),
170
('1-3', 'agreement\n'),
171
('2-1', 'contents in 2\n'),
172
('2-2', 'agreement\n')]:
173
self.assertEqualDiff(
174
br2.repository.revision_tree(
175
rev_id).get_file_text('this-file-id'), text)
109
178
class TestHttpFetch(TestCaseWithWebserver):
112
super(TestHttpFetch, self).setUp()
179
# FIXME RBC 20060124 this really isn't web specific, perhaps an
180
# instrumented readonly transport? Can we do an instrumented
181
# adapter and use self.get_readonly_url ?
115
183
def test_fetch(self):
116
184
#highest indices a: 5, b: 7
117
br_a, br_b = make_branches()
118
br_rem_a = Branch.open(self.get_remote_url(br_a._transport.base))
185
br_a, br_b = make_branches(self)
186
br_rem_a = Branch.open(self.get_readonly_url('branch1'))
119
187
fetch_steps(self, br_rem_a, br_b, br_a)
121
def log(self, *args):
122
"""Capture web server log messages for introspection."""
123
super(TestHttpFetch, self).log(*args)
124
if args[0].startswith("webserver"):
125
self.weblogs.append(args[0])
189
def _count_log_matches(self, target, logs):
190
"""Count the number of times the target file pattern was fetched in an http log"""
191
log_pattern = '%s HTTP/1.1" 200 - "-" "bzr/%s' % \
192
(target, bzrlib.__version__)
195
# TODO: perhaps use a regexp instead so we can match more
197
if line.find(log_pattern) > -1:
127
201
def test_weaves_are_retrieved_once(self):
128
202
self.build_tree(("source/", "source/file", "target/"))
129
branch = Branch.initialize("source")
130
branch.add(["file"], ["id"])
131
branch.commit("added file")
203
wt = self.make_branch_and_tree('source')
205
wt.add(["file"], ["id"])
206
wt.commit("added file")
132
207
print >>open("source/file", 'w'), "blah"
133
branch.commit("changed file")
134
target = Branch.initialize("target/")
135
source = Branch.open(self.get_remote_url("source/"))
136
self.assertEqual(greedy_fetch(target, source), (2, []))
208
wt.commit("changed file")
209
target = BzrDir.create_branch_and_repo("target/")
210
source = Branch.open(self.get_readonly_url("source/"))
211
self.assertEqual(target.fetch(source), (2, []))
212
log_pattern = '%%s HTTP/1.1" 200 - "-" "bzr/%s' % bzrlib.__version__
137
213
# this is the path to the literal file. As format changes
138
214
# occur it needs to be updated. FIXME: ask the store for the
140
weave_suffix = 'weaves/ce/id.weave HTTP/1.1" 200 -'
142
len([log for log in self.weblogs if log.endswith(weave_suffix)]))
143
inventory_weave_suffix = 'inventory.weave HTTP/1.1" 200 -'
145
len([log for log in self.weblogs if log.endswith(
146
inventory_weave_suffix)]))
216
self.log("web server logs are:")
217
http_logs = self.get_readonly_server().logs
218
self.log('\n'.join(http_logs))
219
self.assertEqual(1, self._count_log_matches('weaves/ce/id.weave', http_logs))
220
self.assertEqual(1, self._count_log_matches('inventory.weave', http_logs))
147
221
# this r-h check test will prevent regressions, but it currently already
148
222
# passes, before the patch to cache-rh is applied :[
149
revision_history_suffix = 'revision-history HTTP/1.1" 200 -'
151
len([log for log in self.weblogs if log.endswith(
152
revision_history_suffix)]))
223
self.assertEqual(1, self._count_log_matches('revision-history', http_logs))
224
# FIXME naughty poking in there.
225
self.get_readonly_server().logs = []
154
226
# check there is nothing more to fetch
155
source = Branch.open(self.get_remote_url("source/"))
156
self.assertEqual(greedy_fetch(target, source), (0, []))
157
self.failUnless(self.weblogs[0].endswith('branch-format HTTP/1.1" 200 -'))
158
self.failUnless(self.weblogs[1].endswith('revision-history HTTP/1.1" 200 -'))
159
self.assertEqual(2, len(self.weblogs))
227
source = Branch.open(self.get_readonly_url("source/"))
228
self.assertEqual(target.fetch(source), (0, []))
229
# should make just two requests
230
http_logs = self.get_readonly_server().logs
231
self.log("web server logs are:")
232
self.log('\n'.join(http_logs))
233
self.assertEqual(1, self._count_log_matches('branch-format', http_logs[0:1]))
234
self.assertEqual(1, self._count_log_matches('revision-history', http_logs[1:2]))
235
self.assertEqual(2, len(http_logs))
added
removed
bzrlib/tests/test_fetch.py
