40
43
return Branch.initialize(name)
42
assert not has_revision(br_b, br_a.revision_history()[3])
43
assert has_revision(br_b, br_a.revision_history()[2])
44
assert len(br_b.revision_history()) == 7
45
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)
47
50
# greedy_fetch is not supposed to alter the revision history
48
assert len(br_b.revision_history()) == 7
49
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]))
51
assert len(br_b.revision_history()) == 7
52
assert greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0] == 1
53
assert has_revision(br_b, br_a.revision_history()[3])
54
assert not has_revision(br_a, br_b.revision_history()[6])
55
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]))
57
60
# When a non-branch ancestor is missing, it should be unlisted...
58
# as its not present in the ancestry weave.
61
# as its not reference from the inventory weave.
59
62
br_b4 = new_branch('br_4')
60
63
count, failures = greedy_fetch(br_b4, br_b)
61
64
self.assertEqual(count, 7)
62
65
self.assertEqual(failures, [])
64
67
self.assertEqual(greedy_fetch(writable_a, br_b)[0], 1)
65
assert has_revision(br_a, br_b.revision_history()[3])
66
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]))
68
71
br_b2 = new_branch('br_b2')
69
assert greedy_fetch(br_b2, br_b)[0] == 7
70
assert has_revision(br_b2, br_b.revision_history()[4])
71
assert has_revision(br_b2, br_a.revision_history()[2])
72
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]))
74
77
br_a2 = new_branch('br_a2')
75
assert greedy_fetch(br_a2, br_a)[0] == 9
76
assert has_revision(br_a2, br_b.revision_history()[4])
77
assert has_revision(br_a2, br_a.revision_history()[3])
78
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]))
80
83
br_a3 = new_branch('br_a3')
81
assert greedy_fetch(br_a3, br_a2)[0] == 0
84
self.assertEquals(greedy_fetch(br_a3, br_a2)[0], 0)
82
85
for revno in range(4):
83
assert not has_revision(br_a3, br_a.revision_history()[revno])
86
self.assertFalse(has_revision(br_a3, br_a.revision_history()[revno]))
84
87
self.assertEqual(greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0], 3)
85
88
fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
86
assert fetched == 3, "fetched %d instead of 3" % fetched
89
self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
87
90
# InstallFailed should be raised if the branch is missing the revision
88
91
# that was requested.
89
92
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
101
#TODO: test that fetch correctly does reweaving when needed. RBC 20051008
98
103
class TestFetch(TestCaseInTempDir):
100
105
def test_fetch(self):
102
106
#highest indices a: 5, b: 7
103
br_a, br_b = make_branches()
107
br_a, br_b = make_branches(self)
104
108
fetch_steps(self, br_a, br_b, br_a)
111
class TestMergeFetch(TestCaseInTempDir):
113
def test_merge_fetches_unrelated(self):
114
"""Merge brings across history from unrelated source"""
116
br1 = Branch.initialize('br1')
117
br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
118
br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
120
br2 = Branch.initialize('br2')
121
br2.working_tree().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"""
129
br1 = Branch.initialize('br1')
130
br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
131
copy_branch(br1, 'br2')
132
br2 = Branch.open('br2')
133
br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
134
br2.working_tree().commit(message='rev 2-1', rev_id='2-1')
135
merge(other_revision=['br1', -1], base_revision=[None, None],
137
self._check_revs_present(br2)
139
def _check_revs_present(self, br2):
140
for rev_id in '1-1', '1-2', '2-1':
141
self.assertTrue(br2.has_revision(rev_id))
142
rev = br2.get_revision(rev_id)
143
self.assertEqual(rev.revision_id, rev_id)
144
self.assertTrue(br2.get_inventory(rev_id))
148
class TestMergeFileHistory(TestCaseInTempDir):
150
TestCaseInTempDir.setUp(self)
152
br1 = Branch.initialize('br1')
153
self.build_tree_contents([('br1/file', 'original contents\n')])
154
br1.add(['file'], ['this-file-id'])
155
br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
156
copy_branch(br1, 'br2')
157
br2 = Branch.open('br2')
158
self.build_tree_contents([('br1/file', 'original from 1\n')])
159
br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
160
self.build_tree_contents([('br1/file', 'agreement\n')])
161
br1.working_tree().commit(message='rev 1-3', rev_id='1-3')
162
self.build_tree_contents([('br2/file', 'contents in 2\n')])
163
br2.working_tree().commit(message='rev 2-1', rev_id='2-1')
164
self.build_tree_contents([('br2/file', 'agreement\n')])
165
br2.working_tree().commit(message='rev 2-2', rev_id='2-2')
167
def test_merge_fetches_file_history(self):
168
"""Merge brings across file histories"""
169
br2 = Branch.open('br2')
170
merge(other_revision=['br1', -1], base_revision=[None, None],
172
for rev_id, text in [('1-2', 'original from 1\n'),
173
('1-3', 'agreement\n'),
174
('2-1', 'contents in 2\n'),
175
('2-2', 'agreement\n')]:
176
self.assertEqualDiff(br2.revision_tree(rev_id).get_file_text('this-file-id'),
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._transport.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 args[0].startswith("webserver"):
198
self.weblogs.append(args[0])
200
def test_weaves_are_retrieved_once(self):
201
self.build_tree(("source/", "source/file", "target/"))
202
branch = Branch.initialize("source")
203
branch.add(["file"], ["id"])
204
branch.working_tree().commit("added file")
205
print >>open("source/file", 'w'), "blah"
206
branch.working_tree().commit("changed file")
207
target = Branch.initialize("target/")
208
source = Branch.open(self.get_remote_url("source/"))
209
self.assertEqual(greedy_fetch(target, source), (2, []))
210
# this is the path to the literal file. As format changes
211
# occur it needs to be updated. FIXME: ask the store for the
213
weave_suffix = 'weaves/ce/id.weave HTTP/1.1" 200 -'
215
len([log for log in self.weblogs if log.endswith(weave_suffix)]))
216
inventory_weave_suffix = 'inventory.weave HTTP/1.1" 200 -'
218
len([log for log in self.weblogs if log.endswith(
219
inventory_weave_suffix)]))
220
# this r-h check test will prevent regressions, but it currently already
221
# passes, before the patch to cache-rh is applied :[
222
revision_history_suffix = 'revision-history HTTP/1.1" 200 -'
224
len([log for log in self.weblogs if log.endswith(
225
revision_history_suffix)]))
227
# check there is nothing more to fetch
228
source = Branch.open(self.get_remote_url("source/"))
229
self.assertEqual(greedy_fetch(target, source), (0, []))
230
self.failUnless(self.weblogs[0].endswith('branch-format HTTP/1.1" 200 -'))
231
self.failUnless(self.weblogs[1].endswith('revision-history HTTP/1.1" 200 -'))
232
self.assertEqual(2, len(self.weblogs))
added
removed
bzrlib/selftest/testfetch.py
