1
# Copyright (C) 2006-2012 Canonical Ltd
2
# Authors: Aaron Bentley
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
from cStringIO import StringIO
27
from bzrlib.controldir import ControlDir
28
from bzrlib.bundle import serializer
29
from bzrlib.transport import memory
30
from bzrlib.tests import (
33
from bzrlib.tests.matchers import ContainsNoVfsCalls
36
load_tests = scenarios.load_tests_apply_scenarios
39
class TestSendMixin(object):
41
_default_command = ['send', '-o-']
42
_default_wd = 'branch'
44
def run_send(self, args, cmd=None, rc=0, wd=None, err_re=None):
45
if cmd is None: cmd = self._default_command
46
if wd is None: wd = self._default_wd
47
if err_re is None: err_re = []
48
return self.run_bzr(cmd + args, retcode=rc,
52
def get_MD(self, args, cmd=None, wd='branch'):
53
out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
54
return merge_directive.MergeDirective.from_lines(out)
56
def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
57
md = self.get_MD(args, cmd=cmd, wd=wd)
58
br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
59
self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
62
class TestSend(tests.TestCaseWithTransport, TestSendMixin):
65
super(TestSend, self).setUp()
66
grandparent_tree = bzrdir.BzrDir.create_standalone_workingtree(
68
self.build_tree_contents([('grandparent/file1', 'grandparent')])
69
grandparent_tree.add('file1')
70
grandparent_tree.commit('initial commit', rev_id='rev1')
72
parent_bzrdir = grandparent_tree.bzrdir.sprout('parent')
73
parent_tree = parent_bzrdir.open_workingtree()
74
parent_tree.commit('next commit', rev_id='rev2')
76
branch_tree = parent_tree.bzrdir.sprout('branch').open_workingtree()
77
self.build_tree_contents([('branch/file1', 'branch')])
78
branch_tree.commit('last commit', rev_id='rev3')
80
def assertFormatIs(self, fmt_string, md):
81
self.assertEqual(fmt_string, md.get_raw_bundle().splitlines()[0])
83
def test_uses_parent(self):
84
"""Parent location is used as a basis by default"""
85
errmsg = self.run_send([], rc=3, wd='grandparent')[1]
86
self.assertContainsRe(errmsg, 'No submit branch known or specified')
87
stdout, stderr = self.run_send([])
88
self.assertEqual(stderr.count('Using saved parent location'), 1)
89
self.assertBundleContains(['rev3'], [])
91
def test_bundle(self):
92
"""Bundle works like send, except -o is not required"""
93
errmsg = self.run_send([], cmd=['bundle'], rc=3, wd='grandparent')[1]
94
self.assertContainsRe(errmsg, 'No submit branch known or specified')
95
stdout, stderr = self.run_send([], cmd=['bundle'])
96
self.assertEqual(stderr.count('Using saved parent location'), 1)
97
self.assertBundleContains(['rev3'], [], cmd=['bundle'])
99
def test_uses_submit(self):
100
"""Submit location can be used and set"""
101
self.assertBundleContains(['rev3'], [])
102
self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
103
# submit location should be auto-remembered
104
self.assertBundleContains(['rev3', 'rev2'], [])
106
self.run_send(['../parent'])
107
# We still point to ../grandparent
108
self.assertBundleContains(['rev3', 'rev2'], [])
109
# Remember parent now
110
self.run_send(['../parent', '--remember'])
111
# Now we point to parent
112
self.assertBundleContains(['rev3'], [])
114
err = self.run_send(['--remember'], rc=3)[1]
115
self.assertContainsRe(err,
116
'--remember requires a branch to be specified.')
118
def test_revision_branch_interaction(self):
119
self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
120
self.assertBundleContains(['rev2'], ['../grandparent', '-r-2'])
121
self.assertBundleContains(['rev3', 'rev2'],
122
['../grandparent', '-r-2..-1'])
123
md = self.get_MD(['-r-2..-1'])
124
self.assertEqual('rev2', md.base_revision_id)
125
self.assertEqual('rev3', md.revision_id)
127
def test_output(self):
128
# check output for consistency
129
# win32 stdout converts LF to CRLF,
130
# which would break patch-based bundles
131
self.assertBundleContains(['rev3'], [])
133
def test_no_common_ancestor(self):
134
foo = self.make_branch_and_tree('foo')
136
bar = self.make_branch_and_tree('bar')
138
self.run_send(['--from', 'foo', '../bar'], wd='foo')
140
def test_content_options(self):
141
"""--no-patch and --no-bundle should work and be independant"""
143
self.assertIsNot(None, md.bundle)
144
self.assertIsNot(None, md.patch)
146
md = self.get_MD(['--format=0.9'])
147
self.assertIsNot(None, md.bundle)
148
self.assertIsNot(None, md.patch)
150
md = self.get_MD(['--no-patch'])
151
self.assertIsNot(None, md.bundle)
152
self.assertIs(None, md.patch)
153
self.run_bzr_error(['Format 0.9 does not permit bundle with no patch'],
154
['send', '--no-patch', '--format=0.9', '-o-'],
155
working_dir='branch')
156
md = self.get_MD(['--no-bundle', '.', '.'])
157
self.assertIs(None, md.bundle)
158
self.assertIsNot(None, md.patch)
160
md = self.get_MD(['--no-bundle', '--format=0.9', '../parent',
162
self.assertIs(None, md.bundle)
163
self.assertIsNot(None, md.patch)
165
md = self.get_MD(['--no-bundle', '--no-patch', '.', '.'])
166
self.assertIs(None, md.bundle)
167
self.assertIs(None, md.patch)
169
md = self.get_MD(['--no-bundle', '--no-patch', '--format=0.9',
171
self.assertIs(None, md.bundle)
172
self.assertIs(None, md.patch)
174
def test_from_option(self):
175
self.run_bzr('send', retcode=3)
176
md = self.get_MD(['--from', 'branch'])
177
self.assertEqual('rev3', md.revision_id)
178
md = self.get_MD(['-f', 'branch'])
179
self.assertEqual('rev3', md.revision_id)
181
def test_output_option(self):
182
stdout = self.run_bzr('send -f branch --output file1')[0]
183
self.assertEqual('', stdout)
184
md_file = open('file1', 'rb')
185
self.addCleanup(md_file.close)
186
self.assertContainsRe(md_file.read(), 'rev3')
187
stdout = self.run_bzr('send -f branch --output -')[0]
188
self.assertContainsRe(stdout, 'rev3')
190
def test_note_revisions(self):
191
stderr = self.run_send([])[1]
192
self.assertEndsWith(stderr, '\nBundling 1 revision.\n')
194
def test_mailto_option(self):
195
b = branch.Branch.open('branch')
196
b.get_config_stack().set('mail_client', 'editor')
198
('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
200
b.get_config_stack().set('mail_client', 'bogus')
202
self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
203
'send -f branch --mail-to jrandom@example.org')
204
b.get_config_stack().set('submit_to', 'jrandom@example.org')
205
self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
208
def test_mailto_child_option(self):
209
"""Make sure that child_submit_to is used."""
210
b = branch.Branch.open('branch')
211
b.get_config_stack().set('mail_client', 'bogus')
212
parent = branch.Branch.open('parent')
213
parent.get_config_stack().set('child_submit_to', 'somebody@example.org')
214
self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
217
def test_format(self):
218
md = self.get_MD(['--format=4'])
219
self.assertIs(merge_directive.MergeDirective2, md.__class__)
220
self.assertFormatIs('# Bazaar revision bundle v4', md)
222
md = self.get_MD(['--format=0.9'])
223
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
225
md = self.get_MD(['--format=0.9'], cmd=['bundle'])
226
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
227
self.assertIs(merge_directive.MergeDirective, md.__class__)
229
self.run_bzr_error(['Bad value .* for option .format.'],
230
'send -f branch -o- --format=0.999')[0]
232
def test_format_child_option(self):
233
br = branch.Branch.open('parent')
234
conf = br.get_config_stack()
235
conf.set('child_submit_format', '4')
237
self.assertIs(merge_directive.MergeDirective2, md.__class__)
239
conf.set('child_submit_format', '0.9')
241
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
243
md = self.get_MD([], cmd=['bundle'])
244
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
245
self.assertIs(merge_directive.MergeDirective, md.__class__)
247
conf.set('child_submit_format', '0.999')
248
self.run_bzr_error(["No such send format '0.999'"],
249
'send -f branch -o-')[0]
251
def test_message_option(self):
252
self.run_bzr('send', retcode=3)
254
self.assertIs(None, md.message)
255
md = self.get_MD(['-m', 'my message'])
256
self.assertEqual('my message', md.message)
258
def test_omitted_revision(self):
259
md = self.get_MD(['-r-2..'])
260
self.assertEqual('rev2', md.base_revision_id)
261
self.assertEqual('rev3', md.revision_id)
262
md = self.get_MD(['-r..3', '--from', 'branch', 'grandparent'], wd='.')
263
self.assertEqual('rev1', md.base_revision_id)
264
self.assertEqual('rev3', md.revision_id)
266
def test_nonexistant_branch(self):
267
self.vfs_transport_factory = memory.MemoryServer
268
location = self.get_url('absentdir/')
269
out, err = self.run_bzr(["send", "--from", location], retcode=3)
270
self.assertEqual(out, '')
271
self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
274
class TestSendStrictMixin(TestSendMixin):
276
def make_parent_and_local_branches(self):
277
# Create a 'parent' branch as the base
278
self.parent_tree = bzrdir.BzrDir.create_standalone_workingtree('parent')
279
self.build_tree_contents([('parent/file', 'parent')])
280
self.parent_tree.add('file')
281
self.parent_tree.commit('first commit', rev_id='parent')
282
# Branch 'local' from parent and do a change
283
local_bzrdir = self.parent_tree.bzrdir.sprout('local')
284
self.local_tree = local_bzrdir.open_workingtree()
285
self.build_tree_contents([('local/file', 'local')])
286
self.local_tree.commit('second commit', rev_id='local')
288
_default_command = ['send', '-o-', '../parent']
289
_default_wd = 'local'
290
_default_sent_revs = ['local']
291
_default_errors = ['Working tree ".*/local/" has uncommitted '
292
'changes \(See bzr status\)\.',]
293
_default_additional_error = 'Use --no-strict to force the send.\n'
294
_default_additional_warning = 'Uncommitted changes will not be sent.'
296
def set_config_send_strict(self, value):
297
br = branch.Branch.open('local')
298
br.get_config_stack().set('send_strict', value)
300
def assertSendFails(self, args):
301
out, err = self.run_send(args, rc=3, err_re=self._default_errors)
302
self.assertContainsRe(err, self._default_additional_error)
304
def assertSendSucceeds(self, args, revs=None, with_warning=False):
306
err_re = self._default_errors
310
revs = self._default_sent_revs
311
out, err = self.run_send(args, err_re=err_re)
313
bundling_revs = 'Bundling %d revision.\n'% len(revs)
315
bundling_revs = 'Bundling %d revisions.\n' % len(revs)
317
self.assertContainsRe(err, self._default_additional_warning)
318
self.assertEndsWith(err, bundling_revs)
320
self.assertEquals(bundling_revs, err)
321
md = merge_directive.MergeDirective.from_lines(StringIO(out))
322
self.assertEqual('parent', md.base_revision_id)
323
br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
324
self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
327
class TestSendStrictWithoutChanges(tests.TestCaseWithTransport,
328
TestSendStrictMixin):
331
super(TestSendStrictWithoutChanges, self).setUp()
332
self.make_parent_and_local_branches()
334
def test_send_without_workingtree(self):
335
ControlDir.open("local").destroy_workingtree()
336
self.assertSendSucceeds([])
338
def test_send_default(self):
339
self.assertSendSucceeds([])
341
def test_send_strict(self):
342
self.assertSendSucceeds(['--strict'])
344
def test_send_no_strict(self):
345
self.assertSendSucceeds(['--no-strict'])
347
def test_send_config_var_strict(self):
348
self.set_config_send_strict('true')
349
self.assertSendSucceeds([])
351
def test_send_config_var_no_strict(self):
352
self.set_config_send_strict('false')
353
self.assertSendSucceeds([])
356
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
357
TestSendStrictMixin):
359
# These are textually the same as test_push.strict_push_change_scenarios,
360
# but since the functions are reimplemented here, the definitions are left
364
dict(_changes_type='_uncommitted_changes')),
366
dict(_changes_type='_pending_merges')),
367
('out-of-sync-trees',
368
dict(_changes_type='_out_of_sync_trees')),
371
_changes_type = None # Set by load_tests
374
super(TestSendStrictWithChanges, self).setUp()
375
# load tests set _changes_types to the name of the method we want to
377
do_changes_func = getattr(self, self._changes_type)
380
def _uncommitted_changes(self):
381
self.make_parent_and_local_branches()
382
# Make a change without committing it
383
self.build_tree_contents([('local/file', 'modified')])
385
def _pending_merges(self):
386
self.make_parent_and_local_branches()
387
# Create 'other' branch containing a new file
388
other_bzrdir = self.parent_tree.bzrdir.sprout('other')
389
other_tree = other_bzrdir.open_workingtree()
390
self.build_tree_contents([('other/other-file', 'other')])
391
other_tree.add('other-file')
392
other_tree.commit('other commit', rev_id='other')
393
# Merge and revert, leaving a pending merge
394
self.local_tree.merge_from_branch(other_tree.branch)
395
self.local_tree.revert(filenames=['other-file'], backups=False)
397
def _out_of_sync_trees(self):
398
self.make_parent_and_local_branches()
399
self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
400
# Make a change and commit it
401
self.build_tree_contents([('local/file', 'modified in local')])
402
self.local_tree.commit('modify file', rev_id='modified-in-local')
403
# Exercise commands from the checkout directory
404
self._default_wd = 'checkout'
405
self._default_errors = ["Working tree is out of date, please run"
407
self._default_sent_revs = ['modified-in-local', 'local']
409
def test_send_default(self):
410
self.assertSendSucceeds([], with_warning=True)
412
def test_send_with_revision(self):
413
self.assertSendSucceeds(['-r', 'revid:local'], revs=['local'])
415
def test_send_no_strict(self):
416
self.assertSendSucceeds(['--no-strict'])
418
def test_send_strict_with_changes(self):
419
self.assertSendFails(['--strict'])
421
def test_send_respect_config_var_strict(self):
422
self.set_config_send_strict('true')
423
self.assertSendFails([])
424
self.assertSendSucceeds(['--no-strict'])
426
def test_send_bogus_config_var_ignored(self):
427
self.set_config_send_strict("I'm unsure")
428
self.assertSendSucceeds([], with_warning=True)
430
def test_send_no_strict_command_line_override_config(self):
431
self.set_config_send_strict('true')
432
self.assertSendFails([])
433
self.assertSendSucceeds(['--no-strict'])
435
def test_send_strict_command_line_override_config(self):
436
self.set_config_send_strict('false')
437
self.assertSendSucceeds([])
438
self.assertSendFails(['--strict'])
441
class TestBundleStrictWithoutChanges(TestSendStrictWithoutChanges):
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)
added
removed
bzrlib/tests/blackbox/test_send.py
