15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20
28
from bzrlib.branch import Branch
21
29
from bzrlib.bzrdir import BzrDir
22
from bzrlib.builtins import merge
30
from bzrlib.repofmt import knitrepo
31
from bzrlib.symbol_versioning import (
24
34
from bzrlib.tests import TestCaseWithTransport
25
35
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
26
36
from bzrlib.tests.test_revision import make_branches
27
37
from bzrlib.trace import mutter
38
from bzrlib.upgrade import Convert
28
39
from bzrlib.workingtree import WorkingTree
41
# These tests are a bit old; please instead add new tests into
42
# interrepository_implementations/ so they'll run on all relevant
31
46
def has_revision(branch, revision_id):
32
47
return branch.repository.has_revision(revision_id)
86
101
self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
87
102
# InstallFailed should be raised if the branch is missing the revision
88
103
# that was requested.
89
self.assertRaises(bzrlib.errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')
90
# InstallFailed should be raised if the branch is missing a revision
91
# from its own revision history
92
br_a2.append_revision('a-b-c')
93
self.assertRaises(bzrlib.errors.InstallFailed, br_a3.fetch, br_a2)
104
self.assertRaises(errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')
95
# TODO: jam 20051218 Branch should no longer allow append_revision for revisions
96
# which don't exist. So this test needs to be rewritten
97
# RBC 20060403 the way to do this is to uncommit the revision from the
98
# repository after the commit
106
# TODO: Test trying to fetch from a branch that points to a revision not
107
# actually present in its repository. Not every branch format allows you
108
# to directly point to such revisions, so it's a bit complicated to
109
# construct. One way would be to uncommit and gc the revision, but not
110
# every branch supports that. -- mbp 20070814
100
112
#TODO: test that fetch correctly does reweaving when needed. RBC 20051008
101
113
# Note that this means - updating the weave when ghosts are filled in to
107
119
def test_fetch(self):
108
120
#highest indices a: 5, b: 7
109
br_a, br_b = make_branches(self)
121
br_a, br_b = make_branches(self, format='dirstate-tags')
110
122
fetch_steps(self, br_a, br_b, br_a)
112
124
def test_fetch_self(self):
113
125
wt = self.make_branch_and_tree('br')
114
126
self.assertEqual(wt.branch.fetch(wt.branch), (0, []))
128
def test_fetch_root_knit(self):
129
"""Ensure that knit2.fetch() updates the root knit
131
This tests the case where the root has a new revision, but there are no
132
corresponding filename, parent, contents or other changes.
134
knit1_format = bzrdir.BzrDirMetaFormat1()
135
knit1_format.repository_format = knitrepo.RepositoryFormatKnit1()
136
knit2_format = bzrdir.BzrDirMetaFormat1()
137
knit2_format.repository_format = knitrepo.RepositoryFormatKnit3()
138
# we start with a knit1 repository because that causes the
139
# root revision to change for each commit, even though the content,
140
# parent, name, and other attributes are unchanged.
141
tree = self.make_branch_and_tree('tree', knit1_format)
142
tree.set_root_id('tree-root')
143
tree.commit('rev1', rev_id='rev1')
144
tree.commit('rev2', rev_id='rev2')
146
# Now we convert it to a knit2 repository so that it has a root knit
147
Convert(tree.basedir, knit2_format)
148
tree = WorkingTree.open(tree.basedir)
149
branch = self.make_branch('branch', format=knit2_format)
150
branch.pull(tree.branch, stop_revision='rev1')
151
repo = branch.repository
152
root_knit = repo.weave_store.get_weave('tree-root',
153
repo.get_transaction())
154
# Make sure fetch retrieved only what we requested
155
self.assertTrue('rev1' in root_knit)
156
self.assertTrue('rev2' not in root_knit)
157
branch.pull(tree.branch)
158
root_knit = repo.weave_store.get_weave('tree-root',
159
repo.get_transaction())
160
# Make sure that the next revision in the root knit was retrieved,
161
# even though the text, name, parent_id, etc., were unchanged.
162
self.assertTrue('rev2' in root_knit)
164
def test_fetch_incompatible(self):
165
knit_tree = self.make_branch_and_tree('knit', format='knit')
166
knit3_tree = self.make_branch_and_tree('knit3',
167
format='dirstate-with-subtree')
168
knit3_tree.commit('blah')
169
self.assertRaises(errors.IncompatibleRepositories,
170
knit_tree.branch.fetch, knit3_tree.branch)
117
173
class TestMergeFetch(TestCaseWithTransport):
125
181
wt2 = self.make_branch_and_tree('br2')
127
183
wt2.commit(message='rev 2-1', rev_id='2-1')
128
merge(other_revision=['br1', -1], base_revision=['br1', 0],
184
wt2.merge_from_branch(br1, from_revision='null:')
130
185
self._check_revs_present(br2)
132
187
def test_merge_fetches(self):
137
192
dir_2 = br1.bzrdir.sprout('br2')
138
193
br2 = dir_2.open_branch()
139
194
wt1.commit(message='rev 1-2', rev_id='1-2')
140
dir_2.open_workingtree().commit(message='rev 2-1', rev_id='2-1')
141
merge(other_revision=['br1', -1], base_revision=[None, None],
195
wt2 = dir_2.open_workingtree()
196
wt2.commit(message='rev 2-1', rev_id='2-1')
197
wt2.merge_from_branch(br1)
143
198
self._check_revs_present(br2)
145
200
def _check_revs_present(self, br2):
174
229
def test_merge_fetches_file_history(self):
175
230
"""Merge brings across file histories"""
176
231
br2 = Branch.open('br2')
177
merge(other_revision=['br1', -1], base_revision=[None, None],
232
br1 = Branch.open('br1')
233
wt2 = WorkingTree.open('br2').merge_from_branch(br1)
179
234
for rev_id, text in [('1-2', 'original from 1\n'),
180
235
('1-3', 'agreement\n'),
181
236
('2-1', 'contents in 2\n'),
199
254
def _count_log_matches(self, target, logs):
200
255
"""Count the number of times the target file pattern was fetched in an http log"""
201
log_pattern = '%s HTTP/1.1" 200 - "-" "bzr/%s' % \
202
(target, bzrlib.__version__)
256
get_succeeds_re = re.compile(
257
'.*"GET .*%s HTTP/1.1" 20[06] - "-" "bzr/%s' %
258
( target, bzrlib.__version__))
204
260
for line in logs:
205
# TODO: perhaps use a regexp instead so we can match more
207
if line.find(log_pattern) > -1:
261
if get_succeeds_re.match(line):
214
268
branch = wt.branch
215
269
wt.add(["file"], ["id"])
216
270
wt.commit("added file")
217
print >>open("source/file", 'w'), "blah"
271
open("source/file", 'w').write("blah\n")
218
272
wt.commit("changed file")
219
273
target = BzrDir.create_branch_and_repo("target/")
220
274
source = Branch.open(self.get_readonly_url("source/"))
221
275
self.assertEqual(target.fetch(source), (2, []))
222
log_pattern = '%%s HTTP/1.1" 200 - "-" "bzr/%s' % bzrlib.__version__
223
276
# this is the path to the literal file. As format changes
224
277
# occur it needs to be updated. FIXME: ask the store for the
234
287
self.assertEqual(1, self._count_log_matches('inventory.kndx', http_logs))
235
288
# this r-h check test will prevent regressions, but it currently already
236
289
# passes, before the patch to cache-rh is applied :[
237
self.assertEqual(1, self._count_log_matches('revision-history', http_logs))
290
self.assertTrue(1 >= self._count_log_matches('revision-history',
292
self.assertTrue(1 >= self._count_log_matches('last-revision',
238
294
# FIXME naughty poking in there.
239
295
self.get_readonly_server().logs = []
240
296
# check there is nothing more to fetch
247
303
self.assertEqual(1, self._count_log_matches('branch-format', http_logs))
248
304
self.assertEqual(1, self._count_log_matches('branch/format', http_logs))
249
305
self.assertEqual(1, self._count_log_matches('repository/format', http_logs))
250
self.assertEqual(1, self._count_log_matches('revision-history', http_logs))
306
self.assertTrue(1 >= self._count_log_matches('revision-history',
308
self.assertTrue(1 >= self._count_log_matches('last-revision',
251
310
self.assertEqual(4, len(http_logs))
added
removed
bzrlib/tests/test_fetch.py
