13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20
16
import bzrlib.errors
21
from bzrlib.tests.test_revision import make_branches
17
from bzrlib.selftest.testrevision import make_branches
22
18
from bzrlib.trace import mutter
23
19
from bzrlib.branch import Branch
24
from bzrlib.fetch import greedy_fetch
25
from bzrlib.merge import merge
27
from bzrlib.tests import TestCaseInTempDir
28
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
31
def has_revision(branch, revision_id):
33
branch.repository.get_revision_xml_file(revision_id)
35
except bzrlib.errors.NoSuchRevision:
38
def fetch_steps(self, br_a, br_b, writable_a):
39
"""A foreign test method for testing fetch locally and remotely."""
42
return Branch.initialize(name)
44
self.assertFalse(has_revision(br_b, br_a.revision_history()[3]))
45
self.assert_(has_revision(br_b, br_a.revision_history()[2]))
46
self.assertEquals(len(br_b.revision_history()), 7)
47
self.assertEquals(greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0], 0)
49
# greedy_fetch is not supposed to alter the revision history
50
self.assertEquals(len(br_b.revision_history()), 7)
51
self.assertFalse(has_revision(br_b, br_a.revision_history()[3]))
53
self.assertEquals(len(br_b.revision_history()), 7)
54
self.assertEquals(greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0], 1)
55
self.assert_(has_revision(br_b, br_a.revision_history()[3]))
56
self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
57
self.assert_(has_revision(br_a, br_b.revision_history()[5]))
59
# When a non-branch ancestor is missing, it should be unlisted...
60
# as its not reference from the inventory weave.
61
br_b4 = new_branch('br_4')
62
count, failures = greedy_fetch(br_b4, br_b)
63
self.assertEqual(count, 7)
64
self.assertEqual(failures, [])
66
self.assertEqual(greedy_fetch(writable_a, br_b)[0], 1)
67
self.assert_(has_revision(br_a, br_b.revision_history()[3]))
68
self.assert_(has_revision(br_a, br_b.revision_history()[4]))
23
from bzrlib.selftest import TestCaseInTempDir
70
br_b2 = new_branch('br_b2')
71
self.assertEquals(greedy_fetch(br_b2, br_b)[0], 7)
72
self.assert_(has_revision(br_b2, br_b.revision_history()[4]))
73
self.assert_(has_revision(br_b2, br_a.revision_history()[2]))
74
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
76
br_a2 = new_branch('br_a2')
77
self.assertEquals(greedy_fetch(br_a2, br_a)[0], 9)
78
self.assert_(has_revision(br_a2, br_b.revision_history()[4]))
79
self.assert_(has_revision(br_a2, br_a.revision_history()[3]))
80
self.assert_(has_revision(br_a2, br_a.revision_history()[2]))
82
br_a3 = new_branch('br_a3')
83
self.assertEquals(greedy_fetch(br_a3, br_a2)[0], 0)
84
for revno in range(4):
85
self.assertFalse(has_revision(br_a3, br_a.revision_history()[revno]))
86
self.assertEqual(greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0], 3)
87
fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
88
self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
89
# InstallFailed should be raised if the branch is missing the revision
91
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
93
# InstallFailed should be raised if the branch is missing a revision
94
# from its own revision history
95
br_a2.append_revision('a-b-c')
96
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
100
#TODO: test that fetch correctly does reweaving when needed. RBC 20051008
102
26
class TestFetch(TestCaseInTempDir):
104
def test_fetch(self):
105
#highest indices a: 5, b: 7
106
br_a, br_b = make_branches(self)
107
fetch_steps(self, br_a, br_b, br_a)
110
class TestMergeFetch(TestCaseInTempDir):
112
def test_merge_fetches_unrelated(self):
113
"""Merge brings across history from unrelated source"""
115
br1 = Branch.initialize('br1')
116
br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
117
br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
119
br2 = Branch.initialize('br2')
120
br2.working_tree().commit(message='rev 2-1', rev_id='2-1')
121
merge(other_revision=['br1', -1], base_revision=['br1', 0],
123
self._check_revs_present(br2)
125
def test_merge_fetches(self):
126
"""Merge brings across history from source"""
128
br1 = Branch.initialize('br1')
129
br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
131
br2 = Branch.open('br2')
132
br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
133
br2.working_tree().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))
147
class TestMergeFileHistory(TestCaseInTempDir):
149
TestCaseInTempDir.setUp(self)
151
br1 = Branch.initialize('br1')
152
self.build_tree_contents([('br1/file', 'original contents\n')])
153
br1.working_tree().add(['file'], ['this-file-id'])
154
br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
156
br2 = Branch.open('br2')
157
self.build_tree_contents([('br1/file', 'original from 1\n')])
158
br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
159
self.build_tree_contents([('br1/file', 'agreement\n')])
160
br1.working_tree().commit(message='rev 1-3', rev_id='1-3')
161
self.build_tree_contents([('br2/file', 'contents in 2\n')])
162
br2.working_tree().commit(message='rev 2-1', rev_id='2-1')
163
self.build_tree_contents([('br2/file', 'agreement\n')])
164
br2.working_tree().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)
182
class TestHttpFetch(TestCaseWithWebserver):
185
super(TestHttpFetch, self).setUp()
188
def test_fetch(self):
189
#highest indices a: 5, b: 7
190
br_a, br_b = make_branches(self)
191
br_rem_a = Branch.open(self.get_remote_url(br_a.base))
192
fetch_steps(self, br_rem_a, br_b, br_a)
194
def log(self, *args):
195
"""Capture web server log messages for introspection."""
196
super(TestHttpFetch, self).log(*args)
197
# if this call indicates a url being fetched, save it specially
198
if args[0].startswith("webserver"):
199
self.weblogs.append(args[3])
201
def test_weaves_are_retrieved_once(self):
202
self.build_tree(("source/", "source/file", "target/"))
203
branch = Branch.initialize("source")
204
branch.working_tree().add(["file"], ["id"])
205
branch.working_tree().commit("added file")
206
print >>open("source/file", 'w'), "blah"
207
branch.working_tree().commit("changed file")
208
target = Branch.initialize("target/")
209
source = Branch.open(self.get_remote_url("source/"))
210
self.assertEqual(greedy_fetch(target, source), (2, []))
211
# this is the path to the literal file. As format changes
212
# occur it needs to be updated. FIXME: ask the store for the
214
weave_suffix = 'weaves/ce/id.weave HTTP/1.1" 200 -'
216
len([log for log in self.weblogs if log.endswith(weave_suffix)]))
217
inventory_weave_suffix = 'inventory.weave HTTP/1.1" 200 -'
219
len([log for log in self.weblogs if log.endswith(
220
inventory_weave_suffix)]))
221
# this r-h check test will prevent regressions, but it currently already
222
# passes, before the patch to cache-rh is applied :[
223
revision_history_suffix = 'revision-history HTTP/1.1" 200 -'
225
len([log for log in self.weblogs if log.endswith(
226
revision_history_suffix)]))
228
# check there is nothing more to fetch
229
source = Branch.open(self.get_remote_url("source/"))
230
self.assertEqual(greedy_fetch(target, source), (0, []))
231
self.failUnless(self.weblogs[0].endswith('branch-format HTTP/1.1" 200 -'))
232
self.failUnless(self.weblogs[1].endswith('revision-history HTTP/1.1" 200 -'))
233
self.assertEqual(2, len(self.weblogs))
28
from bzrlib.fetch import greedy_fetch, has_revision
32
return Branch(name, init=True)
34
#highest indices a: 5, b: 7
35
br_a, br_b = make_branches()
36
assert not has_revision(br_b, br_a.revision_history()[3])
37
assert has_revision(br_b, br_a.revision_history()[2])
38
assert len(br_b.revision_history()) == 7
39
assert greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0] == 0
41
# greedy_fetch is not supposed to alter the revision history
42
assert len(br_b.revision_history()) == 7
43
assert not has_revision(br_b, br_a.revision_history()[3])
45
assert len(br_b.revision_history()) == 7
46
assert greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0] == 1
47
assert has_revision(br_b, br_a.revision_history()[3])
48
assert not has_revision(br_a, br_b.revision_history()[3])
49
assert not has_revision(br_a, br_b.revision_history()[4])
51
# When a non-branch ancestor is missing, it should be a failure, not
53
br_a4 = new_branch('br_a4')
54
count, failures = greedy_fetch(br_a4, br_a)
56
assert failures == set((br_b.revision_history()[4],
57
br_b.revision_history()[5]))
59
assert greedy_fetch(br_a, br_b)[0] == 4
60
assert has_revision(br_a, br_b.revision_history()[3])
61
assert has_revision(br_a, br_b.revision_history()[4])
63
br_b2 = new_branch('br_b2')
64
assert greedy_fetch(br_b2, br_b)[0] == 7
65
assert has_revision(br_b2, br_b.revision_history()[4])
66
assert has_revision(br_b2, br_a.revision_history()[2])
67
assert not has_revision(br_b2, br_a.revision_history()[3])
69
br_a2 = new_branch('br_a2')
70
assert greedy_fetch(br_a2, br_a)[0] == 9
71
assert has_revision(br_a2, br_b.revision_history()[4])
72
assert has_revision(br_a2, br_a.revision_history()[3])
74
br_a3 = new_branch('br_a3')
75
assert greedy_fetch(br_a3, br_a2)[0] == 0
76
for revno in range(4):
77
assert not has_revision(br_a3, br_a.revision_history()[revno])
78
assert greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0] == 3
79
fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
80
assert fetched == 3, "fetched %d instead of 3" % fetched
81
# InstallFailed should be raised if the branch is missing the revision
83
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
85
# InstallFailed should be raised if the branch is missing a revision
86
# from its own revision history
87
br_a2.append_revision('a-b-c')
88
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
93
if __name__ == '__main__':
95
sys.exit(unittest.run_suite(unittest.makeSuite()))
added
removed
bzrlib/selftest/testfetch.py
