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."""
25
from testtools.matchers import DocTestMatches
27
23
from bzrlib import (
34
28
from bzrlib.bzrdir import BzrDir
35
29
from bzrlib.tests import (
36
30
probe_bad_non_ascii,
41
from bzrlib.tests import TestCaseWithTransport
44
class TestCommit(TestCaseWithTransport):
33
from bzrlib.tests.blackbox import ExternalBase
36
class TestCommit(ExternalBase):
46
38
def test_05_empty_commit(self):
47
39
"""Commit of tree with no versioned files should fail"""
50
42
self.build_tree(['hello.txt'])
51
43
out,err = self.run_bzr('commit -m empty', retcode=3)
52
44
self.assertEqual('', out)
54
# 1) We really don't want 'aborting commit write group' anymore.
55
# 2) bzr: ERROR: is a really long line, so we wrap it with '\'
60
bzr: ERROR: No changes to commit.\
61
Please 'bzr add' the files you want to commit,\
62
or use --unchanged to force an empty commit.
63
""", flags=doctest.ELLIPSIS|doctest.REPORT_UDIFF))
45
self.assertContainsRe(err, 'bzr: ERROR: no changes to commit\.'
46
' use --unchanged to commit anyhow\n')
65
48
def test_commit_success(self):
66
49
"""Successful commit should not leave behind a bzr-commit-* file"""
72
55
self.run_bzr(["commit", "--unchanged", "-m", u'foo\xb5'])
73
56
self.assertEqual('', self.run_bzr('unknowns')[0])
75
def test_commit_lossy_native(self):
76
"""A --lossy option to commit is supported."""
77
self.make_branch_and_tree('.')
78
self.run_bzr('commit --lossy --unchanged -m message')
79
self.assertEqual('', self.run_bzr('unknowns')[0])
81
def test_commit_lossy_foreign(self):
82
test_foreign.register_dummy_foreign_for_test(self)
83
self.make_branch_and_tree('.',
84
format=test_foreign.DummyForeignVcsDirFormat())
85
self.run_bzr('commit --lossy --unchanged -m message')
86
output = self.run_bzr('revision-info')[0]
87
self.assertTrue(output.startswith('1 dummy-'))
89
58
def test_commit_with_path(self):
90
59
"""Commit tree with path of root specified"""
91
60
a_tree = self.make_branch_and_tree('a')
135
105
'modified hello\.txt\n'
136
106
'Committed revision 2\.\n$')
138
def test_unicode_commit_message_is_filename(self):
139
"""Unicode commit message same as a filename (Bug #563646).
141
self.requireFeature(features.UnicodeFilenameFeature)
142
file_name = u'\N{euro sign}'
143
self.run_bzr(['init'])
144
open(file_name, 'w').write('hello world')
145
self.run_bzr(['add'])
146
out, err = self.run_bzr(['commit', '-m', file_name])
147
reflags = re.MULTILINE|re.DOTALL|re.UNICODE
148
te = osutils.get_terminal_encoding()
149
self.assertContainsRe(err.decode(te),
150
u'The commit message is a file name:',
153
# Run same test with a filename that causes encode
154
# error for the terminal encoding. We do this
155
# by forcing terminal encoding of ascii for
156
# osutils.get_terminal_encoding which is used
157
# by ui.text.show_warning
158
default_get_terminal_enc = osutils.get_terminal_encoding
160
osutils.get_terminal_encoding = lambda trace=None: 'ascii'
161
file_name = u'foo\u1234'
162
open(file_name, 'w').write('hello world')
163
self.run_bzr(['add'])
164
out, err = self.run_bzr(['commit', '-m', file_name])
165
reflags = re.MULTILINE|re.DOTALL|re.UNICODE
166
te = osutils.get_terminal_encoding()
167
self.assertContainsRe(err.decode(te, 'replace'),
168
u'The commit message is a file name:',
171
osutils.get_terminal_encoding = default_get_terminal_enc
173
def test_warn_about_forgotten_commit_message(self):
174
"""Test that the lack of -m parameter is caught"""
175
wt = self.make_branch_and_tree('.')
176
self.build_tree(['one', 'two'])
178
out, err = self.run_bzr('commit -m one two')
179
self.assertContainsRe(err, "The commit message is a file name")
181
108
def test_verbose_commit_renamed(self):
182
109
# Verbose commit of renamed file should say so
183
110
wt = self.prepare_simple_history()
196
123
wt.rename_one('hello.txt', 'subdir/hello.txt')
197
124
out, err = self.run_bzr('commit -m renamed')
198
125
self.assertEqual('', out)
199
self.assertEqual(set([
200
'Committing to: %s/' % osutils.getcwd(),
202
'renamed hello.txt => subdir/hello.txt',
203
'Committed revision 2.',
205
]), set(err.split('\n')))
126
self.assertContainsRe(err, '^Committing to: .*\n'
128
'renamed hello\.txt => subdir/hello\.txt\n'
129
'Committed revision 2\.\n$')
207
131
def test_verbose_commit_with_unknown(self):
208
132
"""Unknown files should not be listed by default in verbose output"""
242
166
self.assertEqual(err, 'Committing to: %s\n'
243
167
'Committed revision 2.\n' % expected)
245
def test_commit_sanitizes_CR_in_message(self):
246
# See bug #433779, basically Emacs likes to pass '\r\n' style line
247
# endings to 'bzr commit -m ""' which breaks because we don't allow
248
# '\r' in commit messages. (Mostly because of issues where XML style
249
# formats arbitrarily strip it out of the data while parsing.)
250
# To make life easier for users, we just always translate '\r\n' =>
251
# '\n'. And '\r' => '\n'.
252
a_tree = self.make_branch_and_tree('a')
253
self.build_tree(['a/b'])
255
self.run_bzr(['commit',
256
'-m', 'a string\r\n\r\nwith mixed\r\rendings\n'],
258
rev_id = a_tree.branch.last_revision()
259
rev = a_tree.branch.repository.get_revision(rev_id)
260
self.assertEqualDiff('a string\n\nwith mixed\n\nendings\n',
263
169
def test_commit_merge_reports_all_modified_files(self):
264
170
# the commit command should show all the files that are shown by
265
171
# bzr diff or bzr status when committing, even when they were not
314
220
out,err = self.run_bzr('commit -m added')
315
221
self.assertEqual('', out)
316
self.assertEqual(set([
317
'Committing to: %s/' % osutils.getcwd(),
318
'modified filetomodify',
321
'renamed dirtorename => renameddir',
322
'renamed filetorename => renamedfile',
323
'renamed dirtoreparent => renameddir/reparenteddir',
324
'renamed filetoreparent => renameddir/reparentedfile',
325
'deleted dirtoremove',
326
'deleted filetoremove',
327
'Committed revision 2.',
329
]), set(err.split('\n')))
222
expected = '%s/' % (osutils.getcwd(), )
223
self.assertEqualDiff(
224
'Committing to: %s\n'
225
'modified filetomodify\n'
228
'renamed dirtorename => renameddir\n'
229
'renamed filetorename => renamedfile\n'
230
'renamed dirtoreparent => renameddir/reparenteddir\n'
231
'renamed filetoreparent => renameddir/reparentedfile\n'
232
'deleted dirtoremove\n'
233
'deleted filetoremove\n'
234
'Committed revision 2.\n' % (expected, ),
331
237
def test_empty_commit_message(self):
332
238
tree = self.make_branch_and_tree('.')
334
240
tree.add('foo.c')
335
241
self.run_bzr('commit -m ""', retcode=3)
243
def test_unsupported_encoding_commit_message(self):
244
tree = self.make_branch_and_tree('.')
245
self.build_tree_contents([('foo.c', 'int main() {}')])
247
# LANG env variable has no effect on Windows
248
# but some characters anyway cannot be represented
249
# in default user encoding
250
char = probe_bad_non_ascii(osutils.get_user_encoding())
252
raise TestSkipped('Cannot find suitable non-ascii character'
253
'for user_encoding (%s)' % osutils.get_user_encoding())
254
out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
256
env_changes={'LANG': 'C'})
257
self.assertContainsRe(err, r'bzrlib.errors.BzrError: Parameter.*is '
258
'unsupported by the current encoding.')
337
260
def test_other_branch_commit(self):
338
261
# this branch is to ensure consistent behaviour, whether we're run
339
262
# inside a branch, or not.
342
265
self.build_tree_contents([
343
266
('branch/foo.c', 'int main() {}'),
344
267
('branch/bar.c', 'int main() {}')])
345
inner_tree.add(['foo.c', 'bar.c'])
268
inner_tree.add('foo.c')
269
inner_tree.add('bar.c')
346
270
# can't commit files in different trees; sane error
347
271
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
348
# can commit to branch - records foo.c only
349
272
self.run_bzr('commit -m newstuff branch/foo.c')
350
# can commit to branch - records bar.c
351
273
self.run_bzr('commit -m newstuff branch')
353
self.run_bzr_error(["No changes to commit"], 'commit -m newstuff branch')
274
self.run_bzr('commit -m newstuff branch', retcode=3)
355
276
def test_out_of_date_tree_commit(self):
356
277
# check we get an error code and a clear message committing with an out
380
301
def test_commit_a_text_merge_in_a_checkout(self):
381
302
# checkouts perform multiple actions in a transaction across bond
382
303
# branches and their master, and have been observed to fail in the
383
# past. This is a user story reported to fail in bug #43959 where
304
# past. This is a user story reported to fail in bug #43959 where
384
305
# a merge done in a checkout (using the update command) failed to
385
306
# commit correctly.
386
307
trunk = self.make_branch_and_tree('trunk')
388
309
u1 = trunk.branch.create_checkout('u1')
389
self.build_tree_contents([('u1/hosts', 'initial contents\n')])
310
self.build_tree_contents([('u1/hosts', 'initial contents')])
391
312
self.run_bzr('commit -m add-hosts u1')
393
314
u2 = trunk.branch.create_checkout('u2')
394
self.build_tree_contents([('u2/hosts', 'altered in u2\n')])
315
self.build_tree_contents([('u2/hosts', 'altered in u2')])
395
316
self.run_bzr('commit -m checkin-from-u2 u2')
397
318
# make an offline commits
398
self.build_tree_contents([('u1/hosts', 'first offline change in u1\n')])
319
self.build_tree_contents([('u1/hosts', 'first offline change in u1')])
399
320
self.run_bzr('commit -m checkin-offline --local u1')
401
322
# now try to pull in online work from u2, and then commit our offline
402
323
# work as a merge
403
324
# retcode 1 as we expect a text conflict
404
325
self.run_bzr('update u1', retcode=1)
405
self.assertFileEqual('''\
407
first offline change in u1
414
326
self.run_bzr('resolved u1/hosts')
415
327
# add a text change here to represent resolving the merge conflicts in
416
328
# favour of a new version of the file not identical to either the u1
655
564
"tree/hello.txt")
656
565
last_rev = tree.branch.repository.get_revision(tree.last_revision())
657
566
properties = last_rev.properties
658
self.assertEqual('John Doe', properties['authors'])
660
def test_multiple_authors(self):
661
"""Multiple authors can be specyfied, and all are stored."""
662
tree = self.make_branch_and_tree('tree')
663
self.build_tree(['tree/hello.txt'])
664
tree.add('hello.txt')
665
out, err = self.run_bzr("commit -m hello --author='John Doe' "
666
"--author='Jane Rey' tree/hello.txt")
667
last_rev = tree.branch.repository.get_revision(tree.last_revision())
668
properties = last_rev.properties
669
self.assertEqual('John Doe\nJane Rey', properties['authors'])
671
def test_commit_time(self):
672
tree = self.make_branch_and_tree('tree')
673
self.build_tree(['tree/hello.txt'])
674
tree.add('hello.txt')
675
out, err = self.run_bzr("commit -m hello "
676
"--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
677
last_rev = tree.branch.repository.get_revision(tree.last_revision())
679
'Sat 2009-10-10 08:00:00 +0100',
680
osutils.format_date(last_rev.timestamp, last_rev.timezone))
682
def test_commit_time_bad_time(self):
683
tree = self.make_branch_and_tree('tree')
684
self.build_tree(['tree/hello.txt'])
685
tree.add('hello.txt')
686
out, err = self.run_bzr("commit -m hello "
687
"--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
688
self.assertStartsWith(
689
err, "bzr: ERROR: Could not parse --commit-time:")
567
self.assertEqual('John Doe', properties['author'])
691
569
def test_partial_commit_with_renames_in_tree(self):
692
570
# this test illustrates bug #140419
718
596
self.assertContainsRe(err,
719
597
r'^bzr: ERROR: Cannot lock.*readonly transport')
721
def setup_editor(self):
722
# Test that commit template hooks work
723
if sys.platform == "win32":
724
f = file('fed.bat', 'w')
725
f.write('@rem dummy fed')
727
self.overrideEnv('BZR_EDITOR', "fed.bat")
729
f = file('fed.sh', 'wb')
730
f.write('#!/bin/sh\n')
732
os.chmod('fed.sh', 0755)
733
self.overrideEnv('BZR_EDITOR', "./fed.sh")
735
def setup_commit_with_template(self):
737
msgeditor.hooks.install_named_hook("commit_message_template",
738
lambda commit_obj, msg: "save me some typing\n", None)
739
tree = self.make_branch_and_tree('tree')
740
self.build_tree(['tree/hello.txt'])
741
tree.add('hello.txt')
744
def test_commit_hook_template_accepted(self):
745
tree = self.setup_commit_with_template()
746
out, err = self.run_bzr("commit tree/hello.txt", stdin="y\n")
747
last_rev = tree.branch.repository.get_revision(tree.last_revision())
748
self.assertEqual('save me some typing\n', last_rev.message)
750
def test_commit_hook_template_rejected(self):
751
tree = self.setup_commit_with_template()
752
expected = tree.last_revision()
753
out, err = self.run_bzr_error(["Empty commit message specified."
754
" Please specify a commit message with either"
755
" --message or --file or leave a blank message"
756
" with --message \"\"."],
757
"commit tree/hello.txt", stdin="n\n")
758
self.assertEqual(expected, tree.last_revision())
760
def test_set_commit_message(self):
761
msgeditor.hooks.install_named_hook("set_commit_message",
762
lambda commit_obj, msg: "save me some typing\n", None)
763
tree = self.make_branch_and_tree('tree')
764
self.build_tree(['tree/hello.txt'])
765
tree.add('hello.txt')
766
out, err = self.run_bzr("commit tree/hello.txt")
767
last_rev = tree.branch.repository.get_revision(tree.last_revision())
768
self.assertEqual('save me some typing\n', last_rev.message)
770
def test_commit_without_username(self):
771
"""Ensure commit error if username is not set.
773
self.run_bzr(['init', 'foo'])
775
open('foo.txt', 'w').write('hello')
776
self.run_bzr(['add'])
777
self.overrideEnv('EMAIL', None)
778
self.overrideEnv('BZR_EMAIL', None)
779
# Also, make sure that it's not inferred from mailname.
780
self.overrideAttr(config, '_auto_user_id',
781
lambda: (None, None))
782
out, err = self.run_bzr(['commit', '-m', 'initial'], 3)
783
self.assertContainsRe(err, 'Unable to determine your name')
785
def test_commit_recursive_checkout(self):
786
"""Ensure that a commit to a recursive checkout fails cleanly.
788
self.run_bzr(['init', 'test_branch'])
789
self.run_bzr(['checkout', 'test_branch', 'test_checkout'])
790
os.chdir('test_checkout')
791
self.run_bzr(['bind', '.']) # bind to self
792
open('foo.txt', 'w').write('hello')
793
self.run_bzr(['add'])
794
out, err = self.run_bzr(['commit', '-m', 'addedfoo'], 3)
795
self.assertEqual(out, '')
796
self.assertContainsRe(err,
797
'Branch.*test_checkout.*appears to be bound to itself')
added
removed
bzrlib/tests/blackbox/test_commit.py
