1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
|
# Copyright (C) 2005, 2007 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import os
import re
import sys
import bzrlib
from bzrlib import (
bzrdir,
errors,
merge,
repository,
)
from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir
from bzrlib.repofmt import knitrepo
from bzrlib.symbol_versioning import (
zero_ninetyone,
)
from bzrlib.tests import TestCaseWithTransport
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
from bzrlib.tests.test_revision import make_branches
from bzrlib.trace import mutter
from bzrlib.upgrade import Convert
from bzrlib.workingtree import WorkingTree
# These tests are a bit old; please instead add new tests into
# interrepository_implementations/ so they'll run on all relevant
# combinations.
def has_revision(branch, revision_id):
return branch.repository.has_revision(revision_id)
def fetch_steps(self, br_a, br_b, writable_a):
"""A foreign test method for testing fetch locally and remotely."""
# TODO RBC 20060201 make this a repository test.
repo_b = br_b.repository
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
self.assertEquals(len(br_b.revision_history()), 7)
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[2])[0], 0)
# branch.fetch is not supposed to alter the revision history
self.assertEquals(len(br_b.revision_history()), 7)
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
# fetching the next revision up in sample data copies one revision
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[3])[0], 1)
self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
# When a non-branch ancestor is missing, it should be unlisted...
# as its not reference from the inventory weave.
br_b4 = self.make_branch('br_4')
count, failures = br_b4.fetch(br_b)
self.assertEqual(count, 7)
self.assertEqual(failures, [])
self.assertEqual(writable_a.fetch(br_b)[0], 1)
self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
br_b2 = self.make_branch('br_b2')
self.assertEquals(br_b2.fetch(br_b)[0], 7)
self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
br_a2 = self.make_branch('br_a2')
self.assertEquals(br_a2.fetch(br_a)[0], 9)
self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
br_a3 = self.make_branch('br_a3')
# pulling a branch with no revisions grabs nothing, regardless of
# whats in the inventory.
self.assertEquals(br_a3.fetch(br_a2)[0], 0)
for revno in range(4):
self.assertFalse(
br_a3.repository.has_revision(br_a.revision_history()[revno]))
self.assertEqual(br_a3.fetch(br_a2, br_a.revision_history()[2])[0], 3)
# pull the 3 revisions introduced by a@u-0-3
fetched = br_a3.fetch(br_a2, br_a.revision_history()[3])[0]
self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched)
# InstallFailed should be raised if the branch is missing the revision
# that was requested.
self.assertRaises(errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')
# TODO: Test trying to fetch from a branch that points to a revision not
# actually present in its repository. Not every branch format allows you
# to directly point to such revisions, so it's a bit complicated to
# construct. One way would be to uncommit and gc the revision, but not
# every branch supports that. -- mbp 20070814
#TODO: test that fetch correctly does reweaving when needed. RBC 20051008
# Note that this means - updating the weave when ghosts are filled in to
# add the right parents.
class TestFetch(TestCaseWithTransport):
def test_fetch(self):
#highest indices a: 5, b: 7
br_a, br_b = make_branches(self, format='dirstate-tags')
fetch_steps(self, br_a, br_b, br_a)
def test_fetch_self(self):
wt = self.make_branch_and_tree('br')
self.assertEqual(wt.branch.fetch(wt.branch), (0, []))
def test_fetch_root_knit(self):
"""Ensure that knit2.fetch() updates the root knit
This tests the case where the root has a new revision, but there are no
corresponding filename, parent, contents or other changes.
"""
knit1_format = bzrdir.BzrDirMetaFormat1()
knit1_format.repository_format = knitrepo.RepositoryFormatKnit1()
knit2_format = bzrdir.BzrDirMetaFormat1()
knit2_format.repository_format = knitrepo.RepositoryFormatKnit3()
# we start with a knit1 repository because that causes the
# root revision to change for each commit, even though the content,
# parent, name, and other attributes are unchanged.
tree = self.make_branch_and_tree('tree', knit1_format)
tree.set_root_id('tree-root')
tree.commit('rev1', rev_id='rev1')
tree.commit('rev2', rev_id='rev2')
# Now we convert it to a knit2 repository so that it has a root knit
Convert(tree.basedir, knit2_format)
tree = WorkingTree.open(tree.basedir)
branch = self.make_branch('branch', format=knit2_format)
branch.pull(tree.branch, stop_revision='rev1')
repo = branch.repository
root_knit = repo.weave_store.get_weave('tree-root',
repo.get_transaction())
# Make sure fetch retrieved only what we requested
self.assertTrue('rev1' in root_knit)
self.assertTrue('rev2' not in root_knit)
branch.pull(tree.branch)
root_knit = repo.weave_store.get_weave('tree-root',
repo.get_transaction())
# Make sure that the next revision in the root knit was retrieved,
# even though the text, name, parent_id, etc., were unchanged.
self.assertTrue('rev2' in root_knit)
def test_fetch_incompatible(self):
knit_tree = self.make_branch_and_tree('knit', format='knit')
knit3_tree = self.make_branch_and_tree('knit3',
format='dirstate-with-subtree')
knit3_tree.commit('blah')
self.assertRaises(errors.IncompatibleRepositories,
knit_tree.branch.fetch, knit3_tree.branch)
class TestMergeFetch(TestCaseWithTransport):
def test_merge_fetches_unrelated(self):
"""Merge brings across history from unrelated source"""
wt1 = self.make_branch_and_tree('br1')
br1 = wt1.branch
wt1.commit(message='rev 1-1', rev_id='1-1')
wt1.commit(message='rev 1-2', rev_id='1-2')
wt2 = self.make_branch_and_tree('br2')
br2 = wt2.branch
wt2.commit(message='rev 2-1', rev_id='2-1')
wt2.merge_from_branch(br1, from_revision='null:')
self._check_revs_present(br2)
def test_merge_fetches(self):
"""Merge brings across history from source"""
wt1 = self.make_branch_and_tree('br1')
br1 = wt1.branch
wt1.commit(message='rev 1-1', rev_id='1-1')
dir_2 = br1.bzrdir.sprout('br2')
br2 = dir_2.open_branch()
wt1.commit(message='rev 1-2', rev_id='1-2')
wt2 = dir_2.open_workingtree()
wt2.commit(message='rev 2-1', rev_id='2-1')
wt2.merge_from_branch(br1)
self._check_revs_present(br2)
def _check_revs_present(self, br2):
for rev_id in '1-1', '1-2', '2-1':
self.assertTrue(br2.repository.has_revision(rev_id))
rev = br2.repository.get_revision(rev_id)
self.assertEqual(rev.revision_id, rev_id)
self.assertTrue(br2.repository.get_inventory(rev_id))
class TestMergeFileHistory(TestCaseWithTransport):
def setUp(self):
super(TestMergeFileHistory, self).setUp()
wt1 = self.make_branch_and_tree('br1')
br1 = wt1.branch
self.build_tree_contents([('br1/file', 'original contents\n')])
wt1.add('file', 'this-file-id')
wt1.commit(message='rev 1-1', rev_id='1-1')
dir_2 = br1.bzrdir.sprout('br2')
br2 = dir_2.open_branch()
wt2 = dir_2.open_workingtree()
self.build_tree_contents([('br1/file', 'original from 1\n')])
wt1.commit(message='rev 1-2', rev_id='1-2')
self.build_tree_contents([('br1/file', 'agreement\n')])
wt1.commit(message='rev 1-3', rev_id='1-3')
self.build_tree_contents([('br2/file', 'contents in 2\n')])
wt2.commit(message='rev 2-1', rev_id='2-1')
self.build_tree_contents([('br2/file', 'agreement\n')])
wt2.commit(message='rev 2-2', rev_id='2-2')
def test_merge_fetches_file_history(self):
"""Merge brings across file histories"""
br2 = Branch.open('br2')
br1 = Branch.open('br1')
wt2 = WorkingTree.open('br2').merge_from_branch(br1)
for rev_id, text in [('1-2', 'original from 1\n'),
('1-3', 'agreement\n'),
('2-1', 'contents in 2\n'),
('2-2', 'agreement\n')]:
self.assertEqualDiff(
br2.repository.revision_tree(
rev_id).get_file_text('this-file-id'), text)
class TestHttpFetch(TestCaseWithWebserver):
# FIXME RBC 20060124 this really isn't web specific, perhaps an
# instrumented readonly transport? Can we do an instrumented
# adapter and use self.get_readonly_url ?
def test_fetch(self):
#highest indices a: 5, b: 7
br_a, br_b = make_branches(self)
br_rem_a = Branch.open(self.get_readonly_url('branch1'))
fetch_steps(self, br_rem_a, br_b, br_a)
def _count_log_matches(self, target, logs):
"""Count the number of times the target file pattern was fetched in an http log"""
get_succeeds_re = re.compile(
'.*"GET .*%s HTTP/1.1" 20[06] - "-" "bzr/%s' %
( target, bzrlib.__version__))
c = 0
for line in logs:
if get_succeeds_re.match(line):
c += 1
return c
def test_weaves_are_retrieved_once(self):
self.build_tree(("source/", "source/file", "target/"))
wt = self.make_branch_and_tree('source')
branch = wt.branch
wt.add(["file"], ["id"])
wt.commit("added file")
open("source/file", 'w').write("blah\n")
wt.commit("changed file")
target = BzrDir.create_branch_and_repo("target/")
source = Branch.open(self.get_readonly_url("source/"))
self.assertEqual(target.fetch(source), (2, []))
# this is the path to the literal file. As format changes
# occur it needs to be updated. FIXME: ask the store for the
# path.
self.log("web server logs are:")
http_logs = self.get_readonly_server().logs
self.log('\n'.join(http_logs))
# unfortunately this log entry is branch format specific. We could
# factor out the 'what files does this format use' to a method on the
# repository, which would let us to this generically. RBC 20060419
self.assertEqual(1, self._count_log_matches('/ce/id.kndx', http_logs))
self.assertEqual(1, self._count_log_matches('/ce/id.knit', http_logs))
self.assertEqual(1, self._count_log_matches('inventory.kndx', http_logs))
# this r-h check test will prevent regressions, but it currently already
# passes, before the patch to cache-rh is applied :[
self.assertTrue(1 >= self._count_log_matches('revision-history',
http_logs))
self.assertTrue(1 >= self._count_log_matches('last-revision',
http_logs))
# FIXME naughty poking in there.
self.get_readonly_server().logs = []
# check there is nothing more to fetch
source = Branch.open(self.get_readonly_url("source/"))
self.assertEqual(target.fetch(source), (0, []))
# should make just two requests
http_logs = self.get_readonly_server().logs
self.log("web server logs are:")
self.log('\n'.join(http_logs))
self.assertEqual(1, self._count_log_matches('branch-format', http_logs))
self.assertEqual(1, self._count_log_matches('branch/format', http_logs))
self.assertEqual(1, self._count_log_matches('repository/format', http_logs))
self.assertTrue(1 >= self._count_log_matches('revision-history',
http_logs))
self.assertTrue(1 >= self._count_log_matches('last-revision',
http_logs))
self.assertEqual(4, len(http_logs))
|