35
38
# If forced, it should succeed, but this is not tested here.
36
39
self.run_bzr("init")
37
40
self.build_tree(['hello.txt'])
38
result = self.run_bzr("commit", "-m", "empty", retcode=3)
39
self.assertEqual(('', 'bzr: ERROR: no changes to commit.'
40
' use --unchanged to commit anyhow\n'),
41
out,err = self.run_bzr("commit", "-m", "empty", retcode=3)
42
self.assertEqual('', out)
43
self.assertStartsWith(err, 'bzr: ERROR: no changes to commit.'
44
' use --unchanged to commit anyhow\n')
46
def test_commit_success(self):
47
"""Successful commit should not leave behind a bzr-commit-* file"""
49
self.run_bzr("commit", "--unchanged", "-m", "message")
50
self.assertEqual('', self.run_bzr(['unknowns'])[0])
52
# same for unicode messages
53
self.run_bzr("commit", "--unchanged", "-m", u'foo\xb5')
54
self.assertEqual('', self.run_bzr(['unknowns'])[0])
43
56
def test_commit_with_path(self):
44
57
"""Commit tree with path of root specified"""
208
221
def test_empty_commit_message(self):
210
223
file('foo.c', 'wt').write('int main() {}')
211
self.runbzr(['add', 'foo.c'])
212
self.runbzr(["commit", "-m", ""] , retcode=3)
224
self.run_bzr('add foo.c')
225
self.run_bzr('commit -m ""', retcode=3)
214
227
def test_other_branch_commit(self):
215
228
# this branch is to ensure consistent behaviour, whether we're run
216
229
# inside a branch, or not.
217
230
os.mkdir('empty_branch')
218
231
os.chdir('empty_branch')
220
233
os.mkdir('branch')
221
234
os.chdir('branch')
223
236
file('foo.c', 'wt').write('int main() {}')
224
237
file('bar.c', 'wt').write('int main() {}')
226
self.runbzr(['add', 'branch/foo.c'])
227
self.runbzr(['add', 'branch'])
239
self.run_bzr(['add', 'branch/foo.c'])
240
self.run_bzr(['add', 'branch'])
228
241
# can't commit files in different trees; sane error
229
self.runbzr('commit -m newstuff branch/foo.c .', retcode=3)
230
self.runbzr('commit -m newstuff branch/foo.c')
231
self.runbzr('commit -m newstuff branch')
232
self.runbzr('commit -m newstuff branch', retcode=3)
242
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
243
self.run_bzr('commit -m newstuff branch/foo.c')
244
self.run_bzr('commit -m newstuff branch')
245
self.run_bzr('commit -m newstuff branch', retcode=3)
234
247
def test_out_of_date_tree_commit(self):
235
248
# check we get an error code and a clear message committing with an out
236
249
# of date checkout
237
250
self.make_branch_and_tree('branch')
238
251
# make a checkout
239
self.runbzr('checkout --lightweight branch checkout')
252
self.run_bzr('checkout --lightweight branch checkout')
240
253
# commit to the original branch to make the checkout out of date
241
self.runbzr('commit --unchanged -m message branch')
254
self.run_bzr('commit --unchanged -m message branch')
242
255
# now commit to the checkout should emit
243
256
# ERROR: Out of date with the branch, 'bzr update' is suggested
244
output = self.runbzr('commit --unchanged -m checkout_message '
257
output = self.run_bzr('commit --unchanged -m checkout_message '
245
258
'checkout', retcode=3)
246
259
self.assertEqual(output,
300
313
self.assertNotContainsRe(result, 'file-a')
301
314
result = self.run_bzr('status')[0]
302
315
self.assertContainsRe(result, 'removed:\n file-a')
317
def test_strict_commit(self):
318
"""Commit with --strict works if everything is known"""
319
ignores._set_user_ignores([])
320
tree = self.make_branch_and_tree('tree')
321
self.build_tree(['tree/a'])
323
# A simple change should just work
324
self.run_bzr('commit', '--strict', '-m', 'adding a',
327
def test_strict_commit_no_changes(self):
328
"""commit --strict gives "no changes" if there is nothing to commit"""
329
tree = self.make_branch_and_tree('tree')
330
self.build_tree(['tree/a'])
332
tree.commit('adding a')
334
# With no changes, it should just be 'no changes'
335
# Make sure that commit is failing because there is nothing to do
336
self.run_bzr_error(['no changes to commit'],
337
'commit', '--strict', '-m', 'no changes',
340
# But --strict doesn't care if you supply --unchanged
341
self.run_bzr('commit', '--strict', '--unchanged', '-m', 'no changes',
344
def test_strict_commit_unknown(self):
345
"""commit --strict fails if a file is unknown"""
346
tree = self.make_branch_and_tree('tree')
347
self.build_tree(['tree/a'])
349
tree.commit('adding a')
351
# Add one file so there is a change, but forget the other
352
self.build_tree(['tree/b', 'tree/c'])
354
self.run_bzr_error(['Commit refused because there are unknown files'],
355
'commit', '--strict', '-m', 'add b',
358
# --no-strict overrides --strict
359
self.run_bzr('commit', '--strict', '-m', 'add b', '--no-strict',
362
def test_fixes_bug_output(self):
363
"""commit --fixes=lp:23452 succeeds without output."""
364
tree = self.make_branch_and_tree('tree')
365
self.build_tree(['tree/hello.txt'])
366
tree.add('hello.txt')
367
output, err = self.run_bzr(
368
'commit', '-m', 'hello', '--fixes=lp:23452', 'tree/hello.txt')
369
self.assertEqual('', output)
370
self.assertEqual('added hello.txt\nCommitted revision 1.\n', err)
372
def test_no_bugs_no_properties(self):
373
"""If no bugs are fixed, the bugs property is not set.
375
see https://beta.launchpad.net/bzr/+bug/109613
377
tree = self.make_branch_and_tree('tree')
378
self.build_tree(['tree/hello.txt'])
379
tree.add('hello.txt')
380
self.run_bzr( 'commit', '-m', 'hello', 'tree/hello.txt')
381
# Get the revision properties, ignoring the branch-nick property, which
382
# we don't care about for this test.
383
last_rev = tree.branch.repository.get_revision(tree.last_revision())
384
properties = dict(last_rev.properties)
385
del properties['branch-nick']
386
self.assertFalse('bugs' in properties)
388
def test_fixes_bug_sets_property(self):
389
"""commit --fixes=lp:234 sets the lp:234 revprop to 'fixed'."""
390
tree = self.make_branch_and_tree('tree')
391
self.build_tree(['tree/hello.txt'])
392
tree.add('hello.txt')
394
'commit', '-m', 'hello', '--fixes=lp:234', 'tree/hello.txt')
396
# Get the revision properties, ignoring the branch-nick property, which
397
# we don't care about for this test.
398
last_rev = tree.branch.repository.get_revision(tree.last_revision())
399
properties = dict(last_rev.properties)
400
del properties['branch-nick']
402
self.assertEqual({'bugs': 'https://launchpad.net/bugs/234 fixed'},
405
def test_fixes_multiple_bugs_sets_properties(self):
406
"""--fixes can be used more than once to show that bugs are fixed."""
407
tree = self.make_branch_and_tree('tree')
408
self.build_tree(['tree/hello.txt'])
409
tree.add('hello.txt')
411
'commit', '-m', 'hello', '--fixes=lp:123', '--fixes=lp:235',
414
# Get the revision properties, ignoring the branch-nick property, which
415
# we don't care about for this test.
416
last_rev = tree.branch.repository.get_revision(tree.last_revision())
417
properties = dict(last_rev.properties)
418
del properties['branch-nick']
421
{'bugs': 'https://launchpad.net/bugs/123 fixed\n'
422
'https://launchpad.net/bugs/235 fixed'},
425
def test_fixes_bug_with_alternate_trackers(self):
426
"""--fixes can be used on a properly configured branch to mark bug
427
fixes on multiple trackers.
429
tree = self.make_branch_and_tree('tree')
430
tree.branch.get_config().set_user_option(
431
'trac_twisted_url', 'http://twistedmatrix.com/trac')
432
self.build_tree(['tree/hello.txt'])
433
tree.add('hello.txt')
435
'commit', '-m', 'hello', '--fixes=lp:123',
436
'--fixes=twisted:235', 'tree/')
438
# Get the revision properties, ignoring the branch-nick property, which
439
# we don't care about for this test.
440
last_rev = tree.branch.repository.get_revision(tree.last_revision())
441
properties = dict(last_rev.properties)
442
del properties['branch-nick']
445
{'bugs': 'https://launchpad.net/bugs/123 fixed\n'
446
'http://twistedmatrix.com/trac/ticket/235 fixed'},
449
def test_fixes_unknown_bug_prefix(self):
450
tree = self.make_branch_and_tree('tree')
451
self.build_tree(['tree/hello.txt'])
452
tree.add('hello.txt')
454
["Unrecognized bug %s. Commit refused." % 'xxx:123'],
455
'commit', '-m', 'add b', '--fixes=xxx:123',
458
def test_fixes_invalid_bug_number(self):
459
tree = self.make_branch_and_tree('tree')
460
self.build_tree(['tree/hello.txt'])
461
tree.add('hello.txt')
463
["Invalid bug identifier for %s. Commit refused." % 'lp:orange'],
464
'commit', '-m', 'add b', '--fixes=lp:orange',
467
def test_fixes_invalid_argument(self):
468
"""Raise an appropriate error when the fixes argument isn't tag:id."""
469
tree = self.make_branch_and_tree('tree')
470
self.build_tree(['tree/hello.txt'])
471
tree.add('hello.txt')
473
[r"Invalid bug orange. Must be in the form of 'tag:id'\. "
474
r"Commit refused\."],
475
'commit', '-m', 'add b', '--fixes=orange',