1
# Copyright (C) 2005 by Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21
from bzrlib.tests.test_revision import make_branches
22
from bzrlib.trace import mutter
23
from bzrlib.branch import Branch
24
from bzrlib.fetch import greedy_fetch
25
from bzrlib.merge import merge
26
from bzrlib.clone import copy_branch
28
from bzrlib.tests import TestCaseInTempDir
29
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
32
def has_revision(branch, revision_id):
34
branch.get_revision_xml(revision_id)
36
except bzrlib.errors.NoSuchRevision:
40
def fetch_steps(self, br_a, br_b, writable_a):
41
"""A foreign test method for testing fetch locally and remotely."""
44
return Branch.initialize(name)
46
self.assertFalse(has_revision(br_b, br_a.revision_history()[3]))
47
self.assert_(has_revision(br_b, br_a.revision_history()[2]))
48
self.assertEquals(len(br_b.revision_history()), 7)
49
self.assertEquals(greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0], 0)
51
# greedy_fetch is not supposed to alter the revision history
52
self.assertEquals(len(br_b.revision_history()), 7)
53
self.assertFalse(has_revision(br_b, br_a.revision_history()[3]))
55
self.assertEquals(len(br_b.revision_history()), 7)
56
self.assertEquals(greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0], 1)
57
self.assert_(has_revision(br_b, br_a.revision_history()[3]))
58
self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
59
self.assert_(has_revision(br_a, br_b.revision_history()[5]))
61
# When a non-branch ancestor is missing, it should be unlisted...
62
# as its not reference from the inventory weave.
63
br_b4 = new_branch('br_4')
64
count, failures = greedy_fetch(br_b4, br_b)
65
self.assertEqual(count, 7)
66
self.assertEqual(failures, [])
68
self.assertEqual(greedy_fetch(writable_a, br_b)[0], 1)
69
self.assert_(has_revision(br_a, br_b.revision_history()[3]))
70
self.assert_(has_revision(br_a, br_b.revision_history()[4]))
72
br_b2 = new_branch('br_b2')
73
self.assertEquals(greedy_fetch(br_b2, br_b)[0], 7)
74
self.assert_(has_revision(br_b2, br_b.revision_history()[4]))
75
self.assert_(has_revision(br_b2, br_a.revision_history()[2]))
76
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
78
br_a2 = new_branch('br_a2')
79
self.assertEquals(greedy_fetch(br_a2, br_a)[0], 9)
80
self.assert_(has_revision(br_a2, br_b.revision_history()[4]))
81
self.assert_(has_revision(br_a2, br_a.revision_history()[3]))
82
self.assert_(has_revision(br_a2, br_a.revision_history()[2]))
84
br_a3 = new_branch('br_a3')
85
self.assertEquals(greedy_fetch(br_a3, br_a2)[0], 0)
86
for revno in range(4):
87
self.assertFalse(has_revision(br_a3, br_a.revision_history()[revno]))
88
self.assertEqual(greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0], 3)
89
fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
90
self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
91
# InstallFailed should be raised if the branch is missing the revision
93
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
95
# InstallFailed should be raised if the branch is missing a revision
96
# from its own revision history
97
br_a2.append_revision('a-b-c')
98
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
102
#TODO: test that fetch correctly does reweaving when needed. RBC 20051008
104
class TestFetch(TestCaseInTempDir):
106
def test_fetch(self):
107
#highest indices a: 5, b: 7
108
br_a, br_b = make_branches(self)
109
fetch_steps(self, br_a, br_b, br_a)
112
class TestMergeFetch(TestCaseInTempDir):
114
def test_merge_fetches_unrelated(self):
115
"""Merge brings across history from unrelated source"""
117
br1 = Branch.initialize('br1')
118
br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
119
br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
121
br2 = Branch.initialize('br2')
122
br2.working_tree().commit(message='rev 2-1', rev_id='2-1')
123
merge(other_revision=['br1', -1], base_revision=['br1', 0],
125
self._check_revs_present(br2)
127
def test_merge_fetches(self):
128
"""Merge brings across history from source"""
130
br1 = Branch.initialize('br1')
131
br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
132
copy_branch(br1, 'br2')
133
br2 = Branch.open('br2')
134
br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
135
br2.working_tree().commit(message='rev 2-1', rev_id='2-1')
136
merge(other_revision=['br1', -1], base_revision=[None, None],
138
self._check_revs_present(br2)
140
def _check_revs_present(self, br2):
141
for rev_id in '1-1', '1-2', '2-1':
142
self.assertTrue(br2.has_revision(rev_id))
143
rev = br2.get_revision(rev_id)
144
self.assertEqual(rev.revision_id, rev_id)
145
self.assertTrue(br2.get_inventory(rev_id))
149
class TestMergeFileHistory(TestCaseInTempDir):
151
TestCaseInTempDir.setUp(self)
153
br1 = Branch.initialize('br1')
154
self.build_tree_contents([('br1/file', 'original contents\n')])
155
br1.working_tree().add(['file'], ['this-file-id'])
156
br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
157
copy_branch(br1, 'br2')
158
br2 = Branch.open('br2')
159
self.build_tree_contents([('br1/file', 'original from 1\n')])
160
br1.working_tree().commit(message='rev 1-2', rev_id='1-2')
161
self.build_tree_contents([('br1/file', 'agreement\n')])
162
br1.working_tree().commit(message='rev 1-3', rev_id='1-3')
163
self.build_tree_contents([('br2/file', 'contents in 2\n')])
164
br2.working_tree().commit(message='rev 2-1', rev_id='2-1')
165
self.build_tree_contents([('br2/file', 'agreement\n')])
166
br2.working_tree().commit(message='rev 2-2', rev_id='2-2')
168
def test_merge_fetches_file_history(self):
169
"""Merge brings across file histories"""
170
br2 = Branch.open('br2')
171
merge(other_revision=['br1', -1], base_revision=[None, None],
173
for rev_id, text in [('1-2', 'original from 1\n'),
174
('1-3', 'agreement\n'),
175
('2-1', 'contents in 2\n'),
176
('2-2', 'agreement\n')]:
177
self.assertEqualDiff(br2.revision_tree(rev_id).get_file_text('this-file-id'),
183
class TestHttpFetch(TestCaseWithWebserver):
185
def test_fetch(self):
186
#highest indices a: 5, b: 7
187
br_a, br_b = make_branches(self)
188
br_rem_a = Branch.open(self.get_remote_url(br_a._transport.base))
189
fetch_steps(self, br_rem_a, br_b, br_a)
191
def test_weaves_are_retrieved_once(self):
192
self.build_tree(("source/", "source/file", "target/"))
193
branch = Branch.initialize("source")
194
branch.working_tree().add(["file"], ["id"])
195
branch.working_tree().commit("added file")
196
print >>open("source/file", 'w'), "blah"
197
branch.working_tree().commit("changed file")
198
target = Branch.initialize("target/")
199
source = Branch.open(self.get_remote_url("source/"))
200
self.assertEqual(greedy_fetch(target, source), (2, []))
201
# this is the path to the literal file. As format changes
202
# occur it needs to be updated. FIXME: ask the store for the
204
weave_suffix = 'weaves/ce/id.weave HTTP/1.1" 200 -'
206
len([log for log in self.server.logs if log.endswith(weave_suffix)]))
207
inventory_weave_suffix = 'inventory.weave HTTP/1.1" 200 -'
209
len([log for log in self.server.logs if log.endswith(
210
inventory_weave_suffix)]))
211
# this r-h check test will prevent regressions, but it currently already
212
# passes, before the patch to cache-rh is applied :[
213
revision_history_suffix = 'revision-history HTTP/1.1" 200 -'
215
len([log for log in self.server.logs if log.endswith(
216
revision_history_suffix)]))
217
# FIXME naughty poking in there.
218
self.server.logs = []
219
# check there is nothing more to fetch
220
source = Branch.open(self.get_remote_url("source/"))
221
self.assertEqual(greedy_fetch(target, source), (0, []))
222
self.failUnless(self.server.logs[0].endswith('branch-format HTTP/1.1" 200 -'))
223
self.failUnless(self.server.logs[1].endswith('revision-history HTTP/1.1" 200 -'))
224
self.assertEqual(2, len(self.server.logs))
added
removed
bzrlib/tests/test_fetch.py
