1
# Copyright (C) 2006-2010 Canonical Ltd
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
"""Tests for the commit CLI of bzr."""
23
22
from bzrlib import (
30
26
from bzrlib.bzrdir import BzrDir
31
from bzrlib.tests import (
35
27
from bzrlib.tests.blackbox import ExternalBase
44
36
self.build_tree(['hello.txt'])
45
37
out,err = self.run_bzr('commit -m empty', retcode=3)
46
38
self.assertEqual('', out)
47
self.assertContainsRe(err, 'bzr: ERROR: No changes to commit\.'
48
' Use --unchanged to commit anyhow.\n')
39
self.assertContainsRe(err, 'bzr: ERROR: no changes to commit\.'
40
' use --unchanged to commit anyhow\n')
50
42
def test_commit_success(self):
51
43
"""Successful commit should not leave behind a bzr-commit-* file"""
84
76
tree.add("hello.txt")
85
77
out,err = self.run_bzr('commit -m added')
86
78
self.assertEqual('', out)
87
self.assertContainsRe(err, '^Committing to: .*\n'
79
self.assertContainsRe(err, '^Committing revision 1 to ".*"\.\n'
88
80
'added hello.txt\n'
89
81
'Committed revision 1.\n$',)
103
95
self.build_tree_contents([('hello.txt', 'new contents')])
104
96
out, err = self.run_bzr('commit -m modified')
105
97
self.assertEqual('', out)
106
self.assertContainsRe(err, '^Committing to: .*\n'
98
self.assertContainsRe(err, '^Committing revision 2 to ".*"\.\n'
107
99
'modified hello\.txt\n'
108
100
'Committed revision 2\.\n$')
110
def test_warn_about_forgotten_commit_message(self):
111
"""Test that the lack of -m parameter is caught"""
112
wt = self.make_branch_and_tree('.')
113
self.build_tree(['one', 'two'])
115
out, err = self.run_bzr('commit -m one two')
116
self.assertContainsRe(err, "The commit message is a file name")
118
102
def test_verbose_commit_renamed(self):
119
103
# Verbose commit of renamed file should say so
120
104
wt = self.prepare_simple_history()
121
105
wt.rename_one('hello.txt', 'gutentag.txt')
122
106
out, err = self.run_bzr('commit -m renamed')
123
107
self.assertEqual('', out)
124
self.assertContainsRe(err, '^Committing to: .*\n'
108
self.assertContainsRe(err, '^Committing revision 2 to ".*"\.\n'
125
109
'renamed hello\.txt => gutentag\.txt\n'
126
110
'Committed revision 2\.$\n')
133
117
wt.rename_one('hello.txt', 'subdir/hello.txt')
134
118
out, err = self.run_bzr('commit -m renamed')
135
119
self.assertEqual('', out)
136
self.assertEqual(set([
137
'Committing to: %s/' % osutils.getcwd(),
139
'renamed hello.txt => subdir/hello.txt',
140
'Committed revision 2.',
142
]), set(err.split('\n')))
120
self.assertContainsRe(err, '^Committing revision 2 to ".*"\.\n'
122
'renamed hello\.txt => subdir/hello\.txt\n'
123
'Committed revision 2\.\n$')
144
125
def test_verbose_commit_with_unknown(self):
145
126
"""Unknown files should not be listed by default in verbose output"""
149
130
wt.add(['hello.txt'])
150
131
out,err = self.run_bzr('commit -m added')
151
132
self.assertEqual('', out)
152
self.assertContainsRe(err, '^Committing to: .*\n'
133
self.assertContainsRe(err, '^Committing revision 1 to ".*"\.\n'
153
134
'added hello\.txt\n'
154
135
'Committed revision 1\.\n$')
162
143
tree.add("hello.txt")
163
144
out,err = self.run_bzr('commit -m added')
164
145
self.assertEqual('', out)
165
self.assertContainsRe(err, '^Committing to: .*\n'
146
self.assertContainsRe(err, '^Committing revision 2 to ".*"\.\n'
166
147
'added hello\.txt\n'
167
148
'Committed revision 2\.$\n')
176
157
b_tree = a_tree.branch.create_checkout('b')
177
158
expected = "%s/" % (osutils.abspath('a'), )
178
159
out, err = self.run_bzr('commit -m blah --unchanged', working_dir='b')
179
self.assertEqual(err, 'Committing to: %s\n'
160
self.assertEqual(err, 'Committing revision 2 to "%s".\n'
180
161
'Committed revision 2.\n' % expected)
182
def test_commit_sanitizes_CR_in_message(self):
183
# See bug #433779, basically Emacs likes to pass '\r\n' style line
184
# endings to 'bzr commit -m ""' which breaks because we don't allow
185
# '\r' in commit messages. (Mostly because of issues where XML style
186
# formats arbitrarily strip it out of the data while parsing.)
187
# To make life easier for users, we just always translate '\r\n' =>
188
# '\n'. And '\r' => '\n'.
189
a_tree = self.make_branch_and_tree('a')
190
self.build_tree(['a/b'])
192
self.run_bzr(['commit',
193
'-m', 'a string\r\n\r\nwith mixed\r\rendings\n'],
195
rev_id = a_tree.branch.last_revision()
196
rev = a_tree.branch.repository.get_revision(rev_id)
197
self.assertEqualDiff('a string\n\nwith mixed\n\nendings\n',
200
163
def test_commit_merge_reports_all_modified_files(self):
201
164
# the commit command should show all the files that are shown by
202
165
# bzr diff or bzr status when committing, even when they were not
251
214
out,err = self.run_bzr('commit -m added')
252
215
self.assertEqual('', out)
253
self.assertEqual(set([
254
'Committing to: %s/' % osutils.getcwd(),
255
'modified filetomodify',
258
'renamed dirtorename => renameddir',
259
'renamed filetorename => renamedfile',
260
'renamed dirtoreparent => renameddir/reparenteddir',
261
'renamed filetoreparent => renameddir/reparentedfile',
262
'deleted dirtoremove',
263
'deleted filetoremove',
264
'Committed revision 2.',
266
]), set(err.split('\n')))
216
expected = '%s/' % (osutils.getcwd(), )
217
self.assertEqualDiff(
218
'Committing revision 2 to "%s".\n'
219
'modified filetomodify\n'
222
'renamed dirtorename => renameddir\n'
223
'renamed filetorename => renamedfile\n'
224
'renamed dirtoreparent => renameddir/reparenteddir\n'
225
'renamed filetoreparent => renameddir/reparentedfile\n'
226
'deleted dirtoremove\n'
227
'deleted filetoremove\n'
228
'Committed revision 2.\n' % (expected, ),
268
231
def test_empty_commit_message(self):
269
232
tree = self.make_branch_and_tree('.')
272
235
self.run_bzr('commit -m ""', retcode=3)
274
237
def test_unsupported_encoding_commit_message(self):
275
if sys.platform == 'win32':
276
raise tests.TestNotApplicable('Win32 parses arguments directly'
277
' as Unicode, so we can\'t pass invalid non-ascii')
278
238
tree = self.make_branch_and_tree('.')
279
239
self.build_tree_contents([('foo.c', 'int main() {}')])
280
240
tree.add('foo.c')
281
# LANG env variable has no effect on Windows
282
# but some characters anyway cannot be represented
283
# in default user encoding
284
char = probe_bad_non_ascii(osutils.get_user_encoding())
286
raise TestSkipped('Cannot find suitable non-ascii character'
287
'for user_encoding (%s)' % osutils.get_user_encoding())
288
out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
290
env_changes={'LANG': 'C'})
241
out,err = self.run_bzr_subprocess('commit -m "\xff"', retcode=1,
242
env_changes={'LANG': 'C'})
291
243
self.assertContainsRe(err, r'bzrlib.errors.BzrError: Parameter.*is '
292
244
'unsupported by the current encoding.')
299
251
self.build_tree_contents([
300
252
('branch/foo.c', 'int main() {}'),
301
253
('branch/bar.c', 'int main() {}')])
302
inner_tree.add(['foo.c', 'bar.c'])
254
inner_tree.add('foo.c')
255
inner_tree.add('bar.c')
303
256
# can't commit files in different trees; sane error
304
257
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
305
# can commit to branch - records foo.c only
306
258
self.run_bzr('commit -m newstuff branch/foo.c')
307
# can commit to branch - records bar.c
308
259
self.run_bzr('commit -m newstuff branch')
310
self.run_bzr_error(["No changes to commit"], 'commit -m newstuff branch')
260
self.run_bzr('commit -m newstuff branch', retcode=3)
312
262
def test_out_of_date_tree_commit(self):
313
263
# check we get an error code and a clear message committing with an out
337
287
def test_commit_a_text_merge_in_a_checkout(self):
338
288
# checkouts perform multiple actions in a transaction across bond
339
289
# branches and their master, and have been observed to fail in the
340
# past. This is a user story reported to fail in bug #43959 where
290
# past. This is a user story reported to fail in bug #43959 where
341
291
# a merge done in a checkout (using the update command) failed to
342
292
# commit correctly.
343
293
trunk = self.make_branch_and_tree('trunk')
345
295
u1 = trunk.branch.create_checkout('u1')
346
self.build_tree_contents([('u1/hosts', 'initial contents\n')])
296
self.build_tree_contents([('u1/hosts', 'initial contents')])
348
298
self.run_bzr('commit -m add-hosts u1')
350
300
u2 = trunk.branch.create_checkout('u2')
351
self.build_tree_contents([('u2/hosts', 'altered in u2\n')])
301
self.build_tree_contents([('u2/hosts', 'altered in u2')])
352
302
self.run_bzr('commit -m checkin-from-u2 u2')
354
304
# make an offline commits
355
self.build_tree_contents([('u1/hosts', 'first offline change in u1\n')])
305
self.build_tree_contents([('u1/hosts', 'first offline change in u1')])
356
306
self.run_bzr('commit -m checkin-offline --local u1')
358
308
# now try to pull in online work from u2, and then commit our offline
359
309
# work as a merge
360
310
# retcode 1 as we expect a text conflict
361
311
self.run_bzr('update u1', retcode=1)
362
self.assertFileEqual('''\
364
first offline change in u1
371
312
self.run_bzr('resolved u1/hosts')
372
313
# add a text change here to represent resolving the merge conflicts in
373
314
# favour of a new version of the file not identical to either the u1
375
316
self.build_tree_contents([('u1/hosts', 'merge resolution\n')])
376
317
self.run_bzr('commit -m checkin-merge-of-the-offline-work-from-u1 u1')
378
def test_commit_exclude_excludes_modified_files(self):
379
"""Commit -x foo should ignore changes to foo."""
380
tree = self.make_branch_and_tree('.')
381
self.build_tree(['a', 'b', 'c'])
382
tree.smart_add(['.'])
383
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b'])
384
self.assertFalse('added b' in out)
385
self.assertFalse('added b' in err)
386
# If b was excluded it will still be 'added' in status.
387
out, err = self.run_bzr(['added'])
388
self.assertEqual('b\n', out)
389
self.assertEqual('', err)
391
def test_commit_exclude_twice_uses_both_rules(self):
392
"""Commit -x foo -x bar should ignore changes to foo and bar."""
393
tree = self.make_branch_and_tree('.')
394
self.build_tree(['a', 'b', 'c'])
395
tree.smart_add(['.'])
396
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b', '-x', 'c'])
397
self.assertFalse('added b' in out)
398
self.assertFalse('added c' in out)
399
self.assertFalse('added b' in err)
400
self.assertFalse('added c' in err)
401
# If b was excluded it will still be 'added' in status.
402
out, err = self.run_bzr(['added'])
403
self.assertTrue('b\n' in out)
404
self.assertTrue('c\n' in out)
405
self.assertEqual('', err)
407
319
def test_commit_respects_spec_for_removals(self):
408
320
"""Commit with a file spec should only commit removals that match"""
409
321
t = self.make_branch_and_tree('.')
437
349
# With no changes, it should just be 'no changes'
438
350
# Make sure that commit is failing because there is nothing to do
439
self.run_bzr_error(['No changes to commit'],
351
self.run_bzr_error(['no changes to commit'],
440
352
'commit --strict -m no-changes',
441
353
working_dir='tree')
470
382
output, err = self.run_bzr(
471
383
'commit -m hello --fixes=lp:23452 tree/hello.txt')
472
384
self.assertEqual('', output)
473
self.assertContainsRe(err, 'Committing to: .*\n'
385
self.assertContainsRe(err, 'Committing revision 1 to ".*"\.\n'
474
386
'added hello\.txt\n'
475
387
'Committed revision 1\.\n')
561
473
self.build_tree(['tree/hello.txt'])
562
474
tree.add('hello.txt')
563
475
self.run_bzr_error(
564
["Did not understand bug identifier orange: Must be an integer. "
565
"See \"bzr help bugs\" for more information on this feature.\n"
476
["Invalid bug identifier for %s. Commit refused." % 'lp:orange'],
567
477
'commit -m add-b --fixes=lp:orange',
568
478
working_dir='tree')
573
483
self.build_tree(['tree/hello.txt'])
574
484
tree.add('hello.txt')
575
485
self.run_bzr_error(
576
[r"Invalid bug orange. Must be in the form of 'tracker:id'\. "
577
r"See \"bzr help bugs\" for more information on this feature.\n"
486
[r"Invalid bug orange. Must be in the form of 'tag:id'\. "
578
487
r"Commit refused\."],
579
488
'commit -m add-b --fixes=orange',
580
489
working_dir='tree')
596
505
tree = self.make_branch_and_tree('tree')
597
506
self.build_tree(['tree/hello.txt'])
598
507
tree.add('hello.txt')
599
self.run_bzr(["commit", '-m', 'hello',
600
'--author', u'John D\xf6 <jdoe@example.com>',
508
self.run_bzr("commit -m hello --author='John Doe <jdoe@example.com>' "
602
510
last_rev = tree.branch.repository.get_revision(tree.last_revision())
603
511
properties = last_rev.properties
604
self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['authors'])
512
self.assertEqual('John Doe <jdoe@example.com>', properties['author'])
606
514
def test_author_no_email(self):
607
515
"""Author's name without an email address is allowed, too."""
612
520
"tree/hello.txt")
613
521
last_rev = tree.branch.repository.get_revision(tree.last_revision())
614
522
properties = last_rev.properties
615
self.assertEqual('John Doe', properties['authors'])
617
def test_multiple_authors(self):
618
"""Multiple authors can be specyfied, and all are stored."""
619
tree = self.make_branch_and_tree('tree')
620
self.build_tree(['tree/hello.txt'])
621
tree.add('hello.txt')
622
out, err = self.run_bzr("commit -m hello --author='John Doe' "
623
"--author='Jane Rey' tree/hello.txt")
624
last_rev = tree.branch.repository.get_revision(tree.last_revision())
625
properties = last_rev.properties
626
self.assertEqual('John Doe\nJane Rey', properties['authors'])
628
def test_commit_time(self):
629
tree = self.make_branch_and_tree('tree')
630
self.build_tree(['tree/hello.txt'])
631
tree.add('hello.txt')
632
out, err = self.run_bzr("commit -m hello "
633
"--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
634
last_rev = tree.branch.repository.get_revision(tree.last_revision())
636
'Sat 2009-10-10 08:00:00 +0100',
637
osutils.format_date(last_rev.timestamp, last_rev.timezone))
639
def test_commit_time_bad_time(self):
640
tree = self.make_branch_and_tree('tree')
641
self.build_tree(['tree/hello.txt'])
642
tree.add('hello.txt')
643
out, err = self.run_bzr("commit -m hello "
644
"--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
645
self.assertStartsWith(
646
err, "bzr: ERROR: Could not parse --commit-time:")
523
self.assertEqual('John Doe', properties['author'])
648
525
def test_partial_commit_with_renames_in_tree(self):
649
526
# this test illustrates bug #140419
673
550
out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
675
552
self.assertContainsRe(err,
676
r'^bzr: ERROR: Cannot lock.*readonly transport')
678
def setup_editor(self):
679
# Test that commit template hooks work
680
if sys.platform == "win32":
681
f = file('fed.bat', 'w')
682
f.write('@rem dummy fed')
684
osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
686
f = file('fed.sh', 'wb')
687
f.write('#!/bin/sh\n')
689
os.chmod('fed.sh', 0755)
690
osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
692
def setup_commit_with_template(self):
694
msgeditor.hooks.install_named_hook("commit_message_template",
695
lambda commit_obj, msg: "save me some typing\n", None)
696
tree = self.make_branch_and_tree('tree')
697
self.build_tree(['tree/hello.txt'])
698
tree.add('hello.txt')
701
def test_commit_hook_template_accepted(self):
702
tree = self.setup_commit_with_template()
703
out, err = self.run_bzr("commit tree/hello.txt", stdin="y\n")
704
last_rev = tree.branch.repository.get_revision(tree.last_revision())
705
self.assertEqual('save me some typing\n', last_rev.message)
707
def test_commit_hook_template_rejected(self):
708
tree = self.setup_commit_with_template()
709
expected = tree.last_revision()
710
out, err = self.run_bzr_error(["empty commit message"],
711
"commit tree/hello.txt", stdin="n\n")
712
self.assertEqual(expected, tree.last_revision())
553
r'^bzr: ERROR: Cannot lock.*readonly transport\n$')
added
removed
bzrlib/tests/blackbox/test_commit.py
