14
14
# You should have received a copy of the GNU General Public License
15
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
20
from cStringIO import StringIO
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20
from StringIO import StringIO
22
from bzrlib import merge_directive
28
23
from bzrlib.bundle import serializer
29
from bzrlib.transport import memory
30
from bzrlib.tests.scenarios import load_tests_apply_scenarios
33
load_tests = load_tests_apply_scenarios
36
class TestSendMixin(object):
38
_default_command = ['send', '-o-']
39
_default_wd = 'branch'
41
def run_send(self, args, cmd=None, rc=0, wd=None, err_re=None):
42
if cmd is None: cmd = self._default_command
43
if wd is None: wd = self._default_wd
44
if err_re is None: err_re = []
45
return self.run_bzr(cmd + args, retcode=rc,
49
def get_MD(self, args, cmd=None, wd='branch'):
50
out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
51
return merge_directive.MergeDirective.from_lines(out)
53
def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
54
md = self.get_MD(args, cmd=cmd, wd=wd)
55
br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
56
self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
59
class TestSend(tests.TestCaseWithTransport, TestSendMixin):
62
super(TestSend, self).setUp()
63
grandparent_tree = bzrdir.BzrDir.create_standalone_workingtree(
24
from bzrlib.bzrdir import BzrDir
25
from bzrlib import tests
28
def read_bundle(fileobj):
29
md = merge_directive.MergeDirective.from_lines(fileobj.readlines())
30
return serializer.read_bundle(StringIO(md.get_raw_bundle()))
33
class TestSend(tests.TestCaseWithTransport):
36
grandparent_tree = BzrDir.create_standalone_workingtree('grandparent')
65
37
self.build_tree_contents([('grandparent/file1', 'grandparent')])
66
38
grandparent_tree.add('file1')
67
grandparent_tree.commit('initial commit', rev_id='rev1')
39
grandparent_tree.commit('initial commit', rev_id='revision1')
69
40
parent_bzrdir = grandparent_tree.bzrdir.sprout('parent')
70
41
parent_tree = parent_bzrdir.open_workingtree()
71
parent_tree.commit('next commit', rev_id='rev2')
42
parent_tree.commit('next commit', rev_id='revision2')
73
43
branch_tree = parent_tree.bzrdir.sprout('branch').open_workingtree()
74
44
self.build_tree_contents([('branch/file1', 'branch')])
75
branch_tree.commit('last commit', rev_id='rev3')
77
def assertFormatIs(self, fmt_string, md):
78
self.assertEqual(fmt_string, md.get_raw_bundle().splitlines()[0])
45
branch_tree.commit('last commit', rev_id='revision3')
80
47
def test_uses_parent(self):
81
48
"""Parent location is used as a basis by default"""
82
errmsg = self.run_send([], rc=3, wd='grandparent')[1]
50
os.chdir('grandparent')
51
errmsg = self.run_bzr('send -o-', retcode=3)[1]
83
52
self.assertContainsRe(errmsg, 'No submit branch known or specified')
84
stdout, stderr = self.run_send([])
85
self.assertEqual(stderr.count('Using saved parent location'), 1)
86
self.assertBundleContains(['rev3'], [])
54
stdout, stderr = self.run_bzr('send -o-')
55
self.assertEqual(stderr.count('Using saved location'), 1)
56
br = read_bundle(StringIO(stdout))
57
self.assertRevisions(br, ['revision3'])
88
59
def test_bundle(self):
89
60
"""Bundle works like send, except -o is not required"""
90
errmsg = self.run_send([], cmd=['bundle'], rc=3, wd='grandparent')[1]
62
os.chdir('grandparent')
63
errmsg = self.run_bzr('bundle', retcode=3)[1]
91
64
self.assertContainsRe(errmsg, 'No submit branch known or specified')
92
stdout, stderr = self.run_send([], cmd=['bundle'])
93
self.assertEqual(stderr.count('Using saved parent location'), 1)
94
self.assertBundleContains(['rev3'], [], cmd=['bundle'])
66
stdout, stderr = self.run_bzr('bundle')
67
self.assertEqual(stderr.count('Using saved location'), 1)
68
br = read_bundle(StringIO(stdout))
69
self.assertRevisions(br, ['revision3'])
71
def assertRevisions(self, bi, expected):
72
self.assertEqual(set(r.revision_id for r in bi.revisions),
96
75
def test_uses_submit(self):
97
76
"""Submit location can be used and set"""
98
self.assertBundleContains(['rev3'], [])
99
self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
79
br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
80
self.assertRevisions(br, ['revision3'])
81
br = read_bundle(StringIO(self.run_bzr('send ../grandparent -o-')[0]))
82
self.assertRevisions(br, ['revision3', 'revision2'])
100
83
# submit location should be auto-remembered
101
self.assertBundleContains(['rev3', 'rev2'], [])
103
self.run_send(['../parent'])
104
# We still point to ../grandparent
105
self.assertBundleContains(['rev3', 'rev2'], [])
106
# Remember parent now
107
self.run_send(['../parent', '--remember'])
108
# Now we point to parent
109
self.assertBundleContains(['rev3'], [])
111
err = self.run_send(['--remember'], rc=3)[1]
112
self.assertContainsRe(err,
84
br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
85
self.assertRevisions(br, ['revision3', 'revision2'])
86
self.run_bzr('send ../parent -o-')
87
br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
88
self.assertRevisions(br, ['revision3', 'revision2'])
89
self.run_bzr('send ../parent --remember -o-')
90
br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
91
self.assertRevisions(br, ['revision3'])
92
err = self.run_bzr('send --remember -o-', retcode=3)[1]
93
self.assertContainsRe(err,
113
94
'--remember requires a branch to be specified.')
115
96
def test_revision_branch_interaction(self):
116
self.assertBundleContains(['rev3', 'rev2'], ['../grandparent'])
117
self.assertBundleContains(['rev2'], ['../grandparent', '-r-2'])
118
self.assertBundleContains(['rev3', 'rev2'],
119
['../grandparent', '-r-2..-1'])
120
md = self.get_MD(['-r-2..-1'])
121
self.assertEqual('rev2', md.base_revision_id)
122
self.assertEqual('rev3', md.revision_id)
99
bi = read_bundle(StringIO(self.run_bzr('send ../grandparent -o-')[0]))
100
self.assertRevisions(bi, ['revision3', 'revision2'])
101
out = StringIO(self.run_bzr('send ../grandparent -r -2 -o-')[0])
102
bi = read_bundle(out)
103
self.assertRevisions(bi, ['revision2'])
104
sio = StringIO(self.run_bzr('send -r -2..-1 -o-')[0])
105
md = merge_directive.MergeDirective.from_lines(sio.readlines())
106
self.assertEqual('revision2', md.base_revision_id)
107
self.assertEqual('revision3', md.revision_id)
109
bi = read_bundle(sio)
110
self.assertRevisions(bi, ['revision2', 'revision3'])
111
self.run_bzr('send ../grandparent -r -2..-1 -o-')
124
113
def test_output(self):
125
114
# check output for consistency
126
115
# win32 stdout converts LF to CRLF,
127
116
# which would break patch-based bundles
128
self.assertBundleContains(['rev3'], [])
119
stdout = self.run_bzr_subprocess('send -o-')[0]
120
br = read_bundle(StringIO(stdout))
121
self.assertRevisions(br, ['revision3'])
130
123
def test_no_common_ancestor(self):
131
124
foo = self.make_branch_and_tree('foo')
132
125
foo.commit('rev a')
133
126
bar = self.make_branch_and_tree('bar')
134
127
bar.commit('rev b')
135
self.run_send(['--from', 'foo', '../bar'], wd='foo')
129
self.run_bzr('send ../bar -o-')
131
def send_directive(self, args):
132
sio = StringIO(self.run_bzr(['send', '-o-'] + args)[0])
133
return merge_directive.MergeDirective.from_lines(sio.readlines())
137
135
def test_content_options(self):
138
136
"""--no-patch and --no-bundle should work and be independant"""
140
self.assertIsNot(None, md.bundle)
141
self.assertIsNot(None, md.patch)
143
md = self.get_MD(['--format=0.9'])
144
self.assertIsNot(None, md.bundle)
145
self.assertIsNot(None, md.patch)
147
md = self.get_MD(['--no-patch'])
139
md = self.send_directive([])
140
self.assertIsNot(None, md.bundle)
141
self.assertIsNot(None, md.patch)
143
md = self.send_directive(['--format=0.9'])
144
self.assertIsNot(None, md.bundle)
145
self.assertIsNot(None, md.patch)
147
md = self.send_directive(['--no-patch'])
148
148
self.assertIsNot(None, md.bundle)
149
149
self.assertIs(None, md.patch)
150
150
self.run_bzr_error(['Format 0.9 does not permit bundle with no patch'],
151
['send', '--no-patch', '--format=0.9', '-o-'],
152
working_dir='branch')
153
md = self.get_MD(['--no-bundle', '.', '.'])
151
'send --no-patch --format=0.9 -o-')
153
md = self.send_directive(['--no-bundle', '.', '.'])
154
154
self.assertIs(None, md.bundle)
155
155
self.assertIsNot(None, md.patch)
157
md = self.get_MD(['--no-bundle', '--format=0.9', '../parent',
157
md = self.send_directive(['--no-bundle', '--format=0.9', '../parent',
159
159
self.assertIs(None, md.bundle)
160
160
self.assertIsNot(None, md.patch)
162
md = self.get_MD(['--no-bundle', '--no-patch', '.', '.'])
162
md = self.send_directive(['--no-bundle', '--no-patch', '.', '.'])
163
163
self.assertIs(None, md.bundle)
164
164
self.assertIs(None, md.patch)
166
md = self.get_MD(['--no-bundle', '--no-patch', '--format=0.9',
166
md = self.send_directive(['--no-bundle', '--no-patch', '--format=0.9',
168
168
self.assertIs(None, md.bundle)
169
169
self.assertIs(None, md.patch)
171
171
def test_from_option(self):
172
173
self.run_bzr('send', retcode=3)
173
md = self.get_MD(['--from', 'branch'])
174
self.assertEqual('rev3', md.revision_id)
175
md = self.get_MD(['-f', 'branch'])
176
self.assertEqual('rev3', md.revision_id)
174
md = self.send_directive(['--from', 'branch'])
175
self.assertEqual('revision3', md.revision_id)
176
md = self.send_directive(['-f', 'branch'])
177
self.assertEqual('revision3', md.revision_id)
178
179
def test_output_option(self):
179
181
stdout = self.run_bzr('send -f branch --output file1')[0]
180
182
self.assertEqual('', stdout)
181
183
md_file = open('file1', 'rb')
182
184
self.addCleanup(md_file.close)
183
self.assertContainsRe(md_file.read(), 'rev3')
185
self.assertContainsRe(md_file.read(), 'revision3')
184
186
stdout = self.run_bzr('send -f branch --output -')[0]
185
self.assertContainsRe(stdout, 'rev3')
187
def test_note_revisions(self):
188
stderr = self.run_send([])[1]
189
self.assertEndsWith(stderr, '\nBundling 1 revision(s).\n')
191
def test_mailto_option(self):
192
b = branch.Branch.open('branch')
193
b.get_config().set_user_option('mail_client', 'editor')
195
('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
197
b.get_config().set_user_option('mail_client', 'bogus')
199
self.run_bzr_error(('Unknown mail client: bogus',),
200
'send -f branch --mail-to jrandom@example.org')
201
b.get_config().set_user_option('submit_to', 'jrandom@example.org')
202
self.run_bzr_error(('Unknown mail client: bogus',),
205
def test_mailto_child_option(self):
206
"""Make sure that child_submit_to is used."""
207
b = branch.Branch.open('branch')
208
b.get_config().set_user_option('mail_client', 'bogus')
209
parent = branch.Branch.open('parent')
210
parent.get_config().set_user_option('child_submit_to',
211
'somebody@example.org')
212
self.run_bzr_error(('Unknown mail client: bogus',),
187
self.assertContainsRe(stdout, 'revision3')
189
def test_output_option_required(self):
191
self.run_bzr_error(('File must be specified with --output',),
213
192
'send -f branch')
215
194
def test_format(self):
216
md = self.get_MD(['--format=4'])
196
s = StringIO(self.run_bzr('send -f branch -o- --format=4')[0])
197
md = merge_directive.MergeDirective.from_lines(s.readlines())
217
198
self.assertIs(merge_directive.MergeDirective2, md.__class__)
218
self.assertFormatIs('# Bazaar revision bundle v4', md)
220
md = self.get_MD(['--format=0.9'])
221
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
223
md = self.get_MD(['--format=0.9'], cmd=['bundle'])
224
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
199
s = StringIO(self.run_bzr('send -f branch -o- --format=0.9')[0])
200
md = merge_directive.MergeDirective.from_lines(s.readlines())
201
self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
202
'# Bazaar revision bundle v0.9')
203
s = StringIO(self.run_bzr('bundle -f branch -o- --format=0.9')[0])
204
md = merge_directive.MergeDirective.from_lines(s.readlines())
205
self.assertContainsRe(md.get_raw_bundle().splitlines()[0],
206
'# Bazaar revision bundle v0.9')
225
207
self.assertIs(merge_directive.MergeDirective, md.__class__)
227
208
self.run_bzr_error(['Bad value .* for option .format.'],
228
209
'send -f branch -o- --format=0.999')[0]
230
def test_format_child_option(self):
231
parent_config = branch.Branch.open('parent').get_config()
232
parent_config.set_user_option('child_submit_format', '4')
234
self.assertIs(merge_directive.MergeDirective2, md.__class__)
236
parent_config.set_user_option('child_submit_format', '0.9')
238
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
240
md = self.get_MD([], cmd=['bundle'])
241
self.assertFormatIs('# Bazaar revision bundle v0.9', md)
242
self.assertIs(merge_directive.MergeDirective, md.__class__)
244
parent_config.set_user_option('child_submit_format', '0.999')
245
self.run_bzr_error(["No such send format '0.999'"],
246
'send -f branch -o-')[0]
248
def test_message_option(self):
249
self.run_bzr('send', retcode=3)
251
self.assertIs(None, md.message)
252
md = self.get_MD(['-m', 'my message'])
253
self.assertEqual('my message', md.message)
255
def test_omitted_revision(self):
256
md = self.get_MD(['-r-2..'])
257
self.assertEqual('rev2', md.base_revision_id)
258
self.assertEqual('rev3', md.revision_id)
259
md = self.get_MD(['-r..3', '--from', 'branch', 'grandparent'], wd='.')
260
self.assertEqual('rev1', md.base_revision_id)
261
self.assertEqual('rev3', md.revision_id)
263
def test_nonexistant_branch(self):
264
self.vfs_transport_factory = memory.MemoryServer
265
location = self.get_url('absentdir/')
266
out, err = self.run_bzr(["send", "--from", location], retcode=3)
267
self.assertEqual(out, '')
268
self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
271
class TestSendStrictMixin(TestSendMixin):
273
def make_parent_and_local_branches(self):
274
# Create a 'parent' branch as the base
275
self.parent_tree = bzrdir.BzrDir.create_standalone_workingtree('parent')
276
self.build_tree_contents([('parent/file', 'parent')])
277
self.parent_tree.add('file')
278
self.parent_tree.commit('first commit', rev_id='parent')
279
# Branch 'local' from parent and do a change
280
local_bzrdir = self.parent_tree.bzrdir.sprout('local')
281
self.local_tree = local_bzrdir.open_workingtree()
282
self.build_tree_contents([('local/file', 'local')])
283
self.local_tree.commit('second commit', rev_id='local')
285
_default_command = ['send', '-o-', '../parent']
286
_default_wd = 'local'
287
_default_sent_revs = ['local']
288
_default_errors = ['Working tree ".*/local/" has uncommitted '
289
'changes \(See bzr status\)\.',]
290
_default_additional_error = 'Use --no-strict to force the send.\n'
291
_default_additional_warning = 'Uncommitted changes will not be sent.'
293
def set_config_send_strict(self, value):
294
# set config var (any of bazaar.conf, locations.conf, branch.conf
296
conf = self.local_tree.branch.get_config()
297
conf.set_user_option('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)
311
bundling_revs = 'Bundling %d revision(s).\n' % len(revs)
313
self.assertContainsRe(err, self._default_additional_warning)
314
self.assertEndsWith(err, bundling_revs)
316
self.assertEquals(bundling_revs, err)
317
md = merge_directive.MergeDirective.from_lines(StringIO(out))
318
self.assertEqual('parent', md.base_revision_id)
319
br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
320
self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
323
class TestSendStrictWithoutChanges(tests.TestCaseWithTransport,
324
TestSendStrictMixin):
327
super(TestSendStrictWithoutChanges, self).setUp()
328
self.make_parent_and_local_branches()
330
def test_send_default(self):
331
self.assertSendSucceeds([])
333
def test_send_strict(self):
334
self.assertSendSucceeds(['--strict'])
336
def test_send_no_strict(self):
337
self.assertSendSucceeds(['--no-strict'])
339
def test_send_config_var_strict(self):
340
self.set_config_send_strict('true')
341
self.assertSendSucceeds([])
343
def test_send_config_var_no_strict(self):
344
self.set_config_send_strict('false')
345
self.assertSendSucceeds([])
348
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
349
TestSendStrictMixin):
351
# These are textually the same as test_push.strict_push_change_scenarios,
352
# but since the functions are reimplemented here, the definitions are left
356
dict(_changes_type='_uncommitted_changes')),
358
dict(_changes_type='_pending_merges')),
359
('out-of-sync-trees',
360
dict(_changes_type='_out_of_sync_trees')),
363
_changes_type = None # Set by load_tests
366
super(TestSendStrictWithChanges, self).setUp()
367
# load tests set _changes_types to the name of the method we want to
369
do_changes_func = getattr(self, self._changes_type)
372
def _uncommitted_changes(self):
373
self.make_parent_and_local_branches()
374
# Make a change without committing it
375
self.build_tree_contents([('local/file', 'modified')])
377
def _pending_merges(self):
378
self.make_parent_and_local_branches()
379
# Create 'other' branch containing a new file
380
other_bzrdir = self.parent_tree.bzrdir.sprout('other')
381
other_tree = other_bzrdir.open_workingtree()
382
self.build_tree_contents([('other/other-file', 'other')])
383
other_tree.add('other-file')
384
other_tree.commit('other commit', rev_id='other')
385
# Merge and revert, leaving a pending merge
386
self.local_tree.merge_from_branch(other_tree.branch)
387
self.local_tree.revert(filenames=['other-file'], backups=False)
389
def _out_of_sync_trees(self):
390
self.make_parent_and_local_branches()
391
self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
392
# Make a change and commit it
393
self.build_tree_contents([('local/file', 'modified in local')])
394
self.local_tree.commit('modify file', rev_id='modified-in-local')
395
# Exercise commands from the checkout directory
396
self._default_wd = 'checkout'
397
self._default_errors = ["Working tree is out of date, please run"
399
self._default_sent_revs = ['modified-in-local', 'local']
401
def test_send_default(self):
402
self.assertSendSucceeds([], with_warning=True)
404
def test_send_with_revision(self):
405
self.assertSendSucceeds(['-r', 'revid:local'], revs=['local'])
407
def test_send_no_strict(self):
408
self.assertSendSucceeds(['--no-strict'])
410
def test_send_strict_with_changes(self):
411
self.assertSendFails(['--strict'])
413
def test_send_respect_config_var_strict(self):
414
self.set_config_send_strict('true')
415
self.assertSendFails([])
416
self.assertSendSucceeds(['--no-strict'])
418
def test_send_bogus_config_var_ignored(self):
419
self.set_config_send_strict("I'm unsure")
420
self.assertSendSucceeds([], with_warning=True)
422
def test_send_no_strict_command_line_override_config(self):
423
self.set_config_send_strict('true')
424
self.assertSendFails([])
425
self.assertSendSucceeds(['--no-strict'])
427
def test_send_strict_command_line_override_config(self):
428
self.set_config_send_strict('false')
429
self.assertSendSucceeds([])
430
self.assertSendFails(['--strict'])
433
class TestBundleStrictWithoutChanges(TestSendStrictWithoutChanges):
435
_default_command = ['bundle-revisions', '../parent']
added
removed
bzrlib/tests/blackbox/test_send.py
