16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21
from StringIO import StringIO
19
from cStringIO import StringIO
23
21
from bzrlib import (
24
branch as _mod_branch,
26
from bzrlib.controldir import ControlDir
27
27
from bzrlib.bundle import serializer
28
from bzrlib.bzrdir import BzrDir
29
from bzrlib import tests
32
def read_bundle(fileobj):
33
md = merge_directive.MergeDirective.from_lines(fileobj.readlines())
34
return serializer.read_bundle(StringIO(md.get_raw_bundle()))
37
class TestSend(tests.TestCaseWithTransport):
40
grandparent_tree = BzrDir.create_standalone_workingtree('grandparent')
28
from bzrlib.transport import memory
29
from bzrlib.tests import (
32
from bzrlib.tests.matchers import ContainsNoVfsCalls
35
load_tests = scenarios.load_tests_apply_scenarios
38
class TestSendMixin(object):
40
_default_command = ['send', '-o-']
41
_default_wd = 'branch'
43
def run_send(self, args, cmd=None, rc=0, wd=None, err_re=None):
44
if cmd is None: cmd = self._default_command
45
if wd is None: wd = self._default_wd
46
if err_re is None: err_re = []
47
return self.run_bzr(cmd + args, retcode=rc,
51
def get_MD(self, args, cmd=None, wd='branch'):
52
out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
53
return merge_directive.MergeDirective.from_lines(out)
55
def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
56
md = self.get_MD(args, cmd=cmd, wd=wd)
57
br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
58
self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
61
class TestSend(tests.TestCaseWithTransport, TestSendMixin):
64
super(TestSend, self).setUp()
65
grandparent_tree = ControlDir.create_standalone_workingtree(
41
67
self.build_tree_contents([('grandparent/file1', 'grandparent')])
42
68
grandparent_tree.add('file1')
43
grandparent_tree.commit('initial commit', rev_id='revision1')
69
grandparent_tree.commit('initial commit', rev_id='rev1')
44
71
parent_bzrdir = grandparent_tree.bzrdir.sprout('parent')
45
72
parent_tree = parent_bzrdir.open_workingtree()
46
parent_tree.commit('next commit', rev_id='revision2')
73
parent_tree.commit('next commit', rev_id='rev2')
47
75
branch_tree = parent_tree.bzrdir.sprout('branch').open_workingtree()
48
76
self.build_tree_contents([('branch/file1', 'branch')])
49
branch_tree.commit('last commit', rev_id='revision3')
77
branch_tree.commit('last commit', rev_id='rev3')
79
def assertFormatIs(self, fmt_string, md):
80
self.assertEqual(fmt_string, md.get_raw_bundle().splitlines()[0])
51
82
def test_uses_parent(self):
52
83
"""Parent location is used as a basis by default"""
54
os.chdir('grandparent')
55
errmsg = self.run_bzr('send -o-', retcode=3)[1]
84
errmsg = self.run_send([], rc=3, wd='grandparent')[1]
56
85
self.assertContainsRe(errmsg, 'No submit branch known or specified')
58
stdout, stderr = self.run_bzr('send -o-')
86
stdout, stderr = self.run_send([])
59
87
self.assertEqual(stderr.count('Using saved parent location'), 1)
60
br = read_bundle(StringIO(stdout))
61
self.assertRevisions(br, ['revision3'])
88
self.assertBundleContains(['rev3'], [])
63
90
def test_bundle(self):
64
91
"""Bundle works like send, except -o is not required"""
66
os.chdir('grandparent')
67
errmsg = self.run_bzr('bundle', retcode=3)[1]
92
errmsg = self.run_send([], cmd=['bundle'], rc=3, wd='grandparent')[1]
68
93
self.assertContainsRe(errmsg, 'No submit branch known or specified')
70
stdout, stderr = self.run_bzr('bundle')
94
stdout, stderr = self.run_send([], cmd=['bundle'])
71
95
self.assertEqual(stderr.count('Using saved parent location'), 1)
72
br = read_bundle(StringIO(stdout))
73
self.assertRevisions(br, ['revision3'])
75
def assertRevisions(self, bi, expected):
76
self.assertEqual(set(r.revision_id for r in bi.revisions),
96
self.assertBundleContains(['rev3'], [], cmd=['bundle'])
79
98
def test_uses_submit(self):
80
99
"""Submit location can be used and set"""
83
br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
84
self.assertRevisions(br, ['revision3'])
85
br = read_bundle(StringIO(self.run_bzr('send ../grandparent -o-')[0]))
86
self.assertRevisions(br, ['revision3', 'revision2'])
100
self.assertBundleContains(['rev3'], [])
101
self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
87
102
# submit location should be auto-remembered
88
br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
89
self.assertRevisions(br, ['revision3', 'revision2'])
90
self.run_bzr('send ../parent -o-')
91
br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
92
self.assertRevisions(br, ['revision3', 'revision2'])
93
self.run_bzr('send ../parent --remember -o-')
94
br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
95
self.assertRevisions(br, ['revision3'])
96
err = self.run_bzr('send --remember -o-', retcode=3)[1]
103
self.assertBundleContains(['rev3', 'rev2'], [])
105
self.run_send(['../parent'])
106
# We still point to ../grandparent
107
self.assertBundleContains(['rev3', 'rev2'], [])
108
# Remember parent now
109
self.run_send(['../parent', '--remember'])
110
# Now we point to parent
111
self.assertBundleContains(['rev3'], [])
113
err = self.run_send(['--remember'], rc=3)[1]
97
114
self.assertContainsRe(err,
98
115
'--remember requires a branch to be specified.')
100
117
def test_revision_branch_interaction(self):
103
bi = read_bundle(StringIO(self.run_bzr('send ../grandparent -o-')[0]))
104
self.assertRevisions(bi, ['revision3', 'revision2'])
105
out = StringIO(self.run_bzr('send ../grandparent -r -2 -o-')[0])
106
bi = read_bundle(out)
107
self.assertRevisions(bi, ['revision2'])
108
sio = StringIO(self.run_bzr('send -r -2..-1 -o-')[0])
109
md = merge_directive.MergeDirective.from_lines(sio.readlines())
110
self.assertEqual('revision2', md.base_revision_id)
111
self.assertEqual('revision3', md.revision_id)
113
bi = read_bundle(sio)
114
self.assertRevisions(bi, ['revision2', 'revision3'])
115
self.run_bzr('send ../grandparent -r -2..-1 -o-')
118
self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
119
self.assertBundleContains(['rev2'], ['../grandparent', '-r-2'])
120
self.assertBundleContains(['rev3', 'rev2'],
121
['../grandparent', '-r-2..-1'])
122
md = self.get_MD(['-r-2..-1'])
123
self.assertEqual('rev2', md.base_revision_id)
124
self.assertEqual('rev3', md.revision_id)
117
126
def test_output(self):
118
127
# check output for consistency
119
128
# win32 stdout converts LF to CRLF,
120
129
# which would break patch-based bundles
123
stdout = self.run_bzr_subprocess('send -o-')[0]
124
br = read_bundle(StringIO(stdout))
125
self.assertRevisions(br, ['revision3'])
130
self.assertBundleContains(['rev3'], [])
127
132
def test_no_common_ancestor(self):
128
133
foo = self.make_branch_and_tree('foo')
129
134
foo.commit('rev a')
130
135
bar = self.make_branch_and_tree('bar')
131
136
bar.commit('rev b')
133
self.run_bzr('send ../bar -o-')
135
def send_directive(self, args):
136
sio = StringIO(self.run_bzr(['send', '-o-'] + args)[0])
137
return merge_directive.MergeDirective.from_lines(sio.readlines())
137
self.run_send(['--from', 'foo', '../bar'], wd='foo')
139
139
def test_content_options(self):
140
140
"""--no-patch and --no-bundle should work and be independant"""
143
md = self.send_directive([])
144
self.assertIsNot(None, md.bundle)
145
self.assertIsNot(None, md.patch)
147
md = self.send_directive(['--format=0.9'])
148
self.assertIsNot(None, md.bundle)
149
self.assertIsNot(None, md.patch)
151
md = self.send_directive(['--no-patch'])
142
self.assertIsNot(None, md.bundle)
143
self.assertIsNot(None, md.patch)
145
md = self.get_MD(['--format=0.9'])
146
self.assertIsNot(None, md.bundle)
147
self.assertIsNot(None, md.patch)
149
md = self.get_MD(['--no-patch'])
152
150
self.assertIsNot(None, md.bundle)
153
151
self.assertIs(None, md.patch)
154
152
self.run_bzr_error(['Format 0.9 does not permit bundle with no patch'],
155
'send --no-patch --format=0.9 -o-')
157
md = self.send_directive(['--no-bundle', '.', '.'])
153
['send', '--no-patch', '--format=0.9', '-o-'],
154
working_dir='branch')
155
md = self.get_MD(['--no-bundle', '.', '.'])
158
156
self.assertIs(None, md.bundle)
159
157
self.assertIsNot(None, md.patch)
161
md = self.send_directive(['--no-bundle', '--format=0.9', '../parent',
159
md = self.get_MD(['--no-bundle', '--format=0.9', '../parent',
163
161
self.assertIs(None, md.bundle)
164
162
self.assertIsNot(None, md.patch)
166
md = self.send_directive(['--no-bundle', '--no-patch', '.', '.'])
164
md = self.get_MD(['--no-bundle', '--no-patch', '.', '.'])
167
165
self.assertIs(None, md.bundle)
168
166
self.assertIs(None, md.patch)
170
md = self.send_directive(['--no-bundle', '--no-patch', '--format=0.9',
168
md = self.get_MD(['--no-bundle', '--no-patch', '--format=0.9',
172
170
self.assertIs(None, md.bundle)
173
171
self.assertIs(None, md.patch)
175
173
def test_from_option(self):
177
174
self.run_bzr('send', retcode=3)
178
md = self.send_directive(['--from', 'branch'])
179
self.assertEqual('revision3', md.revision_id)
180
md = self.send_directive(['-f', 'branch'])
181
self.assertEqual('revision3', md.revision_id)
175
md = self.get_MD(['--from', 'branch'])
176
self.assertEqual('rev3', md.revision_id)
177
md = self.get_MD(['-f', 'branch'])
178
self.assertEqual('rev3', md.revision_id)
183
180
def test_output_option(self):
185
181
stdout = self.run_bzr('send -f branch --output file1')[0]
186
182
self.assertEqual('', stdout)
187
183
md_file = open('file1', 'rb')
188
184
self.addCleanup(md_file.close)
189
self.assertContainsRe(md_file.read(), 'revision3')
185
self.assertContainsRe(md_file.read(), 'rev3')
190
186
stdout = self.run_bzr('send -f branch --output -')[0]
191
self.assertContainsRe(stdout, 'revision3')
187
self.assertContainsRe(stdout, 'rev3')
193
189
def test_note_revisions(self):
195
stderr = self.run_bzr('send -f branch --output file1')[1]
196
self.assertContainsRe(stderr, r'Bundling 1 revision\(s\).\n')
190
stderr = self.run_send([])[1]
191
self.assertEndsWith(stderr, '\nBundling 1 revision.\n')
198
193
def test_mailto_option(self):
200
branch = _mod_branch.Branch.open('branch')
201
branch.get_config().set_user_option('mail_client', 'editor')
194
b = branch.Branch.open('branch')
195
b.get_config_stack().set('mail_client', 'editor')
202
196
self.run_bzr_error(
203
197
('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
204
198
), 'send -f branch')
205
branch.get_config().set_user_option('mail_client', 'bogus')
206
self.run_bzr('send -f branch -o-')
207
self.run_bzr_error(('Unknown mail client: bogus',),
199
b.get_config_stack().set('mail_client', 'bogus')
201
self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
208
202
'send -f branch --mail-to jrandom@example.org')
209
branch.get_config().set_user_option('submit_to', 'jrandom@example.org')
210
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"',),
211
205
'send -f branch')
213
207
def test_mailto_child_option(self):
214
208
"""Make sure that child_submit_to is used."""
216
branch = _mod_branch.Branch.open('branch')
217
branch.get_config().set_user_option('mail_client', 'bogus')
218
parent = _mod_branch.Branch.open('parent')
219
parent.get_config().set_user_option('child_submit_to',
220
'somebody@example.org')
221
self.run_bzr_error(('Unknown mail client: bogus',),
209
b = branch.Branch.open('branch')
210
b.get_config_stack().set('mail_client', 'bogus')
211
parent = branch.Branch.open('parent')
212
parent.get_config_stack().set('child_submit_to', 'somebody@example.org')
213
self.run_bzr_error(('Bad value "bogus" for option "mail_client"',),
224
216
def test_format(self):
226
s = StringIO(self.run_bzr('send -f branch -o- --format=4')[0])
227
md = merge_directive.MergeDirective.from_lines(s.readlines())
217
md = self.get_MD(['--format=4'])
228
218
self.assertIs(merge_directive.MergeDirective2, md.__class__)
229
s = StringIO(self.run_bzr('send -f branch -o- --format=0.9')[0])
230
md = merge_directive.MergeDirective.from_lines(s.readlines())
231
self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
232
'# Bazaar revision bundle v0.9')
233
s = StringIO(self.run_bzr('bundle -f branch -o- --format=0.9')[0])
234
md = merge_directive.MergeDirective.from_lines(s.readlines())
235
self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
236
'# Bazaar revision bundle v0.9')
219
self.assertFormatIs('# Bazaar revision bundle v4', md)
221
md = self.get_MD(['--format=0.9'])
222
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
224
md = self.get_MD(['--format=0.9'], cmd=['bundle'])
225
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
237
226
self.assertIs(merge_directive.MergeDirective, md.__class__)
238
228
self.run_bzr_error(['Bad value .* for option .format.'],
239
229
'send -f branch -o- --format=0.999')[0]
231
def test_format_child_option(self):
232
br = branch.Branch.open('parent')
233
conf = br.get_config_stack()
234
conf.set('child_submit_format', '4')
236
self.assertIs(merge_directive.MergeDirective2, md.__class__)
238
conf.set('child_submit_format', '0.9')
240
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
242
md = self.get_MD([], cmd=['bundle'])
243
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
244
self.assertIs(merge_directive.MergeDirective, md.__class__)
246
conf.set('child_submit_format', '0.999')
247
self.run_bzr_error(["No such send format '0.999'"],
248
'send -f branch -o-')[0]
241
250
def test_message_option(self):
243
251
self.run_bzr('send', retcode=3)
244
md = self.send_directive(['--from', 'branch'])
245
253
self.assertIs(None, md.message)
246
md = self.send_directive(['--from', 'branch', '-m', 'my message'])
254
md = self.get_MD(['-m', 'my message'])
247
255
self.assertEqual('my message', md.message)
249
257
def test_omitted_revision(self):
251
md = self.send_directive(['-r-2..', '--from', 'branch'])
252
self.assertEqual('revision2', md.base_revision_id)
253
self.assertEqual('revision3', md.revision_id)
254
md = self.send_directive(['-r..3', '--from', 'branch',
256
self.assertEqual('revision1', md.base_revision_id)
257
self.assertEqual('revision3', md.revision_id)
258
md = self.get_MD(['-r-2..'])
259
self.assertEqual('rev2', md.base_revision_id)
260
self.assertEqual('rev3', md.revision_id)
261
md = self.get_MD(['-r..3', '--from', 'branch', 'grandparent'], wd='.')
262
self.assertEqual('rev1', md.base_revision_id)
263
self.assertEqual('rev3', md.revision_id)
259
265
def test_nonexistant_branch(self):
260
if sys.platform == "win32":
261
location = "C:/i/do/not/exist/"
263
location = "/i/do/not/exist/"
266
self.vfs_transport_factory = memory.MemoryServer
267
location = self.get_url('absentdir/')
264
268
out, err = self.run_bzr(["send", "--from", location], retcode=3)
265
269
self.assertEqual(out, '')
266
270
self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
273
class TestSendStrictMixin(TestSendMixin):
275
def make_parent_and_local_branches(self):
276
# Create a 'parent' branch as the base
277
self.parent_tree = ControlDir.create_standalone_workingtree('parent')
278
self.build_tree_contents([('parent/file', 'parent')])
279
self.parent_tree.add('file')
280
self.parent_tree.commit('first commit', rev_id='parent')
281
# Branch 'local' from parent and do a change
282
local_bzrdir = self.parent_tree.bzrdir.sprout('local')
283
self.local_tree = local_bzrdir.open_workingtree()
284
self.build_tree_contents([('local/file', 'local')])
285
self.local_tree.commit('second commit', rev_id='local')
287
_default_command = ['send', '-o-', '../parent']
288
_default_wd = 'local'
289
_default_sent_revs = ['local']
290
_default_errors = ['Working tree ".*/local/" has uncommitted '
291
'changes \(See bzr status\)\.',]
292
_default_additional_error = 'Use --no-strict to force the send.\n'
293
_default_additional_warning = 'Uncommitted changes will not be sent.'
295
def set_config_send_strict(self, value):
296
br = branch.Branch.open('local')
297
br.get_config_stack().set('send_strict', value)
299
def assertSendFails(self, args):
300
out, err = self.run_send(args, rc=3, err_re=self._default_errors)
301
self.assertContainsRe(err, self._default_additional_error)
303
def assertSendSucceeds(self, args, revs=None, with_warning=False):
305
err_re = self._default_errors
309
revs = self._default_sent_revs
310
out, err = self.run_send(args, err_re=err_re)
312
bundling_revs = 'Bundling %d revision.\n'% len(revs)
314
bundling_revs = 'Bundling %d revisions.\n' % len(revs)
316
self.assertContainsRe(err, self._default_additional_warning)
317
self.assertEndsWith(err, bundling_revs)
319
self.assertEquals(bundling_revs, err)
320
md = merge_directive.MergeDirective.from_lines(StringIO(out))
321
self.assertEqual('parent', md.base_revision_id)
322
br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
323
self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
326
class TestSendStrictWithoutChanges(tests.TestCaseWithTransport,
327
TestSendStrictMixin):
330
super(TestSendStrictWithoutChanges, self).setUp()
331
self.make_parent_and_local_branches()
333
def test_send_without_workingtree(self):
334
ControlDir.open("local").destroy_workingtree()
335
self.assertSendSucceeds([])
337
def test_send_default(self):
338
self.assertSendSucceeds([])
340
def test_send_strict(self):
341
self.assertSendSucceeds(['--strict'])
343
def test_send_no_strict(self):
344
self.assertSendSucceeds(['--no-strict'])
346
def test_send_config_var_strict(self):
347
self.set_config_send_strict('true')
348
self.assertSendSucceeds([])
350
def test_send_config_var_no_strict(self):
351
self.set_config_send_strict('false')
352
self.assertSendSucceeds([])
355
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
356
TestSendStrictMixin):
358
# These are textually the same as test_push.strict_push_change_scenarios,
359
# but since the functions are reimplemented here, the definitions are left
363
dict(_changes_type='_uncommitted_changes')),
365
dict(_changes_type='_pending_merges')),
366
('out-of-sync-trees',
367
dict(_changes_type='_out_of_sync_trees')),
370
_changes_type = None # Set by load_tests
373
super(TestSendStrictWithChanges, self).setUp()
374
# load tests set _changes_types to the name of the method we want to
376
do_changes_func = getattr(self, self._changes_type)
379
def _uncommitted_changes(self):
380
self.make_parent_and_local_branches()
381
# Make a change without committing it
382
self.build_tree_contents([('local/file', 'modified')])
384
def _pending_merges(self):
385
self.make_parent_and_local_branches()
386
# Create 'other' branch containing a new file
387
other_bzrdir = self.parent_tree.bzrdir.sprout('other')
388
other_tree = other_bzrdir.open_workingtree()
389
self.build_tree_contents([('other/other-file', 'other')])
390
other_tree.add('other-file')
391
other_tree.commit('other commit', rev_id='other')
392
# Merge and revert, leaving a pending merge
393
self.local_tree.merge_from_branch(other_tree.branch)
394
self.local_tree.revert(filenames=['other-file'], backups=False)
396
def _out_of_sync_trees(self):
397
self.make_parent_and_local_branches()
398
self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
399
# Make a change and commit it
400
self.build_tree_contents([('local/file', 'modified in local')])
401
self.local_tree.commit('modify file', rev_id='modified-in-local')
402
# Exercise commands from the checkout directory
403
self._default_wd = 'checkout'
404
self._default_errors = ["Working tree is out of date, please run"
406
self._default_sent_revs = ['modified-in-local', 'local']
408
def test_send_default(self):
409
self.assertSendSucceeds([], with_warning=True)
411
def test_send_with_revision(self):
412
self.assertSendSucceeds(['-r', 'revid:local'], revs=['local'])
414
def test_send_no_strict(self):
415
self.assertSendSucceeds(['--no-strict'])
417
def test_send_strict_with_changes(self):
418
self.assertSendFails(['--strict'])
420
def test_send_respect_config_var_strict(self):
421
self.set_config_send_strict('true')
422
self.assertSendFails([])
423
self.assertSendSucceeds(['--no-strict'])
425
def test_send_bogus_config_var_ignored(self):
426
self.set_config_send_strict("I'm unsure")
427
self.assertSendSucceeds([], with_warning=True)
429
def test_send_no_strict_command_line_override_config(self):
430
self.set_config_send_strict('true')
431
self.assertSendFails([])
432
self.assertSendSucceeds(['--no-strict'])
434
def test_send_strict_command_line_override_config(self):
435
self.set_config_send_strict('false')
436
self.assertSendSucceeds([])
437
self.assertSendFails(['--strict'])
440
class TestBundleStrictWithoutChanges(TestSendStrictWithoutChanges):
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)
added
removed
bzrlib/tests/blackbox/test_send.py
