133
107
'modified hello\.txt\n'
134
108
'Committed revision 2\.\n$')
136
def test_unicode_commit_message_is_filename(self):
137
"""Unicode commit message same as a filename (Bug #563646).
139
self.requireFeature(features.UnicodeFilenameFeature)
140
file_name = u'\N{euro sign}'
141
self.run_bzr(['init'])
142
with open(file_name, 'w') as f: f.write('hello world')
143
self.run_bzr(['add'])
144
out, err = self.run_bzr(['commit', '-m', file_name])
145
reflags = re.MULTILINE|re.DOTALL|re.UNICODE
146
te = osutils.get_terminal_encoding()
147
self.assertContainsRe(err.decode(te),
148
u'The commit message is a file name:',
151
# Run same test with a filename that causes encode
152
# error for the terminal encoding. We do this
153
# by forcing terminal encoding of ascii for
154
# osutils.get_terminal_encoding which is used
155
# by ui.text.show_warning
156
default_get_terminal_enc = osutils.get_terminal_encoding
158
osutils.get_terminal_encoding = lambda trace=None: 'ascii'
159
file_name = u'foo\u1234'
160
with open(file_name, 'w') as f: f.write('hello world')
161
self.run_bzr(['add'])
162
out, err = self.run_bzr(['commit', '-m', file_name])
163
reflags = re.MULTILINE|re.DOTALL|re.UNICODE
164
te = osutils.get_terminal_encoding()
165
self.assertContainsRe(err.decode(te, 'replace'),
166
u'The commit message is a file name:',
169
osutils.get_terminal_encoding = default_get_terminal_enc
171
def test_non_ascii_file_unversioned_utf8(self):
172
self.requireFeature(features.UnicodeFilenameFeature)
173
tree = self.make_branch_and_tree(".")
174
self.build_tree(["f"])
176
out, err = self.run_bzr(["commit", "-m", "Wrong filename", u"\xa7"],
177
encoding="utf-8", retcode=3)
178
self.assertContainsRe(err, "(?m)not versioned: \"\xc2\xa7\"$")
180
def test_non_ascii_file_unversioned_iso_8859_5(self):
181
self.requireFeature(features.UnicodeFilenameFeature)
182
tree = self.make_branch_and_tree(".")
183
self.build_tree(["f"])
185
out, err = self.run_bzr(["commit", "-m", "Wrong filename", u"\xa7"],
186
encoding="iso-8859-5", retcode=3)
187
self.expectFailure("Error messages are always written as UTF-8",
188
self.assertNotContainsString, err, "\xc2\xa7")
189
self.assertContainsRe(err, "(?m)not versioned: \"\xfd\"$")
191
def test_warn_about_forgotten_commit_message(self):
192
"""Test that the lack of -m parameter is caught"""
193
wt = self.make_branch_and_tree('.')
194
self.build_tree(['one', 'two'])
196
out, err = self.run_bzr('commit -m one two')
197
self.assertContainsRe(err, "The commit message is a file name")
199
110
def test_verbose_commit_renamed(self):
200
111
# Verbose commit of renamed file should say so
201
112
wt = self.prepare_simple_history()
349
261
tree = self.make_branch_and_tree('.')
350
262
self.build_tree_contents([('foo.c', 'int main() {}')])
351
263
tree.add('foo.c')
352
self.run_bzr('commit -m ""')
264
self.run_bzr('commit -m ""', retcode=3)
266
def test_unsupported_encoding_commit_message(self):
267
if sys.platform == 'win32':
268
raise tests.TestNotApplicable('Win32 parses arguments directly'
269
' as Unicode, so we can\'t pass invalid non-ascii')
270
tree = self.make_branch_and_tree('.')
271
self.build_tree_contents([('foo.c', 'int main() {}')])
273
# LANG env variable has no effect on Windows
274
# but some characters anyway cannot be represented
275
# in default user encoding
276
char = probe_bad_non_ascii(osutils.get_user_encoding())
278
raise TestSkipped('Cannot find suitable non-ascii character'
279
'for user_encoding (%s)' % osutils.get_user_encoding())
280
out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
282
env_changes={'LANG': 'C'})
283
self.assertContainsRe(err, r'bzrlib.errors.BzrError: Parameter.*is '
284
'unsupported by the current encoding.')
354
286
def test_other_branch_commit(self):
355
287
# this branch is to ensure consistent behaviour, whether we're run
403
335
trunk = self.make_branch_and_tree('trunk')
405
337
u1 = trunk.branch.create_checkout('u1')
406
self.build_tree_contents([('u1/hosts', 'initial contents\n')])
338
self.build_tree_contents([('u1/hosts', 'initial contents')])
408
340
self.run_bzr('commit -m add-hosts u1')
410
342
u2 = trunk.branch.create_checkout('u2')
411
self.build_tree_contents([('u2/hosts', 'altered in u2\n')])
343
self.build_tree_contents([('u2/hosts', 'altered in u2')])
412
344
self.run_bzr('commit -m checkin-from-u2 u2')
414
346
# make an offline commits
415
self.build_tree_contents([('u1/hosts', 'first offline change in u1\n')])
347
self.build_tree_contents([('u1/hosts', 'first offline change in u1')])
416
348
self.run_bzr('commit -m checkin-offline --local u1')
418
350
# now try to pull in online work from u2, and then commit our offline
419
351
# work as a merge
420
352
# retcode 1 as we expect a text conflict
421
353
self.run_bzr('update u1', retcode=1)
422
self.assertFileEqual('''\
424
first offline change in u1
431
354
self.run_bzr('resolved u1/hosts')
432
355
# add a text change here to represent resolving the merge conflicts in
433
356
# favour of a new version of the file not identical to either the u1
703
608
properties = last_rev.properties
704
609
self.assertEqual('John Doe\nJane Rey', properties['authors'])
706
def test_commit_time(self):
707
tree = self.make_branch_and_tree('tree')
708
self.build_tree(['tree/hello.txt'])
709
tree.add('hello.txt')
710
out, err = self.run_bzr("commit -m hello "
711
"--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
712
last_rev = tree.branch.repository.get_revision(tree.last_revision())
714
'Sat 2009-10-10 08:00:00 +0100',
715
osutils.format_date(last_rev.timestamp, last_rev.timezone))
717
def test_commit_time_bad_time(self):
718
tree = self.make_branch_and_tree('tree')
719
self.build_tree(['tree/hello.txt'])
720
tree.add('hello.txt')
721
out, err = self.run_bzr("commit -m hello "
722
"--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
723
self.assertStartsWith(
724
err, "bzr: ERROR: Could not parse --commit-time:")
726
def test_commit_time_missing_tz(self):
727
tree = self.make_branch_and_tree('tree')
728
self.build_tree(['tree/hello.txt'])
729
tree.add('hello.txt')
730
out, err = self.run_bzr("commit -m hello "
731
"--commit-time='2009-10-10 08:00:00' tree/hello.txt", retcode=3)
732
self.assertStartsWith(
733
err, "bzr: ERROR: Could not parse --commit-time:")
734
# Test that it is actually checking and does not simply crash with
735
# some other exception
736
self.assertContainsString(err, "missing a timezone offset")
738
611
def test_partial_commit_with_renames_in_tree(self):
739
612
# this test illustrates bug #140419
740
613
t = self.make_branch_and_tree('.')
765
638
self.assertContainsRe(err,
766
639
r'^bzr: ERROR: Cannot lock.*readonly transport')
768
def setup_editor(self):
641
def test_commit_hook_template(self):
769
642
# Test that commit template hooks work
643
def restoreDefaults():
644
msgeditor.hooks['commit_message_template'] = []
645
osutils.set_or_unset_env('BZR_EDITOR', default_editor)
770
646
if sys.platform == "win32":
771
647
f = file('fed.bat', 'w')
772
648
f.write('@rem dummy fed')
774
self.overrideEnv('BZR_EDITOR', "fed.bat")
650
default_editor = osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
776
652
f = file('fed.sh', 'wb')
777
653
f.write('#!/bin/sh\n')
779
655
os.chmod('fed.sh', 0755)
780
self.overrideEnv('BZR_EDITOR', "./fed.sh")
782
def setup_commit_with_template(self):
656
default_editor = osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
657
self.addCleanup(restoreDefaults)
784
658
msgeditor.hooks.install_named_hook("commit_message_template",
785
659
lambda commit_obj, msg: "save me some typing\n", None)
786
660
tree = self.make_branch_and_tree('tree')
787
661
self.build_tree(['tree/hello.txt'])
788
662
tree.add('hello.txt')
791
def test_edit_empty_message(self):
792
tree = self.make_branch_and_tree('tree')
794
self.build_tree(['tree/hello.txt'])
795
tree.add('hello.txt')
796
out, err = self.run_bzr("commit tree/hello.txt", retcode=3,
798
self.assertContainsRe(err,
799
"bzr: ERROR: Empty commit message specified")
801
def test_commit_hook_template_accepted(self):
802
tree = self.setup_commit_with_template()
803
out, err = self.run_bzr("commit tree/hello.txt", stdin="y\n")
804
last_rev = tree.branch.repository.get_revision(tree.last_revision())
805
self.assertEqual('save me some typing\n', last_rev.message)
807
def test_commit_hook_template_rejected(self):
808
tree = self.setup_commit_with_template()
809
expected = tree.last_revision()
810
out, err = self.run_bzr_error(["Empty commit message specified."
811
" Please specify a commit message with either"
812
" --message or --file or leave a blank message"
813
" with --message \"\"."],
814
"commit tree/hello.txt", stdin="n\n")
815
self.assertEqual(expected, tree.last_revision())
817
def test_set_commit_message(self):
818
msgeditor.hooks.install_named_hook("set_commit_message",
819
lambda commit_obj, msg: "save me some typing\n", None)
820
tree = self.make_branch_and_tree('tree')
821
self.build_tree(['tree/hello.txt'])
822
tree.add('hello.txt')
823
663
out, err = self.run_bzr("commit tree/hello.txt")
824
664
last_rev = tree.branch.repository.get_revision(tree.last_revision())
825
665
self.assertEqual('save me some typing\n', last_rev.message)
827
def test_commit_without_username(self):
828
"""Ensure commit error if username is not set.
830
self.run_bzr(['init', 'foo'])
831
with open('foo/foo.txt', 'w') as f:
833
self.run_bzr(['add'], working_dir='foo')
834
self.overrideEnv('EMAIL', None)
835
self.overrideEnv('BZR_EMAIL', None)
836
# Also, make sure that it's not inferred from mailname.
837
self.overrideAttr(config, '_auto_user_id',
838
lambda: (None, None))
840
['Unable to determine your name'],
841
['commit', '-m', 'initial'], working_dir='foo')
843
def test_commit_recursive_checkout(self):
844
"""Ensure that a commit to a recursive checkout fails cleanly.
846
self.run_bzr(['init', 'test_branch'])
847
self.run_bzr(['checkout', 'test_branch', 'test_checkout'])
848
self.run_bzr(['bind', '.'], working_dir='test_checkout') # bind to self
849
with open('test_checkout/foo.txt', 'w') as f:
851
self.run_bzr(['add'], working_dir='test_checkout')
852
out, err = self.run_bzr_error(
853
['Branch.*test_checkout.*appears to be bound to itself'],
854
['commit', '-m', 'addedfoo'], working_dir='test_checkout')
856
def test_mv_dirs_non_ascii(self):
857
"""Move directory with non-ascii name and containing files.
859
Regression test for bug 185211.
861
tree = self.make_branch_and_tree('.')
862
self.build_tree([u'abc\xa7/', u'abc\xa7/foo'])
864
tree.add([u'abc\xa7/', u'abc\xa7/foo'])
865
tree.commit('checkin')
867
tree.rename_one(u'abc\xa7','abc')
869
self.run_bzr('ci -m "non-ascii mv"')
872
class TestSmartServerCommit(TestCaseWithTransport):
874
def test_commit_to_lightweight(self):
875
self.setup_smart_server_with_call_log()
876
t = self.make_branch_and_tree('from')
877
for count in range(9):
878
t.commit(message='commit %d' % count)
879
out, err = self.run_bzr(['checkout', '--lightweight', self.get_url('from'),
881
self.reset_smart_call_log()
882
self.build_tree(['target/afile'])
883
self.run_bzr(['add', 'target/afile'])
884
out, err = self.run_bzr(['commit', '-m', 'do something', 'target'])
885
# This figure represent the amount of work to perform this use case. It
886
# is entirely ok to reduce this number if a test fails due to rpc_count
887
# being too low. If rpc_count increases, more network roundtrips have
888
# become necessary for this use case. Please do not adjust this number
889
# upwards without agreement from bzr's network support maintainers.
890
self.assertLength(211, self.hpss_calls)
891
self.assertLength(2, self.hpss_connections)
892
self.expectFailure("commit still uses VFS calls",
893
self.assertThat, self.hpss_calls, ContainsNoVfsCalls)
added
removed
bzrlib/tests/blackbox/test_commit.py
