20
from bzrlib.branch import Branch
21
from bzrlib.builtins import merge
20
22
import bzrlib.errors
21
from bzrlib.selftest.testrevision import make_branches
23
from bzrlib.fetch import greedy_fetch
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)
33
branch.repository.get_revision_xml_file(revision_id)
34
35
except bzrlib.errors.NoSuchRevision:
37
39
def fetch_steps(self, br_a, br_b, writable_a):
38
40
"""A foreign test method for testing fetch locally and remotely."""
39
41
def new_branch(name):
41
return Branch.initialize(name)
43
return WorkingTree.create_standalone(name).branch
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
45
self.assertFalse(has_revision(br_b, br_a.revision_history()[3]))
46
self.assert_(has_revision(br_b, br_a.revision_history()[2]))
47
self.assertEquals(len(br_b.revision_history()), 7)
48
self.assertEquals(greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0], 0)
48
50
# 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])
51
self.assertEquals(len(br_b.revision_history()), 7)
52
self.assertFalse(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])
54
self.assertEquals(len(br_b.revision_history()), 7)
55
self.assertEquals(greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0], 1)
56
self.assert_(has_revision(br_b, br_a.revision_history()[3]))
57
self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
58
self.assert_(has_revision(br_a, br_b.revision_history()[5]))
58
60
# When a non-branch ancestor is missing, it should be unlisted...
59
61
# as its not reference from the inventory weave.
63
65
self.assertEqual(failures, [])
65
67
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])
68
self.assert_(has_revision(br_a, br_b.revision_history()[3]))
69
self.assert_(has_revision(br_a, br_b.revision_history()[4]))
69
71
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])
72
self.assertEquals(greedy_fetch(br_b2, br_b)[0], 7)
73
self.assert_(has_revision(br_b2, br_b.revision_history()[4]))
74
self.assert_(has_revision(br_b2, br_a.revision_history()[2]))
75
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
75
77
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])
78
self.assertEquals(greedy_fetch(br_a2, br_a)[0], 9)
79
self.assert_(has_revision(br_a2, br_b.revision_history()[4]))
80
self.assert_(has_revision(br_a2, br_a.revision_history()[3]))
81
self.assert_(has_revision(br_a2, br_a.revision_history()[2]))
81
83
br_a3 = new_branch('br_a3')
82
assert greedy_fetch(br_a3, br_a2)[0] == 0
84
self.assertEquals(greedy_fetch(br_a3, br_a2)[0], 0)
83
85
for revno in range(4):
84
assert not has_revision(br_a3, br_a.revision_history()[revno])
86
self.assertFalse(has_revision(br_a3, br_a.revision_history()[revno]))
85
87
self.assertEqual(greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0], 3)
86
88
fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
87
assert fetched == 3, "fetched %d instead of 3" % fetched
89
self.assertEquals(fetched, 6, "fetched %d instead of 6" % fetched)
88
90
# InstallFailed should be raised if the branch is missing the revision
89
91
# that was requested.
90
92
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
99
101
#TODO: test that fetch correctly does reweaving when needed. RBC 20051008
101
class TestFetch(TestCaseInTempDir):
103
class TestFetch(TestCaseWithTransport):
103
105
def test_fetch(self):
104
106
#highest indices a: 5, b: 7
105
br_a, br_b = make_branches()
107
br_a, br_b = make_branches(self)
106
108
fetch_steps(self, br_a, br_b, br_a)
111
class TestMergeFetch(TestCaseWithTransport):
113
def test_merge_fetches_unrelated(self):
114
"""Merge brings across history from unrelated source"""
115
wt1 = self.make_branch_and_tree('br1')
117
wt1.commit(message='rev 1-1', rev_id='1-1')
118
wt1.commit(message='rev 1-2', rev_id='1-2')
119
wt2 = self.make_branch_and_tree('br2')
121
wt2.commit(message='rev 2-1', rev_id='2-1')
122
merge(other_revision=['br1', -1], base_revision=['br1', 0],
124
self._check_revs_present(br2)
126
def test_merge_fetches(self):
127
"""Merge brings across history from source"""
128
wt1 = self.make_branch_and_tree('br1')
130
wt1.commit(message='rev 1-1', rev_id='1-1')
131
br2 = br1.clone('br2')
132
wt1.commit(message='rev 1-2', rev_id='1-2')
133
WorkingTree('br2', br2).commit(message='rev 2-1', rev_id='2-1')
134
merge(other_revision=['br1', -1], base_revision=[None, None],
136
self._check_revs_present(br2)
138
def _check_revs_present(self, br2):
139
for rev_id in '1-1', '1-2', '2-1':
140
self.assertTrue(br2.repository.has_revision(rev_id))
141
rev = br2.repository.get_revision(rev_id)
142
self.assertEqual(rev.revision_id, rev_id)
143
self.assertTrue(br2.repository.get_inventory(rev_id))
146
class TestMergeFileHistory(TestCaseWithTransport):
149
super(TestMergeFileHistory, self).setUp()
150
wt1 = self.make_branch_and_tree('br1')
152
self.build_tree_contents([('br1/file', 'original contents\n')])
153
wt1.add('file', 'this-file-id')
154
wt1.commit(message='rev 1-1', rev_id='1-1')
155
br2 = br1.clone('br2')
156
wt2 = WorkingTree('br2', br2)
157
self.build_tree_contents([('br1/file', 'original from 1\n')])
158
wt1.commit(message='rev 1-2', rev_id='1-2')
159
self.build_tree_contents([('br1/file', 'agreement\n')])
160
wt1.commit(message='rev 1-3', rev_id='1-3')
161
self.build_tree_contents([('br2/file', 'contents in 2\n')])
162
wt2.commit(message='rev 2-1', rev_id='2-1')
163
self.build_tree_contents([('br2/file', 'agreement\n')])
164
wt2.commit(message='rev 2-2', rev_id='2-2')
166
def test_merge_fetches_file_history(self):
167
"""Merge brings across file histories"""
168
br2 = Branch.open('br2')
169
merge(other_revision=['br1', -1], base_revision=[None, None],
171
for rev_id, text in [('1-2', 'original from 1\n'),
172
('1-3', 'agreement\n'),
173
('2-1', 'contents in 2\n'),
174
('2-2', 'agreement\n')]:
175
self.assertEqualDiff(
176
br2.repository.revision_tree(
177
rev_id).get_file_text('this-file-id'), text)
109
180
class TestHttpFetch(TestCaseWithWebserver):
112
super(TestHttpFetch, self).setUp()
181
# FIXME RBC 20060124 this really isn't web specific, perhaps an
182
# instrumented readonly transport? Can we do an instrumented
183
# adapter and use self.get_readonly_url ?
115
185
def test_fetch(self):
116
186
#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))
187
print "TestHttpFetch.test_fetch disabled during transition."
189
br_a, br_b = make_branches(self)
190
br_rem_a = Branch.open(self.get_remote_url(br_a.base))
119
191
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])
127
193
def test_weaves_are_retrieved_once(self):
128
194
self.build_tree(("source/", "source/file", "target/"))
129
branch = Branch.initialize("source")
130
branch.add(["file"], ["id"])
131
branch.commit("added file")
195
wt = WorkingTree.create_standalone('source')
197
wt.add(["file"], ["id"])
198
wt.commit("added file")
132
199
print >>open("source/file", 'w'), "blah"
133
branch.commit("changed file")
134
target = Branch.initialize("target/")
200
wt.commit("changed file")
201
target = Branch.create("target/")
135
202
source = Branch.open(self.get_remote_url("source/"))
136
203
self.assertEqual(greedy_fetch(target, source), (2, []))
137
204
# this is the path to the literal file. As format changes
140
207
weave_suffix = 'weaves/ce/id.weave HTTP/1.1" 200 -'
141
208
self.assertEqual(1,
142
len([log for log in self.weblogs if log.endswith(weave_suffix)]))
209
len([log for log in self.server.logs if log.endswith(weave_suffix)]))
143
210
inventory_weave_suffix = 'inventory.weave HTTP/1.1" 200 -'
144
211
self.assertEqual(1,
145
len([log for log in self.weblogs if log.endswith(
212
len([log for log in self.server.logs if log.endswith(
146
213
inventory_weave_suffix)]))
147
214
# this r-h check test will prevent regressions, but it currently already
148
215
# passes, before the patch to cache-rh is applied :[
149
216
revision_history_suffix = 'revision-history HTTP/1.1" 200 -'
150
217
self.assertEqual(1,
151
len([log for log in self.weblogs if log.endswith(
218
len([log for log in self.server.logs if log.endswith(
152
219
revision_history_suffix)]))
220
# FIXME naughty poking in there.
221
self.server.logs = []
154
222
# check there is nothing more to fetch
155
223
source = Branch.open(self.get_remote_url("source/"))
156
224
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))
225
self.failUnless(self.server.logs[0].endswith('branch-format HTTP/1.1" 200 -'))
226
self.failUnless(self.server.logs[1].endswith('revision-history HTTP/1.1" 200 -'))
227
self.assertEqual(2, len(self.server.logs))
added
removed
bzrlib/tests/test_fetch.py
