1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1
# Copyright (C) 2005, 2006, 2007, 2009 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
18
"""Tests for the commit CLI of bzr."""
43
44
self.build_tree(['hello.txt'])
44
45
out,err = self.run_bzr('commit -m empty', retcode=3)
45
46
self.assertEqual('', out)
46
self.assertContainsRe(err, 'bzr: ERROR: no changes to commit\.'
47
' use --unchanged to commit anyhow\n')
47
self.assertContainsRe(err, 'bzr: ERROR: No changes to commit\.'
48
' Use --unchanged to commit anyhow.\n')
49
50
def test_commit_success(self):
50
51
"""Successful commit should not leave behind a bzr-commit-* file"""
106
107
'modified hello\.txt\n'
107
108
'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")
109
118
def test_verbose_commit_renamed(self):
110
119
# Verbose commit of renamed file should say so
111
120
wt = self.prepare_simple_history()
124
133
wt.rename_one('hello.txt', 'subdir/hello.txt')
125
134
out, err = self.run_bzr('commit -m renamed')
126
135
self.assertEqual('', out)
127
self.assertContainsRe(err, '^Committing to: .*\n'
129
'renamed hello\.txt => subdir/hello\.txt\n'
130
'Committed revision 2\.\n$')
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')))
132
144
def test_verbose_commit_with_unknown(self):
133
145
"""Unknown files should not be listed by default in verbose output"""
167
179
self.assertEqual(err, 'Committing to: %s\n'
168
180
'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',
170
200
def test_commit_merge_reports_all_modified_files(self):
171
201
# the commit command should show all the files that are shown by
172
202
# bzr diff or bzr status when committing, even when they were not
221
251
out,err = self.run_bzr('commit -m added')
222
252
self.assertEqual('', out)
223
expected = '%s/' % (osutils.getcwd(), )
224
self.assertEqualDiff(
225
'Committing to: %s\n'
226
'modified filetomodify\n'
229
'renamed dirtorename => renameddir\n'
230
'renamed filetorename => renamedfile\n'
231
'renamed dirtoreparent => renameddir/reparenteddir\n'
232
'renamed filetoreparent => renameddir/reparentedfile\n'
233
'deleted dirtoremove\n'
234
'deleted filetoremove\n'
235
'Committed revision 2.\n' % (expected, ),
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')))
238
268
def test_empty_commit_message(self):
239
269
tree = self.make_branch_and_tree('.')
242
272
self.run_bzr('commit -m ""', retcode=3)
244
274
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')
245
278
tree = self.make_branch_and_tree('.')
246
279
self.build_tree_contents([('foo.c', 'int main() {}')])
247
280
tree.add('foo.c')
266
299
self.build_tree_contents([
267
300
('branch/foo.c', 'int main() {}'),
268
301
('branch/bar.c', 'int main() {}')])
269
inner_tree.add('foo.c')
270
inner_tree.add('bar.c')
302
inner_tree.add(['foo.c', 'bar.c'])
271
303
# can't commit files in different trees; sane error
272
304
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
305
# can commit to branch - records foo.c only
273
306
self.run_bzr('commit -m newstuff branch/foo.c')
307
# can commit to branch - records bar.c
274
308
self.run_bzr('commit -m newstuff branch')
275
self.run_bzr('commit -m newstuff branch', retcode=3)
310
self.run_bzr_error(["No changes to commit"], 'commit -m newstuff branch')
277
312
def test_out_of_date_tree_commit(self):
278
313
# check we get an error code and a clear message committing with an out
302
337
def test_commit_a_text_merge_in_a_checkout(self):
303
338
# checkouts perform multiple actions in a transaction across bond
304
339
# branches and their master, and have been observed to fail in the
305
# past. This is a user story reported to fail in bug #43959 where
340
# past. This is a user story reported to fail in bug #43959 where
306
341
# a merge done in a checkout (using the update command) failed to
307
342
# commit correctly.
308
343
trunk = self.make_branch_and_tree('trunk')
393
428
# With no changes, it should just be 'no changes'
394
429
# Make sure that commit is failing because there is nothing to do
395
self.run_bzr_error(['no changes to commit'],
430
self.run_bzr_error(['No changes to commit'],
396
431
'commit --strict -m no-changes',
397
432
working_dir='tree')
517
552
self.build_tree(['tree/hello.txt'])
518
553
tree.add('hello.txt')
519
554
self.run_bzr_error(
520
["Invalid bug identifier for %s. Commit refused." % 'lp:orange'],
555
["Did not understand bug identifier orange: Must be an integer. "
556
"See \"bzr help bugs\" for more information on this feature.\n"
521
558
'commit -m add-b --fixes=lp:orange',
522
559
working_dir='tree')
527
564
self.build_tree(['tree/hello.txt'])
528
565
tree.add('hello.txt')
529
566
self.run_bzr_error(
530
[r"Invalid bug orange. Must be in the form of 'tag:id'\. "
567
[r"Invalid bug orange. Must be in the form of 'tracker:id'\. "
568
r"See \"bzr help bugs\" for more information on this feature.\n"
531
569
r"Commit refused\."],
532
570
'commit -m add-b --fixes=orange',
533
571
working_dir='tree')
554
592
"tree/hello.txt"])
555
593
last_rev = tree.branch.repository.get_revision(tree.last_revision())
556
594
properties = last_rev.properties
557
self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['author'])
595
self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['authors'])
559
597
def test_author_no_email(self):
560
598
"""Author's name without an email address is allowed, too."""
565
603
"tree/hello.txt")
566
604
last_rev = tree.branch.repository.get_revision(tree.last_revision())
567
605
properties = last_rev.properties
568
self.assertEqual('John Doe', properties['author'])
606
self.assertEqual('John Doe', properties['authors'])
608
def test_multiple_authors(self):
609
"""Multiple authors can be specyfied, and all are stored."""
610
tree = self.make_branch_and_tree('tree')
611
self.build_tree(['tree/hello.txt'])
612
tree.add('hello.txt')
613
out, err = self.run_bzr("commit -m hello --author='John Doe' "
614
"--author='Jane Rey' tree/hello.txt")
615
last_rev = tree.branch.repository.get_revision(tree.last_revision())
616
properties = last_rev.properties
617
self.assertEqual('John Doe\nJane Rey', properties['authors'])
619
def test_commit_time(self):
620
tree = self.make_branch_and_tree('tree')
621
self.build_tree(['tree/hello.txt'])
622
tree.add('hello.txt')
623
out, err = self.run_bzr("commit -m hello "
624
"--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
625
last_rev = tree.branch.repository.get_revision(tree.last_revision())
627
'Sat 2009-10-10 08:00:00 +0100',
628
osutils.format_date(last_rev.timestamp, last_rev.timezone))
630
def test_commit_time_bad_time(self):
631
tree = self.make_branch_and_tree('tree')
632
self.build_tree(['tree/hello.txt'])
633
tree.add('hello.txt')
634
out, err = self.run_bzr("commit -m hello "
635
"--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
636
self.assertStartsWith(
637
err, "bzr: ERROR: Could not parse --commit-time:")
570
639
def test_partial_commit_with_renames_in_tree(self):
571
640
# this test illustrates bug #140419
added
removed
bzrlib/tests/blackbox/test_commit.py
