16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21
from StringIO import StringIO
20
from cStringIO import StringIO
23
22
from bzrlib import (
24
branch as _mod_branch,
27
28
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')
31
def load_tests(standard_tests, module, loader):
32
"""Multiply tests for the send command."""
33
result = loader.suiteClass()
35
# one for each king of change
36
changes_tests, remaining_tests = tests.split_suite_by_condition(
37
standard_tests, tests.condition_isinstance((
38
TestSendStrictWithChanges,
42
dict(_changes_type='_uncommitted_changes')),
44
dict(_changes_type='_pending_merges')),
46
dict(_changes_type='_out_of_sync_trees')),
48
tests.multiply_tests(changes_tests, changes_scenarios, result)
49
# No parametrization for the remaining tests
50
result.addTests(remaining_tests)
55
class TestSendMixin(object):
57
_default_command = ['send', '-o-']
58
_default_wd = 'branch'
60
def run_send(self, args, cmd=None, rc=0, wd=None, err_re=None):
61
if cmd is None: cmd = self._default_command
62
if wd is None: wd = self._default_wd
63
if err_re is None: err_re = []
64
return self.run_bzr(cmd + args, retcode=rc,
68
def get_MD(self, args, cmd=None, wd='branch'):
69
out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
70
return merge_directive.MergeDirective.from_lines(out.readlines())
72
def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
73
md = self.get_MD(args, cmd=cmd, wd=wd)
74
br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
75
self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
78
class TestSend(tests.TestCaseWithTransport, TestSendMixin):
81
super(TestSend, self).setUp()
82
grandparent_tree = bzrdir.BzrDir.create_standalone_workingtree(
41
84
self.build_tree_contents([('grandparent/file1', 'grandparent')])
42
85
grandparent_tree.add('file1')
43
grandparent_tree.commit('initial commit', rev_id='revision1')
86
grandparent_tree.commit('initial commit', rev_id='rev1')
44
88
parent_bzrdir = grandparent_tree.bzrdir.sprout('parent')
45
89
parent_tree = parent_bzrdir.open_workingtree()
46
parent_tree.commit('next commit', rev_id='revision2')
90
parent_tree.commit('next commit', rev_id='rev2')
47
92
branch_tree = parent_tree.bzrdir.sprout('branch').open_workingtree()
48
93
self.build_tree_contents([('branch/file1', 'branch')])
49
branch_tree.commit('last commit', rev_id='revision3')
94
branch_tree.commit('last commit', rev_id='rev3')
96
def assertFormatIs(self, fmt_string, md):
97
self.assertEqual(fmt_string, md.get_raw_bundle().splitlines()[0])
51
99
def test_uses_parent(self):
52
100
"""Parent location is used as a basis by default"""
54
os.chdir('grandparent')
55
errmsg = self.run_bzr('send -o-', retcode=3)[1]
101
errmsg = self.run_send([], rc=3, wd='grandparent')[1]
56
102
self.assertContainsRe(errmsg, 'No submit branch known or specified')
58
stdout, stderr = self.run_bzr('send -o-')
103
stdout, stderr = self.run_send([])
59
104
self.assertEqual(stderr.count('Using saved parent location'), 1)
60
br = read_bundle(StringIO(stdout))
61
self.assertRevisions(br, ['revision3'])
105
self.assertBundleContains(['rev3'], [])
63
107
def test_bundle(self):
64
108
"""Bundle works like send, except -o is not required"""
66
os.chdir('grandparent')
67
errmsg = self.run_bzr('bundle', retcode=3)[1]
109
errmsg = self.run_send([], cmd=['bundle'], rc=3, wd='grandparent')[1]
68
110
self.assertContainsRe(errmsg, 'No submit branch known or specified')
70
stdout, stderr = self.run_bzr('bundle')
111
stdout, stderr = self.run_send([], cmd=['bundle'])
71
112
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),
113
self.assertBundleContains(['rev3'], [], cmd=['bundle'])
79
115
def test_uses_submit(self):
80
116
"""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'])
117
self.assertBundleContains(['rev3'], [])
118
self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
87
119
# 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]
120
self.assertBundleContains(['rev3', 'rev2'], [])
122
self.run_send(['../parent'])
123
# We still point to ../grandparent
124
self.assertBundleContains(['rev3', 'rev2'], [])
125
# Remember parent now
126
self.run_send(['../parent', '--remember'])
127
# Now we point to parent
128
self.assertBundleContains(['rev3'], [])
130
err = self.run_send(['--remember'], rc=3)[1]
97
131
self.assertContainsRe(err,
98
132
'--remember requires a branch to be specified.')
100
134
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-')
135
self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
136
self.assertBundleContains(['rev2'], ['../grandparent', '-r-2'])
137
self.assertBundleContains(['rev3', 'rev2'],
138
['../grandparent', '-r-2..-1'])
139
md = self.get_MD(['-r-2..-1'])
140
self.assertEqual('rev2', md.base_revision_id)
141
self.assertEqual('rev3', md.revision_id)
117
143
def test_output(self):
118
144
# check output for consistency
119
145
# win32 stdout converts LF to CRLF,
120
146
# 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'])
147
self.assertBundleContains(['rev3'], [])
127
149
def test_no_common_ancestor(self):
128
150
foo = self.make_branch_and_tree('foo')
129
151
foo.commit('rev a')
130
152
bar = self.make_branch_and_tree('bar')
131
153
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())
154
self.run_send(['--from', 'foo', '../bar'], wd='foo')
139
156
def test_content_options(self):
140
157
"""--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'])
159
self.assertIsNot(None, md.bundle)
160
self.assertIsNot(None, md.patch)
162
md = self.get_MD(['--format=0.9'])
163
self.assertIsNot(None, md.bundle)
164
self.assertIsNot(None, md.patch)
166
md = self.get_MD(['--no-patch'])
152
167
self.assertIsNot(None, md.bundle)
153
168
self.assertIs(None, md.patch)
154
169
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', '.', '.'])
170
['send', '--no-patch', '--format=0.9', '-o-'],
171
working_dir='branch')
172
md = self.get_MD(['--no-bundle', '.', '.'])
158
173
self.assertIs(None, md.bundle)
159
174
self.assertIsNot(None, md.patch)
161
md = self.send_directive(['--no-bundle', '--format=0.9', '../parent',
176
md = self.get_MD(['--no-bundle', '--format=0.9', '../parent',
163
178
self.assertIs(None, md.bundle)
164
179
self.assertIsNot(None, md.patch)
166
md = self.send_directive(['--no-bundle', '--no-patch', '.', '.'])
181
md = self.get_MD(['--no-bundle', '--no-patch', '.', '.'])
167
182
self.assertIs(None, md.bundle)
168
183
self.assertIs(None, md.patch)
170
md = self.send_directive(['--no-bundle', '--no-patch', '--format=0.9',
185
md = self.get_MD(['--no-bundle', '--no-patch', '--format=0.9',
172
187
self.assertIs(None, md.bundle)
173
188
self.assertIs(None, md.patch)
175
190
def test_from_option(self):
177
191
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)
192
md = self.get_MD(['--from', 'branch'])
193
self.assertEqual('rev3', md.revision_id)
194
md = self.get_MD(['-f', 'branch'])
195
self.assertEqual('rev3', md.revision_id)
183
197
def test_output_option(self):
185
198
stdout = self.run_bzr('send -f branch --output file1')[0]
186
199
self.assertEqual('', stdout)
187
200
md_file = open('file1', 'rb')
188
201
self.addCleanup(md_file.close)
189
self.assertContainsRe(md_file.read(), 'revision3')
202
self.assertContainsRe(md_file.read(), 'rev3')
190
203
stdout = self.run_bzr('send -f branch --output -')[0]
191
self.assertContainsRe(stdout, 'revision3')
204
self.assertContainsRe(stdout, 'rev3')
193
206
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')
207
stderr = self.run_send([])[1]
208
self.assertEndsWith(stderr, '\nBundling 1 revision(s).\n')
198
210
def test_mailto_option(self):
200
branch = _mod_branch.Branch.open('branch')
201
branch.get_config().set_user_option('mail_client', 'editor')
211
b = branch.Branch.open('branch')
212
b.get_config().set_user_option('mail_client', 'editor')
202
213
self.run_bzr_error(
203
214
('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
204
215
), 'send -f branch')
205
branch.get_config().set_user_option('mail_client', 'bogus')
206
self.run_bzr('send -f branch -o-')
216
b.get_config().set_user_option('mail_client', 'bogus')
207
218
self.run_bzr_error(('Unknown mail client: bogus',),
208
219
'send -f branch --mail-to jrandom@example.org')
209
branch.get_config().set_user_option('submit_to', 'jrandom@example.org')
220
b.get_config().set_user_option('submit_to', 'jrandom@example.org')
210
221
self.run_bzr_error(('Unknown mail client: bogus',),
211
222
'send -f branch')
213
224
def test_mailto_child_option(self):
214
225
"""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')
226
b = branch.Branch.open('branch')
227
b.get_config().set_user_option('mail_client', 'bogus')
228
parent = branch.Branch.open('parent')
219
229
parent.get_config().set_user_option('child_submit_to',
220
230
'somebody@example.org')
221
231
self.run_bzr_error(('Unknown mail client: bogus',),
222
232
'send -f branch')
224
234
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())
235
md = self.get_MD(['--format=4'])
228
236
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')
237
self.assertFormatIs('# Bazaar revision bundle v4', md)
239
md = self.get_MD(['--format=0.9'])
240
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
242
md = self.get_MD(['--format=0.9'], cmd=['bundle'])
243
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
237
244
self.assertIs(merge_directive.MergeDirective, md.__class__)
238
246
self.run_bzr_error(['Bad value .* for option .format.'],
239
247
'send -f branch -o- --format=0.999')[0]
241
249
def test_format_child_option(self):
243
parent = _mod_branch.Branch.open('parent')
244
parent.get_config().set_user_option('child_submit_format', '4')
245
s = StringIO(self.run_bzr('send -f branch -o-')[0])
246
md = merge_directive.MergeDirective.from_lines(s.readlines())
250
parent_config = branch.Branch.open('parent').get_config()
251
parent_config.set_user_option('child_submit_format', '4')
247
253
self.assertIs(merge_directive.MergeDirective2, md.__class__)
248
parent.get_config().set_user_option('child_submit_format', '0.9')
249
s = StringIO(self.run_bzr('send -f branch -o-')[0])
250
md = merge_directive.MergeDirective.from_lines(s.readlines())
251
self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
252
'# Bazaar revision bundle v0.9')
253
s = StringIO(self.run_bzr('bundle -f branch -o-')[0])
254
md = merge_directive.MergeDirective.from_lines(s.readlines())
255
self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
256
'# Bazaar revision bundle v0.9')
255
parent_config.set_user_option('child_submit_format', '0.9')
257
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
259
md = self.get_MD([], cmd=['bundle'])
260
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
257
261
self.assertIs(merge_directive.MergeDirective, md.__class__)
258
parent.get_config().set_user_option('child_submit_format', '0.999')
263
parent_config.set_user_option('child_submit_format', '0.999')
259
264
self.run_bzr_error(["No such send format '0.999'"],
260
265
'send -f branch -o-')[0]
262
267
def test_message_option(self):
264
268
self.run_bzr('send', retcode=3)
265
md = self.send_directive(['--from', 'branch'])
266
270
self.assertIs(None, md.message)
267
md = self.send_directive(['--from', 'branch', '-m', 'my message'])
271
md = self.get_MD(['-m', 'my message'])
268
272
self.assertEqual('my message', md.message)
270
274
def test_omitted_revision(self):
272
md = self.send_directive(['-r-2..', '--from', 'branch'])
273
self.assertEqual('revision2', md.base_revision_id)
274
self.assertEqual('revision3', md.revision_id)
275
md = self.send_directive(['-r..3', '--from', 'branch',
277
self.assertEqual('revision1', md.base_revision_id)
278
self.assertEqual('revision3', md.revision_id)
275
md = self.get_MD(['-r-2..'])
276
self.assertEqual('rev2', md.base_revision_id)
277
self.assertEqual('rev3', md.revision_id)
278
md = self.get_MD(['-r..3', '--from', 'branch', 'grandparent'], wd='.')
279
self.assertEqual('rev1', md.base_revision_id)
280
self.assertEqual('rev3', md.revision_id)
280
282
def test_nonexistant_branch(self):
281
283
if sys.platform == "win32":
285
287
out, err = self.run_bzr(["send", "--from", location], retcode=3)
286
288
self.assertEqual(out, '')
287
289
self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
292
class TestSendStrictMixin(TestSendMixin):
294
def make_parent_and_local_branches(self):
295
# Create a 'parent' branch as the base
296
self.parent_tree = bzrdir.BzrDir.create_standalone_workingtree('parent')
297
self.build_tree_contents([('parent/file', 'parent')])
298
self.parent_tree.add('file')
299
self.parent_tree.commit('first commit', rev_id='parent')
300
# Branch 'local' from parent and do a change
301
local_bzrdir = self.parent_tree.bzrdir.sprout('local')
302
self.local_tree = local_bzrdir.open_workingtree()
303
self.build_tree_contents([('local/file', 'local')])
304
self.local_tree.commit('second commit', rev_id='local')
306
_default_command = ['send', '-o-', '../parent']
307
_default_wd = 'local'
308
_default_sent_revs = ['local']
309
_default_errors = ['Working tree ".*/local/" has uncommitted '
310
'changes \(See bzr status\)\.',]
312
def set_config_send_strict(self, value):
313
# set config var (any of bazaar.conf, locations.conf, branch.conf
315
conf = self.local_tree.branch.get_config()
316
conf.set_user_option('send_strict', value)
318
def assertSendFails(self, args):
319
self.run_send(args, rc=3, err_re=self._default_errors)
321
def assertSendSucceeds(self, args, revs=None):
323
revs = self._default_sent_revs
324
out, err = self.run_send(args)
326
'Bundling %d revision(s).\n' % len(revs), err)
327
md = merge_directive.MergeDirective.from_lines(
328
StringIO(out).readlines())
329
self.assertEqual('parent', md.base_revision_id)
330
br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
331
self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
334
class TestSendStrictWithoutChanges(tests.TestCaseWithTransport,
335
TestSendStrictMixin):
338
super(TestSendStrictWithoutChanges, self).setUp()
339
self.make_parent_and_local_branches()
341
def test_send_default(self):
342
self.assertSendSucceeds([])
344
def test_send_strict(self):
345
self.assertSendSucceeds(['--strict'])
347
def test_send_no_strict(self):
348
self.assertSendSucceeds(['--no-strict'])
350
def test_send_config_var_strict(self):
351
self.set_config_send_strict('true')
352
self.assertSendSucceeds([])
354
def test_send_config_var_no_strict(self):
355
self.set_config_send_strict('false')
356
self.assertSendSucceeds([])
359
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
360
TestSendStrictMixin):
362
_changes_type = None # Set by load_tests
365
super(TestSendStrictWithChanges, self).setUp()
366
# load tests set _changes_types to the name of the method we want to
368
do_changes_func = getattr(self, self._changes_type)
371
def _uncommitted_changes(self):
372
self.make_parent_and_local_branches()
373
# Make a change without committing it
374
self.build_tree_contents([('local/file', 'modified')])
376
def _pending_merges(self):
377
self.make_parent_and_local_branches()
378
# Create 'other' branch containing a new file
379
other_bzrdir = self.parent_tree.bzrdir.sprout('other')
380
other_tree = other_bzrdir.open_workingtree()
381
self.build_tree_contents([('other/other-file', 'other')])
382
other_tree.add('other-file')
383
other_tree.commit('other commit', rev_id='other')
384
# Merge and revert, leaving a pending merge
385
self.local_tree.merge_from_branch(other_tree.branch)
386
self.local_tree.revert(filenames=['other-file'], backups=False)
388
def _out_of_sync_trees(self):
389
self.make_parent_and_local_branches()
390
self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
391
# Make a change and commit it
392
self.build_tree_contents([('local/file', 'modified in local')])
393
self.local_tree.commit('modify file', rev_id='modified-in-local')
394
# Exercise commands from the checkout directory
395
self._default_wd = 'checkout'
396
self._default_errors = ["Working tree is out of date, please run"
398
self._default_sent_revs = ['modified-in-local', 'local']
400
def test_send_default(self):
401
self.assertSendFails([])
403
def test_send_with_revision(self):
404
self.assertSendSucceeds(['-r', 'revid:local'], revs=['local'])
406
def test_send_no_strict(self):
407
self.assertSendSucceeds(['--no-strict'])
409
def test_send_strict_with_changes(self):
410
self.assertSendFails(['--strict'])
412
def test_send_respect_config_var_strict(self):
413
self.set_config_send_strict('true')
414
self.assertSendFails([])
415
self.assertSendSucceeds(['--no-strict'])
418
def test_send_bogus_config_var_ignored(self):
419
self.set_config_send_strict("I'm unsure")
420
self.assertSendFails([])
423
def test_send_no_strict_command_line_override_config(self):
424
self.set_config_send_strict('true')
425
self.assertSendFails([])
426
self.assertSendSucceeds(['--no-strict'])
428
def test_push_strict_command_line_override_config(self):
429
self.set_config_send_strict('false')
430
self.assertSendSucceeds([])
431
self.assertSendFails(['--strict'])
434
class TestBundleStrictWithoutChanges(TestSendStrictWithoutChanges):
436
_default_command = ['bundle-revisions', '../parent']
added
removed
bzrlib/tests/blackbox/test_send.py
