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.fetch import greedy_fetch
25
from bzrlib.tests import TestCaseWithTransport
26
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
27
from bzrlib.tests.test_revision import make_branches
22
28
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
29
from bzrlib.workingtree import WorkingTree
30
32
def has_revision(branch, revision_id):
32
branch.get_revision_xml_file(revision_id)
34
except bzrlib.errors.NoSuchRevision:
33
return branch.repository.has_revision(revision_id)
37
35
def fetch_steps(self, br_a, br_b, writable_a):
38
36
"""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
38
# TODO RBC 20060201 make this a repository test.
39
repo_b = br_b.repository
40
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
41
self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
42
self.assertEquals(len(br_b.revision_history()), 7)
43
self.assertEquals(greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0], 0)
48
44
# 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])
45
self.assertEquals(len(br_b.revision_history()), 7)
46
self.assertFalse(repo_b.has_revision(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])
48
# fetching the next revision up in sample data copies one revision
49
self.assertEquals(greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0], 1)
50
self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
51
self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
52
self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
58
54
# When a non-branch ancestor is missing, it should be unlisted...
59
55
# as its not reference from the inventory weave.
60
br_b4 = new_branch('br_4')
56
br_b4 = self.make_branch('br_4')
61
57
count, failures = greedy_fetch(br_b4, br_b)
62
58
self.assertEqual(count, 7)
63
59
self.assertEqual(failures, [])
65
61
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])
62
self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
63
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
65
br_b2 = self.make_branch('br_b2')
66
self.assertEquals(greedy_fetch(br_b2, br_b)[0], 7)
67
self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
68
self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
69
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
71
br_a2 = self.make_branch('br_a2')
72
self.assertEquals(greedy_fetch(br_a2, br_a)[0], 9)
73
self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
74
self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
75
self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
77
br_a3 = self.make_branch('br_a3')
78
# pulling a branch with no revisions grabs nothing, regardless of
79
# whats in the inventory.
80
self.assertEquals(greedy_fetch(br_a3, br_a2)[0], 0)
83
81
for revno in range(4):
84
assert not has_revision(br_a3, br_a.revision_history()[revno])
83
br_a3.repository.has_revision(br_a.revision_history()[revno]))
85
84
self.assertEqual(greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0], 3)
85
# pull the 3 revisions introduced by a@u-0-3
86
86
fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
87
assert fetched == 3, "fetched %d instead of 3" % fetched
87
self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
88
88
# InstallFailed should be raised if the branch is missing the revision
89
89
# that was requested.
90
90
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
94
94
br_a2.append_revision('a-b-c')
95
95
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
99
97
#TODO: test that fetch correctly does reweaving when needed. RBC 20051008
101
class TestFetch(TestCaseInTempDir):
98
# Note that this means - updating the weave when ghosts are filled in to
99
# add the right parents.
102
class TestFetch(TestCaseWithTransport):
103
104
def test_fetch(self):
104
105
#highest indices a: 5, b: 7
105
br_a, br_b = make_branches()
106
br_a, br_b = make_branches(self)
106
107
fetch_steps(self, br_a, br_b, br_a)
110
class TestMergeFetch(TestCaseWithTransport):
112
def test_merge_fetches_unrelated(self):
113
"""Merge brings across history from unrelated source"""
114
wt1 = self.make_branch_and_tree('br1')
116
wt1.commit(message='rev 1-1', rev_id='1-1')
117
wt1.commit(message='rev 1-2', rev_id='1-2')
118
wt2 = self.make_branch_and_tree('br2')
120
wt2.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"""
127
wt1 = self.make_branch_and_tree('br1')
129
wt1.commit(message='rev 1-1', rev_id='1-1')
130
dir_2 = br1.bzrdir.sprout('br2')
131
br2 = dir_2.open_branch()
132
wt1.commit(message='rev 1-2', rev_id='1-2')
133
dir_2.open_workingtree().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
dir_2 = br1.bzrdir.sprout('br2')
156
br2 = dir_2.open_branch()
157
wt2 = dir_2.open_workingtree()
158
self.build_tree_contents([('br1/file', 'original from 1\n')])
159
wt1.commit(message='rev 1-2', rev_id='1-2')
160
self.build_tree_contents([('br1/file', 'agreement\n')])
161
wt1.commit(message='rev 1-3', rev_id='1-3')
162
self.build_tree_contents([('br2/file', 'contents in 2\n')])
163
wt2.commit(message='rev 2-1', rev_id='2-1')
164
self.build_tree_contents([('br2/file', 'agreement\n')])
165
wt2.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(
177
br2.repository.revision_tree(
178
rev_id).get_file_text('this-file-id'), text)
109
181
class TestHttpFetch(TestCaseWithWebserver):
112
super(TestHttpFetch, self).setUp()
182
# FIXME RBC 20060124 this really isn't web specific, perhaps an
183
# instrumented readonly transport? Can we do an instrumented
184
# adapter and use self.get_readonly_url ?
115
186
def test_fetch(self):
116
187
#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))
188
br_a, br_b = make_branches(self)
189
br_rem_a = Branch.open(self.get_readonly_url('branch1'))
119
190
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
192
def test_weaves_are_retrieved_once(self):
128
193
self.build_tree(("source/", "source/file", "target/"))
129
branch = Branch.initialize("source")
130
branch.add(["file"], ["id"])
131
branch.commit("added file")
194
wt = self.make_branch_and_tree('source')
196
wt.add(["file"], ["id"])
197
wt.commit("added file")
132
198
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/"))
199
wt.commit("changed file")
200
target = BzrDir.create_branch_and_repo("target/")
201
source = Branch.open(self.get_readonly_url("source/"))
136
202
self.assertEqual(greedy_fetch(target, source), (2, []))
137
203
# this is the path to the literal file. As format changes
138
204
# occur it needs to be updated. FIXME: ask the store for the
140
206
weave_suffix = 'weaves/ce/id.weave HTTP/1.1" 200 -'
141
207
self.assertEqual(1,
142
len([log for log in self.weblogs if log.endswith(weave_suffix)]))
208
len([log for log in self.get_readonly_server().logs if log.endswith(weave_suffix)]))
143
209
inventory_weave_suffix = 'inventory.weave HTTP/1.1" 200 -'
144
210
self.assertEqual(1,
145
len([log for log in self.weblogs if log.endswith(
211
len([log for log in self.get_readonly_server().logs if log.endswith(
146
212
inventory_weave_suffix)]))
147
213
# this r-h check test will prevent regressions, but it currently already
148
214
# passes, before the patch to cache-rh is applied :[
149
215
revision_history_suffix = 'revision-history HTTP/1.1" 200 -'
150
216
self.assertEqual(1,
151
len([log for log in self.weblogs if log.endswith(
217
len([log for log in self.get_readonly_server().logs if log.endswith(
152
218
revision_history_suffix)]))
219
# FIXME naughty poking in there.
220
self.get_readonly_server().logs = []
154
221
# check there is nothing more to fetch
155
source = Branch.open(self.get_remote_url("source/"))
222
source = Branch.open(self.get_readonly_url("source/"))
156
223
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))
224
self.failUnless(self.get_readonly_server().logs[0].endswith('branch-format HTTP/1.1" 200 -'))
225
self.failUnless(self.get_readonly_server().logs[1].endswith('revision-history HTTP/1.1" 200 -'))
226
self.assertEqual(2, len(self.get_readonly_server().logs))
added
removed
bzrlib/tests/test_fetch.py
