1
# Copyright (C) 2005, 2006, 2007, 2009 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."""
44
43
self.build_tree(['hello.txt'])
45
44
out,err = self.run_bzr('commit -m empty', retcode=3)
46
45
self.assertEqual('', out)
47
self.assertContainsRe(err, 'bzr: ERROR: No changes to commit\.'
48
' Use --unchanged to commit anyhow.\n')
46
self.assertContainsRe(err, 'bzr: ERROR: no changes to commit\.'
47
' use --unchanged to commit anyhow\n')
50
49
def test_commit_success(self):
51
50
"""Successful commit should not leave behind a bzr-commit-* file"""
107
106
'modified hello\.txt\n'
108
107
'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
109
def test_verbose_commit_renamed(self):
119
110
# Verbose commit of renamed file should say so
120
111
wt = self.prepare_simple_history()
133
124
wt.rename_one('hello.txt', 'subdir/hello.txt')
134
125
out, err = self.run_bzr('commit -m renamed')
135
126
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')))
127
self.assertContainsRe(err, '^Committing to: .*\n'
129
'renamed hello\.txt => subdir/hello\.txt\n'
130
'Committed revision 2\.\n$')
144
132
def test_verbose_commit_with_unknown(self):
145
133
"""Unknown files should not be listed by default in verbose output"""
179
167
self.assertEqual(err, 'Committing to: %s\n'
180
168
'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
170
def test_commit_merge_reports_all_modified_files(self):
201
171
# the commit command should show all the files that are shown by
202
172
# bzr diff or bzr status when committing, even when they were not
251
221
out,err = self.run_bzr('commit -m added')
252
222
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')))
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, ),
268
238
def test_empty_commit_message(self):
269
239
tree = self.make_branch_and_tree('.')
272
242
self.run_bzr('commit -m ""', retcode=3)
274
244
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
245
tree = self.make_branch_and_tree('.')
279
246
self.build_tree_contents([('foo.c', 'int main() {}')])
280
247
tree.add('foo.c')
299
266
self.build_tree_contents([
300
267
('branch/foo.c', 'int main() {}'),
301
268
('branch/bar.c', 'int main() {}')])
302
inner_tree.add(['foo.c', 'bar.c'])
269
inner_tree.add('foo.c')
270
inner_tree.add('bar.c')
303
271
# can't commit files in different trees; sane error
304
272
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
305
# can commit to branch - records foo.c only
306
273
self.run_bzr('commit -m newstuff branch/foo.c')
307
# can commit to branch - records bar.c
308
274
self.run_bzr('commit -m newstuff branch')
310
self.run_bzr_error(["No changes to commit"], 'commit -m newstuff branch')
275
self.run_bzr('commit -m newstuff branch', retcode=3)
312
277
def test_out_of_date_tree_commit(self):
313
278
# check we get an error code and a clear message committing with an out
337
302
def test_commit_a_text_merge_in_a_checkout(self):
338
303
# checkouts perform multiple actions in a transaction across bond
339
304
# 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
305
# past. This is a user story reported to fail in bug #43959 where
341
306
# a merge done in a checkout (using the update command) failed to
342
307
# commit correctly.
343
308
trunk = self.make_branch_and_tree('trunk')
345
310
u1 = trunk.branch.create_checkout('u1')
346
self.build_tree_contents([('u1/hosts', 'initial contents\n')])
311
self.build_tree_contents([('u1/hosts', 'initial contents')])
348
313
self.run_bzr('commit -m add-hosts u1')
350
315
u2 = trunk.branch.create_checkout('u2')
351
self.build_tree_contents([('u2/hosts', 'altered in u2\n')])
316
self.build_tree_contents([('u2/hosts', 'altered in u2')])
352
317
self.run_bzr('commit -m checkin-from-u2 u2')
354
319
# make an offline commits
355
self.build_tree_contents([('u1/hosts', 'first offline change in u1\n')])
320
self.build_tree_contents([('u1/hosts', 'first offline change in u1')])
356
321
self.run_bzr('commit -m checkin-offline --local u1')
358
323
# now try to pull in online work from u2, and then commit our offline
359
324
# work as a merge
360
325
# retcode 1 as we expect a text conflict
361
326
self.run_bzr('update u1', retcode=1)
362
self.assertFileEqual('''\
364
first offline change in u1
371
327
self.run_bzr('resolved u1/hosts')
372
328
# add a text change here to represent resolving the merge conflicts in
373
329
# favour of a new version of the file not identical to either the u1
437
393
# With no changes, it should just be 'no changes'
438
394
# Make sure that commit is failing because there is nothing to do
439
self.run_bzr_error(['No changes to commit'],
395
self.run_bzr_error(['no changes to commit'],
440
396
'commit --strict -m no-changes',
441
397
working_dir='tree')
561
517
self.build_tree(['tree/hello.txt'])
562
518
tree.add('hello.txt')
563
519
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"
520
["Invalid bug identifier for %s. Commit refused." % 'lp:orange'],
567
521
'commit -m add-b --fixes=lp:orange',
568
522
working_dir='tree')
573
527
self.build_tree(['tree/hello.txt'])
574
528
tree.add('hello.txt')
575
529
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"
530
[r"Invalid bug orange. Must be in the form of 'tag:id'\. "
578
531
r"Commit refused\."],
579
532
'commit -m add-b --fixes=orange',
580
533
working_dir='tree')
601
554
"tree/hello.txt"])
602
555
last_rev = tree.branch.repository.get_revision(tree.last_revision())
603
556
properties = last_rev.properties
604
self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['authors'])
557
self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['author'])
606
559
def test_author_no_email(self):
607
560
"""Author's name without an email address is allowed, too."""
612
565
"tree/hello.txt")
613
566
last_rev = tree.branch.repository.get_revision(tree.last_revision())
614
567
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:")
568
self.assertEqual('John Doe', properties['author'])
648
570
def test_partial_commit_with_renames_in_tree(self):
649
571
# this test illustrates bug #140419
678
600
def test_commit_hook_template(self):
679
601
# Test that commit template hooks work
602
def restoreDefaults():
603
msgeditor.hooks['commit_message_template'] = []
604
osutils.set_or_unset_env('BZR_EDITOR', default_editor)
680
605
if sys.platform == "win32":
681
606
f = file('fed.bat', 'w')
682
607
f.write('@rem dummy fed')
684
osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
609
default_editor = osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
686
611
f = file('fed.sh', 'wb')
687
612
f.write('#!/bin/sh\n')
689
614
os.chmod('fed.sh', 0755)
690
osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
615
default_editor = osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
616
self.addCleanup(restoreDefaults)
691
617
msgeditor.hooks.install_named_hook("commit_message_template",
692
618
lambda commit_obj, msg: "save me some typing\n", None)
693
619
tree = self.make_branch_and_tree('tree')
added
removed
bzrlib/tests/blackbox/test_commit.py
