1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1
# Copyright (C) 2006-2010 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
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
308
343
trunk = self.make_branch_and_tree('trunk')
310
345
u1 = trunk.branch.create_checkout('u1')
311
self.build_tree_contents([('u1/hosts', 'initial contents')])
346
self.build_tree_contents([('u1/hosts', 'initial contents\n')])
313
348
self.run_bzr('commit -m add-hosts u1')
315
350
u2 = trunk.branch.create_checkout('u2')
316
self.build_tree_contents([('u2/hosts', 'altered in u2')])
351
self.build_tree_contents([('u2/hosts', 'altered in u2\n')])
317
352
self.run_bzr('commit -m checkin-from-u2 u2')
319
354
# make an offline commits
320
self.build_tree_contents([('u1/hosts', 'first offline change in u1')])
355
self.build_tree_contents([('u1/hosts', 'first offline change in u1\n')])
321
356
self.run_bzr('commit -m checkin-offline --local u1')
323
358
# now try to pull in online work from u2, and then commit our offline
324
359
# work as a merge
325
360
# retcode 1 as we expect a text conflict
326
361
self.run_bzr('update u1', retcode=1)
362
self.assertFileEqual('''\
364
first offline change in u1
327
371
self.run_bzr('resolved u1/hosts')
328
372
# add a text change here to represent resolving the merge conflicts in
329
373
# favour of a new version of the file not identical to either the u1
393
437
# With no changes, it should just be 'no changes'
394
438
# Make sure that commit is failing because there is nothing to do
395
self.run_bzr_error(['no changes to commit'],
439
self.run_bzr_error(['No changes to commit'],
396
440
'commit --strict -m no-changes',
397
441
working_dir='tree')
581
625
properties = last_rev.properties
582
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:")
584
648
def test_partial_commit_with_renames_in_tree(self):
585
649
# this test illustrates bug #140419
586
650
t = self.make_branch_and_tree('.')
611
675
self.assertContainsRe(err,
612
676
r'^bzr: ERROR: Cannot lock.*readonly transport')
614
def test_commit_hook_template(self):
678
def setup_editor(self):
615
679
# Test that commit template hooks work
616
def restoreDefaults():
617
msgeditor.hooks['commit_message_template'] = []
618
osutils.set_or_unset_env('BZR_EDITOR', default_editor)
619
680
if sys.platform == "win32":
620
681
f = file('fed.bat', 'w')
621
682
f.write('@rem dummy fed')
623
default_editor = osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
684
osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
625
686
f = file('fed.sh', 'wb')
626
687
f.write('#!/bin/sh\n')
628
689
os.chmod('fed.sh', 0755)
629
default_editor = osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
630
self.addCleanup(restoreDefaults)
690
osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
692
def setup_commit_with_template(self):
631
694
msgeditor.hooks.install_named_hook("commit_message_template",
632
695
lambda commit_obj, msg: "save me some typing\n", None)
633
696
tree = self.make_branch_and_tree('tree')
634
697
self.build_tree(['tree/hello.txt'])
635
698
tree.add('hello.txt')
636
out, err = self.run_bzr("commit tree/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")
637
704
last_rev = tree.branch.repository.get_revision(tree.last_revision())
638
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())
added
removed
bzrlib/tests/blackbox/test_commit.py
