27
from bzrlib.controldir import ControlDir
28
28
from bzrlib.bundle import serializer
29
29
from bzrlib.transport import memory
30
30
from bzrlib.tests import (
33
from bzrlib.tests.matchers import ContainsNoVfsCalls
36
36
load_tests = scenarios.load_tests_apply_scenarios
190
190
def test_note_revisions(self):
191
191
stderr = self.run_send([])[1]
192
self.assertEndsWith(stderr, '\nBundling 1 revision(s).\n')
192
self.assertEndsWith(stderr, '\nBundling 1 revision.\n')
194
194
def test_mailto_option(self):
195
195
b = branch.Branch.open('branch')
196
b.get_config().set_user_option('mail_client', 'editor')
196
b.get_config_stack().set('mail_client', 'editor')
197
197
self.run_bzr_error(
198
198
('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
199
199
), 'send -f branch')
200
b.get_config().set_user_option('mail_client', 'bogus')
200
b.get_config_stack().set('mail_client', 'bogus')
201
201
self.run_send([])
202
self.run_bzr_error(('Unknown mail client: bogus',),
202
self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
203
203
'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',),
204
b.get_config_stack().set('submit_to', 'jrandom@example.org')
205
self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
206
206
'send -f branch')
208
208
def test_mailto_child_option(self):
209
209
"""Make sure that child_submit_to is used."""
210
210
b = branch.Branch.open('branch')
211
b.get_config().set_user_option('mail_client', 'bogus')
211
b.get_config_stack().set('mail_client', 'bogus')
212
212
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',),
213
parent.get_config_stack().set('child_submit_to', 'somebody@example.org')
214
self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
218
217
def test_format(self):
219
218
md = self.get_MD(['--format=4'])
231
230
'send -f branch -o- --format=0.999')[0]
233
232
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')
233
br = branch.Branch.open('parent')
234
conf = br.get_config_stack()
235
conf.set('child_submit_format', '4')
236
236
md = self.get_MD([])
237
237
self.assertIs(merge_directive.MergeDirective2, md.__class__)
239
parent_config.set_user_option('child_submit_format', '0.9')
239
conf.set('child_submit_format', '0.9')
240
240
md = self.get_MD([])
241
241
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
244
244
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
245
245
self.assertIs(merge_directive.MergeDirective, md.__class__)
247
parent_config.set_user_option('child_submit_format', '0.999')
247
conf.set('child_submit_format', '0.999')
248
248
self.run_bzr_error(["No such send format '0.999'"],
249
249
'send -f branch -o-')[0]
294
294
_default_additional_warning = 'Uncommitted changes will not be sent.'
296
296
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)
297
br = branch.Branch.open('local')
298
br.get_config_stack().set('send_strict', value)
302
300
def assertSendFails(self, args):
303
301
out, err = self.run_send(args, rc=3, err_re=self._default_errors)
312
310
revs = self._default_sent_revs
313
311
out, err = self.run_send(args, err_re=err_re)
314
bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
313
bundling_revs = 'Bundling %d revision.\n'% len(revs)
315
bundling_revs = 'Bundling %d revisions.\n' % len(revs)
316
317
self.assertContainsRe(err, self._default_additional_warning)
317
318
self.assertEndsWith(err, bundling_revs)
330
331
super(TestSendStrictWithoutChanges, self).setUp()
331
332
self.make_parent_and_local_branches()
334
def test_send_without_workingtree(self):
335
ControlDir.open("local").destroy_workingtree()
336
self.assertSendSucceeds([])
333
338
def test_send_default(self):
334
339
self.assertSendSucceeds([])
436
441
class TestBundleStrictWithoutChanges(TestSendStrictWithoutChanges):
438
443
_default_command = ['bundle-revisions', '../parent']
446
class TestSmartServerSend(tests.TestCaseWithTransport):
449
self.setup_smart_server_with_call_log()
450
t = self.make_branch_and_tree('branch')
451
self.build_tree_contents([('branch/foo', 'thecontents')])
454
local = t.bzrdir.sprout('local-branch').open_workingtree()
455
self.build_tree_contents([('branch/foo', 'thenewcontents')])
456
local.commit("anothermessage")
457
self.reset_smart_call_log()
458
out, err = self.run_bzr(
459
['send', '-o', 'x.diff', self.get_url('branch')], working_dir='local-branch')
460
# This figure represent the amount of work to perform this use case. It
461
# is entirely ok to reduce this number if a test fails due to rpc_count
462
# being too low. If rpc_count increases, more network roundtrips have
463
# become necessary for this use case. Please do not adjust this number
464
# upwards without agreement from bzr's network support maintainers.
465
self.assertLength(7, self.hpss_calls)
466
self.assertLength(1, self.hpss_connections)
467
self.assertThat(self.hpss_calls, ContainsNoVfsCalls)