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
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
|
# Copyright (C) 2005 Robey Pointer <robey@lag.net>, 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
"""Tests for branches bound to an sftp branch."""
import os
import bzrlib
from bzrlib.branch import Branch
from bzrlib.bzrdir import (BzrDir,
BzrDirFormat,
BzrDirFormat6,
BzrDirMetaFormat1,
)
import bzrlib.errors as errors
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer, paramiko_loaded
class BoundSFTPBranch(TestCaseWithSFTPServer):
def create_branches(self):
self.build_tree(['base/', 'base/a', 'base/b'])
old_format = BzrDirFormat.get_default_format()
BzrDirFormat.set_default_format(BzrDirMetaFormat1())
try:
wt_base = BzrDir.create_standalone_workingtree('base')
finally:
BzrDirFormat.set_default_format(old_format)
b_base = wt_base.branch
wt_base.add('a')
wt_base.add('b')
wt_base.commit('first', rev_id='r@b-1')
wt_child = b_base.bzrdir.sprout('child').open_workingtree()
self.sftp_base = Branch.open(self.get_url('base'))
wt_child.branch.bind(self.sftp_base)
self.assertEqual(['r@b-1'], b_base.revision_history())
self.assertEqual(['r@b-1'], wt_child.branch.revision_history())
return b_base, wt_child
def tearDown(self):
self.sftp_base = None
bzrlib.transport.sftp.clear_connection_cache()
super(BoundSFTPBranch, self).tearDown()
def test_simple_binding(self):
self.build_tree(['base/', 'base/a', 'base/b', 'child/'])
wt_base = BzrDir.create_standalone_workingtree('base')
wt_base.add('a')
wt_base.add('b')
wt_base.commit('first', rev_id='r@b-1')
b_base = wt_base.branch
old_format = BzrDirFormat.get_default_format()
BzrDirFormat.set_default_format(BzrDirMetaFormat1())
try:
b_child = BzrDir.create_branch_convenience('child')
finally:
BzrDirFormat.set_default_format(old_format)
self.assertEqual(None, b_child.get_bound_location())
self.assertEqual(None, b_child.get_master_branch())
sftp_b_base = Branch.open(self.get_url('base'))
b_child.bind(sftp_b_base)
self.assertEqual(sftp_b_base.base, b_child.get_bound_location())
# this line is more of a working tree test line, but - what the hey.
b_child.bzrdir.open_workingtree().update()
self.failUnlessExists('child/a')
self.failUnlessExists('child/b')
b_child.unbind()
self.assertEqual(None, b_child.get_bound_location())
def test_bound_commit(self):
b_base, wt_child = self.create_branches()
open('child/a', 'wb').write('new contents\n')
wt_child.commit('modified a', rev_id='r@c-2')
self.assertEqual(['r@b-1', 'r@c-2'], wt_child.branch.revision_history())
self.assertEqual(['r@b-1', 'r@c-2'], b_base.revision_history())
def test_bound_fail(self):
# Make sure commit fails if out of date.
b_base, wt_child = self.create_branches()
open('base/a', 'wb').write('new base contents\n')
b_base.bzrdir.open_workingtree().commit('base', rev_id='r@b-2')
open('child/b', 'wb').write('new b child contents\n')
self.assertRaises(errors.BoundBranchOutOfDate,
wt_child.commit, 'child', rev_id='r@c-2')
sftp_b_base = Branch.open(self.get_url('base'))
# This is all that cmd_update does
wt_child.pull(sftp_b_base, overwrite=False)
wt_child.commit('child', rev_id='r@c-3')
self.assertEqual(['r@b-1', 'r@b-2', 'r@c-3'],
wt_child.branch.revision_history())
self.assertEqual(['r@b-1', 'r@b-2', 'r@c-3'],
b_base.revision_history())
self.assertEqual(['r@b-1', 'r@b-2', 'r@c-3'],
sftp_b_base.revision_history())
def test_double_binding(self):
b_base, wt_child = self.create_branches()
wt_child2 = wt_child.bzrdir.sprout('child2').open_workingtree()
wt_child2.branch.bind(wt_child.branch)
open('child2/a', 'wb').write('new contents\n')
self.assertRaises(errors.CommitToDoubleBoundBranch,
wt_child2.commit, 'child2', rev_id='r@d-2')
def test_unbinding(self):
from bzrlib.transport import get_transport
b_base, wt_child = self.create_branches()
# TestCaseWithSFTPServer only allows you to connect one time
# to the SFTP server. So we have to create a connection and
# keep it around, so that it can be reused
__unused_t = get_transport(self.get_url('.'))
wt_base = b_base.bzrdir.open_workingtree()
open('base/a', 'wb').write('new base contents\n')
wt_base.commit('base', rev_id='r@b-2')
open('child/b', 'wb').write('new b child contents\n')
self.assertRaises(errors.BoundBranchOutOfDate,
wt_child.commit, 'child', rev_id='r@c-2')
self.assertEqual(['r@b-1'], wt_child.branch.revision_history())
wt_child.branch.unbind()
wt_child.commit('child', rev_id='r@c-2')
self.assertEqual(['r@b-1', 'r@c-2'], wt_child.branch.revision_history())
self.assertEqual(['r@b-1', 'r@b-2'], b_base.revision_history())
sftp_b_base = Branch.open(self.get_url('base'))
self.assertRaises(errors.DivergedBranches,
wt_child.branch.bind, sftp_b_base)
def test_commit_remote_bound(self):
# Make sure it is detected if the current base
# suddenly is bound when child goes to commit
b_base, wt_child = self.create_branches()
b_base.bzrdir.sprout('newbase')
sftp_b_base = Branch.open(self.get_url('base'))
sftp_b_newbase = Branch.open(self.get_url('newbase'))
sftp_b_base.bind(sftp_b_newbase)
open('child/a', 'wb').write('new contents\n')
self.assertRaises(errors.CommitToDoubleBoundBranch,
wt_child.commit, 'failure', rev_id='r@c-2')
self.assertEqual(['r@b-1'], b_base.revision_history())
self.assertEqual(['r@b-1'], wt_child.branch.revision_history())
self.assertEqual(['r@b-1'], sftp_b_newbase.revision_history())
def test_pull_updates_both(self):
b_base, wt_child = self.create_branches()
wt_newchild = b_base.bzrdir.sprout('newchild').open_workingtree()
open('newchild/b', 'wb').write('newchild b contents\n')
wt_newchild.commit('newchild', rev_id='r@d-2')
self.assertEqual(['r@b-1', 'r@d-2'], wt_newchild.branch.revision_history())
wt_child.pull(wt_newchild.branch)
self.assertEqual(['r@b-1', 'r@d-2'], wt_child.branch.revision_history())
self.assertEqual(['r@b-1', 'r@d-2'], b_base.revision_history())
def test_bind_diverged(self):
from bzrlib.builtins import merge
b_base, wt_child = self.create_branches()
wt_child.branch.unbind()
open('child/a', 'ab').write('child contents\n')
wt_child.commit('child', rev_id='r@c-2')
self.assertEqual(['r@b-1', 'r@c-2'], wt_child.branch.revision_history())
self.assertEqual(['r@b-1'], b_base.revision_history())
open('base/b', 'ab').write('base contents\n')
b_base.bzrdir.open_workingtree().commit('base', rev_id='r@b-2')
self.assertEqual(['r@b-1', 'r@b-2'], b_base.revision_history())
sftp_b_base = Branch.open(self.get_url('base'))
self.assertRaises(errors.DivergedBranches,
wt_child.branch.bind, sftp_b_base)
# TODO: jam 20051230 merge_inner doesn't set pending merges
# Is this on purpose?
# merge_inner also doesn't fetch any missing revisions
#merge_inner(wt_child.branch, sftp_b_base.revision_tree('r@b-2'),
# wt_child.branch.revision_tree('r@b-1'))
# TODO: jam 20051230 merge(..., (None, None), ...) seems to
# cause an infinite loop of some sort. It definitely doesn't
# work, you have to use list notation
merge((sftp_b_base.base, 2), [None, None], this_dir=wt_child.branch.base)
self.assertEqual(['r@b-2'], wt_child.pending_merges())
wt_child.commit('merged', rev_id='r@c-3')
# After a merge, trying to bind again should succeed
# by pushing the new change to base
wt_child.branch.bind(sftp_b_base)
self.assertEqual(['r@b-1', 'r@c-2', 'r@c-3'],
b_base.revision_history())
self.assertEqual(['r@b-1', 'r@c-2', 'r@c-3'],
wt_child.branch.revision_history())
def test_bind_parent_ahead(self):
b_base, wt_child = self.create_branches()
wt_child.branch.unbind()
open('a', 'ab').write('base changes\n')
wt_base = b_base.bzrdir.open_workingtree()
wt_base.commit('base', rev_id='r@b-2')
self.assertEqual(['r@b-1', 'r@b-2'], b_base.revision_history())
self.assertEqual(['r@b-1'], wt_child.branch.revision_history())
sftp_b_base = Branch.open(self.get_url('base'))
wt_child.branch.bind(sftp_b_base)
self.assertEqual(['r@b-1', 'r@b-2'], wt_child.branch.revision_history())
wt_child.branch.unbind()
# Check and make sure it also works if parent is ahead multiple
wt_base.commit('base 3', rev_id='r@b-3', allow_pointless=True)
wt_base.commit('base 4', rev_id='r@b-4', allow_pointless=True)
wt_base.commit('base 5', rev_id='r@b-5', allow_pointless=True)
self.assertEqual(['r@b-1', 'r@b-2', 'r@b-3', 'r@b-4', 'r@b-5'],
b_base.revision_history())
self.assertEqual(['r@b-1', 'r@b-2'], wt_child.branch.revision_history())
wt_child.branch.bind(sftp_b_base)
self.assertEqual(['r@b-1', 'r@b-2', 'r@b-3', 'r@b-4', 'r@b-5'],
wt_child.branch.revision_history())
def test_bind_child_ahead(self):
b_base, wt_child = self.create_branches()
wt_child.branch.unbind()
wt_child.commit('child', rev_id='r@c-2', allow_pointless=True)
self.assertEqual(['r@b-1', 'r@c-2'], wt_child.branch.revision_history())
self.assertEqual(['r@b-1'], b_base.revision_history())
sftp_b_base = Branch.open(self.get_url('base'))
wt_child.branch.bind(sftp_b_base)
self.assertEqual(['r@b-1', 'r@c-2'], b_base.revision_history())
# Check and make sure it also works if child is ahead multiple
wt_child.branch.unbind()
wt_child.commit('child 3', rev_id='r@c-3', allow_pointless=True)
wt_child.commit('child 4', rev_id='r@c-4', allow_pointless=True)
wt_child.commit('child 5', rev_id='r@c-5', allow_pointless=True)
self.assertEqual(['r@b-1', 'r@c-2', 'r@c-3', 'r@c-4', 'r@c-5'],
wt_child.branch.revision_history())
self.assertEqual(['r@b-1', 'r@c-2'], b_base.revision_history())
wt_child.branch.bind(sftp_b_base)
self.assertEqual(['r@b-1', 'r@c-2', 'r@c-3', 'r@c-4', 'r@c-5'],
b_base.revision_history())
def test_commit_after_merge(self):
from bzrlib.builtins import merge
b_base, wt_child = self.create_branches()
# We want merge to be able to be a local only
# operation, because it does not alter the branch data.
# But we can't fail afterwards
wt_other = wt_child.bzrdir.sprout('other').open_workingtree()
open('other/c', 'wb').write('file c\n')
wt_other.add('c')
wt_other.commit('adding c', rev_id='r@d-2')
self.failIf(wt_child.branch.repository.has_revision('r@d-2'))
self.failIf(b_base.repository.has_revision('r@d-2'))
# TODO: jam 20051230 merge_inner doesn't set pending merges
# Is this on purpose?
# merge_inner also doesn't fetch any missing revisions
#merge_inner(wt_child.branch, b_other.revision_tree('r@d-2'),
# wt_child.branch.revision_tree('r@b-1'))
merge((wt_other.branch.base, 2), [None, None], this_dir=wt_child.branch.base)
self.failUnlessExists('child/c')
self.assertEqual(['r@d-2'], wt_child.pending_merges())
self.failUnless(wt_child.branch.repository.has_revision('r@d-2'))
self.failIf(b_base.repository.has_revision('r@d-2'))
# Commit should succeed, and cause merged revisions to
# be pulled into base
wt_child.commit('merge other', rev_id='r@c-2')
self.assertEqual(['r@b-1', 'r@c-2'], wt_child.branch.revision_history())
self.assertEqual(['r@b-1', 'r@c-2'], b_base.revision_history())
self.failUnless(b_base.repository.has_revision('r@d-2'))
def test_commit_fails(self):
b_base, wt_child = self.create_branches()
open('a', 'ab').write('child adds some text\n')
del b_base
os.rename('base', 'hidden_base')
self.assertRaises(errors.BoundBranchConnectionFailure,
wt_child.commit, 'added text', rev_id='r@c-2')
def test_pull_fails(self):
b_base, wt_child = self.create_branches()
wt_other = wt_child.bzrdir.sprout('other').open_workingtree()
open('other/a', 'wb').write('new contents\n')
wt_other.commit('changed a', rev_id='r@d-2')
self.assertEqual(['r@b-1'], b_base.revision_history())
self.assertEqual(['r@b-1'], wt_child.branch.revision_history())
self.assertEqual(['r@b-1', 'r@d-2'], wt_other.branch.revision_history())
del b_base
os.rename('base', 'hidden_base')
self.assertRaises(errors.BoundBranchConnectionFailure,
wt_child.pull, wt_other.branch)
# TODO: jam 20051231 We need invasive failure tests, so that we can show
# performance even when something fails.
if not paramiko_loaded:
del BoundSFTPBranch
|