16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
19
from cStringIO import StringIO
22
21
from bzrlib import (
26
from bzrlib.controldir import ControlDir
28
27
from bzrlib.bundle import serializer
29
28
from bzrlib.transport import memory
30
29
from bzrlib.tests import (
32
from bzrlib.tests.matchers import ContainsNoVfsCalls
36
35
load_tests = scenarios.load_tests_apply_scenarios
65
64
super(TestSend, self).setUp()
66
grandparent_tree = bzrdir.BzrDir.create_standalone_workingtree(
65
grandparent_tree = ControlDir.create_standalone_workingtree(
68
67
self.build_tree_contents([('grandparent/file1', 'grandparent')])
69
68
grandparent_tree.add('file1')
190
189
def test_note_revisions(self):
191
190
stderr = self.run_send([])[1]
192
self.assertEndsWith(stderr, '\nBundling 1 revision(s).\n')
191
self.assertEndsWith(stderr, '\nBundling 1 revision.\n')
194
193
def test_mailto_option(self):
195
194
b = branch.Branch.open('branch')
196
b.get_config().set_user_option('mail_client', 'editor')
195
b.get_config_stack().set('mail_client', 'editor')
197
196
self.run_bzr_error(
198
197
('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
199
198
), 'send -f branch')
200
b.get_config().set_user_option('mail_client', 'bogus')
199
b.get_config_stack().set('mail_client', 'bogus')
201
200
self.run_send([])
202
self.run_bzr_error(('Unknown mail client: bogus',),
201
self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
203
202
'send -f branch --mail-to jrandom@example.org')
204
b.get_config().set_user_option('submit_to', 'jrandom@example.org')
205
self.run_bzr_error(('Unknown mail client: bogus',),
203
b.get_config_stack().set('submit_to', 'jrandom@example.org')
204
self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
206
205
'send -f branch')
208
207
def test_mailto_child_option(self):
209
208
"""Make sure that child_submit_to is used."""
210
209
b = branch.Branch.open('branch')
211
b.get_config().set_user_option('mail_client', 'bogus')
210
b.get_config_stack().set('mail_client', 'bogus')
212
211
parent = branch.Branch.open('parent')
213
parent.get_config().set_user_option('child_submit_to',
214
'somebody@example.org')
215
self.run_bzr_error(('Unknown mail client: bogus',),
212
parent.get_config_stack().set('child_submit_to', 'somebody@example.org')
213
self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
218
216
def test_format(self):
219
217
md = self.get_MD(['--format=4'])
231
229
'send -f branch -o- --format=0.999')[0]
233
231
def test_format_child_option(self):
234
parent_config = branch.Branch.open('parent').get_config()
235
parent_config.set_user_option('child_submit_format', '4')
232
br = branch.Branch.open('parent')
233
conf = br.get_config_stack()
234
conf.set('child_submit_format', '4')
236
235
md = self.get_MD([])
237
236
self.assertIs(merge_directive.MergeDirective2, md.__class__)
239
parent_config.set_user_option('child_submit_format', '0.9')
238
conf.set('child_submit_format', '0.9')
240
239
md = self.get_MD([])
241
240
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
244
243
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
245
244
self.assertIs(merge_directive.MergeDirective, md.__class__)
247
parent_config.set_user_option('child_submit_format', '0.999')
246
conf.set('child_submit_format', '0.999')
248
247
self.run_bzr_error(["No such send format '0.999'"],
249
248
'send -f branch -o-')[0]
276
275
def make_parent_and_local_branches(self):
277
276
# Create a 'parent' branch as the base
278
self.parent_tree = bzrdir.BzrDir.create_standalone_workingtree('parent')
277
self.parent_tree = ControlDir.create_standalone_workingtree('parent')
279
278
self.build_tree_contents([('parent/file', 'parent')])
280
279
self.parent_tree.add('file')
281
280
self.parent_tree.commit('first commit', rev_id='parent')
294
293
_default_additional_warning = 'Uncommitted changes will not be sent.'
296
295
def set_config_send_strict(self, value):
297
# set config var (any of bazaar.conf, locations.conf, branch.conf
299
conf = self.local_tree.branch.get_config()
300
conf.set_user_option('send_strict', value)
296
br = branch.Branch.open('local')
297
br.get_config_stack().set('send_strict', value)
302
299
def assertSendFails(self, args):
303
300
out, err = self.run_send(args, rc=3, err_re=self._default_errors)
312
309
revs = self._default_sent_revs
313
310
out, err = self.run_send(args, err_re=err_re)
314
bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
312
bundling_revs = 'Bundling %d revision.\n'% len(revs)
314
bundling_revs = 'Bundling %d revisions.\n' % len(revs)
316
316
self.assertContainsRe(err, self._default_additional_warning)
317
317
self.assertEndsWith(err, bundling_revs)
319
self.assertEquals(bundling_revs, err)
319
self.assertEqual(bundling_revs, err)
320
320
md = merge_directive.MergeDirective.from_lines(StringIO(out))
321
321
self.assertEqual('parent', md.base_revision_id)
322
322
br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
330
330
super(TestSendStrictWithoutChanges, self).setUp()
331
331
self.make_parent_and_local_branches()
333
def test_send_without_workingtree(self):
334
ControlDir.open("local").destroy_workingtree()
335
self.assertSendSucceeds([])
333
337
def test_send_default(self):
334
338
self.assertSendSucceeds([])
436
440
class TestBundleStrictWithoutChanges(TestSendStrictWithoutChanges):
438
442
_default_command = ['bundle-revisions', '../parent']
445
class TestSmartServerSend(tests.TestCaseWithTransport):
448
self.setup_smart_server_with_call_log()
449
t = self.make_branch_and_tree('branch')
450
self.build_tree_contents([('branch/foo', 'thecontents')])
453
local = t.bzrdir.sprout('local-branch').open_workingtree()
454
self.build_tree_contents([('branch/foo', 'thenewcontents')])
455
local.commit("anothermessage")
456
self.reset_smart_call_log()
457
out, err = self.run_bzr(
458
['send', '-o', 'x.diff', self.get_url('branch')], working_dir='local-branch')
459
# This figure represent the amount of work to perform this use case. It
460
# is entirely ok to reduce this number if a test fails due to rpc_count
461
# being too low. If rpc_count increases, more network roundtrips have
462
# become necessary for this use case. Please do not adjust this number
463
# upwards without agreement from bzr's network support maintainers.
464
self.assertLength(7, self.hpss_calls)
465
self.assertLength(1, self.hpss_connections)
466
self.assertThat(self.hpss_calls, ContainsNoVfsCalls)