44
48
self.build_tree(['hello.txt'])
45
49
out,err = self.run_bzr('commit -m empty', retcode=3)
46
50
self.assertEqual('', out)
47
self.assertContainsRe(err, 'bzr: ERROR: No changes to commit\.'
48
' Use --unchanged to commit anyhow.\n')
52
# 1) We really don't want 'aborting commit write group' anymore.
53
# 2) bzr: ERROR: is a really long line, so we wrap it with '\'
58
bzr: ERROR: No changes to commit.\
59
Please 'bzr add' the files you want to commit,\
60
or use --unchanged to force an empty commit.
61
""", flags=doctest.ELLIPSIS|doctest.REPORT_UDIFF))
50
63
def test_commit_success(self):
51
64
"""Successful commit should not leave behind a bzr-commit-* file"""
57
70
self.run_bzr(["commit", "--unchanged", "-m", u'foo\xb5'])
58
71
self.assertEqual('', self.run_bzr('unknowns')[0])
73
def test_commit_lossy_native(self):
74
"""A --lossy option to commit is supported."""
75
self.make_branch_and_tree('.')
76
self.run_bzr('commit --lossy --unchanged -m message')
77
self.assertEqual('', self.run_bzr('unknowns')[0])
79
def test_commit_lossy_foreign(self):
80
test_foreign.register_dummy_foreign_for_test(self)
81
self.make_branch_and_tree('.',
82
format=test_foreign.DummyForeignVcsDirFormat())
83
self.run_bzr('commit --lossy --unchanged -m message')
84
output = self.run_bzr('revision-info')[0]
85
self.assertTrue(output.startswith('1 dummy-'))
60
87
def test_commit_with_path(self):
61
88
"""Commit tree with path of root specified"""
62
89
a_tree = self.make_branch_and_tree('a')
107
133
'modified hello\.txt\n'
108
134
'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
open(file_name, 'w').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
open(file_name, 'w').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\"$")
110
191
def test_warn_about_forgotten_commit_message(self):
111
192
"""Test that the lack of -m parameter is caught"""
112
193
wt = self.make_branch_and_tree('.')
269
350
tree = self.make_branch_and_tree('.')
270
351
self.build_tree_contents([('foo.c', 'int main() {}')])
271
352
tree.add('foo.c')
272
self.run_bzr('commit -m ""', retcode=3)
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')
278
tree = self.make_branch_and_tree('.')
279
self.build_tree_contents([('foo.c', 'int main() {}')])
281
# LANG env variable has no effect on Windows
282
# but some characters anyway cannot be represented
283
# in default user encoding
284
char = probe_bad_non_ascii(osutils.get_user_encoding())
286
raise TestSkipped('Cannot find suitable non-ascii character'
287
'for user_encoding (%s)' % osutils.get_user_encoding())
288
out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
290
env_changes={'LANG': 'C'})
291
self.assertContainsRe(err, r'bzrlib.errors.BzrError: Parameter.*is '
292
'unsupported by the current encoding.')
353
self.run_bzr('commit -m ""')
294
355
def test_other_branch_commit(self):
295
356
# this branch is to ensure consistent behaviour, whether we're run
556
617
'commit -m add-b --fixes=xxx:123',
557
618
working_dir='tree')
620
def test_fixes_bug_with_default_tracker(self):
621
"""commit --fixes=234 uses the default bug tracker."""
622
tree = self.make_branch_and_tree('tree')
623
self.build_tree(['tree/hello.txt'])
624
tree.add('hello.txt')
626
["bzr: ERROR: No tracker specified for bug 123. Use the form "
627
"'tracker:id' or specify a default bug tracker using the "
628
"`bugtracker` option.\n"
629
"See \"bzr help bugs\" for more information on this feature. "
631
'commit -m add-b --fixes=123',
633
tree.branch.get_config().set_user_option("bugtracker", "lp")
634
self.run_bzr('commit -m hello --fixes=234 tree/hello.txt')
635
last_rev = tree.branch.repository.get_revision(tree.last_revision())
636
self.assertEqual('https://launchpad.net/bugs/234 fixed',
637
last_rev.properties['bugs'])
559
639
def test_fixes_invalid_bug_number(self):
560
640
tree = self.make_branch_and_tree('tree')
561
641
self.build_tree(['tree/hello.txt'])
707
809
def test_commit_hook_template_rejected(self):
708
810
tree = self.setup_commit_with_template()
709
811
expected = tree.last_revision()
710
out, err = self.run_bzr_error(["empty commit message"],
812
out, err = self.run_bzr_error(["Empty commit message specified."
813
" Please specify a commit message with either"
814
" --message or --file or leave a blank message"
815
" with --message \"\"."],
711
816
"commit tree/hello.txt", stdin="n\n")
712
817
self.assertEqual(expected, tree.last_revision())
819
def test_set_commit_message(self):
820
msgeditor.hooks.install_named_hook("set_commit_message",
821
lambda commit_obj, msg: "save me some typing\n", None)
822
tree = self.make_branch_and_tree('tree')
823
self.build_tree(['tree/hello.txt'])
824
tree.add('hello.txt')
825
out, err = self.run_bzr("commit tree/hello.txt")
826
last_rev = tree.branch.repository.get_revision(tree.last_revision())
827
self.assertEqual('save me some typing\n', last_rev.message)
829
def test_commit_without_username(self):
830
"""Ensure commit error if username is not set.
832
self.run_bzr(['init', 'foo'])
834
open('foo.txt', 'w').write('hello')
835
self.run_bzr(['add'])
836
self.overrideEnv('EMAIL', None)
837
self.overrideEnv('BZR_EMAIL', None)
838
# Also, make sure that it's not inferred from mailname.
839
self.overrideAttr(config, '_auto_user_id',
840
lambda: (None, None))
841
out, err = self.run_bzr(['commit', '-m', 'initial'], 3)
842
self.assertContainsRe(err, 'Unable to determine your name')
844
def test_commit_recursive_checkout(self):
845
"""Ensure that a commit to a recursive checkout fails cleanly.
847
self.run_bzr(['init', 'test_branch'])
848
self.run_bzr(['checkout', 'test_branch', 'test_checkout'])
849
os.chdir('test_checkout')
850
self.run_bzr(['bind', '.']) # bind to self
851
open('foo.txt', 'w').write('hello')
852
self.run_bzr(['add'])
853
out, err = self.run_bzr(['commit', '-m', 'addedfoo'], 3)
854
self.assertEqual(out, '')
855
self.assertContainsRe(err,
856
'Branch.*test_checkout.*appears to be bound to itself')
858
def test_mv_dirs_non_ascii(self):
859
"""Move directory with non-ascii name and containing files.
861
Regression test for bug 185211.
863
tree = self.make_branch_and_tree('.')
864
self.build_tree([u'abc\xc3/', u'abc\xc3/foo'])
866
tree.add([u'abc\xc3/', u'abc\xc3/foo'])
867
tree.commit('checkin')
869
tree.rename_one(u'abc\xc3','abc')
871
self.run_bzr('ci -m "non-ascii mv"')
874
class TestSmartServerCommit(TestCaseWithTransport):
876
def test_commit_to_lightweight(self):
877
self.setup_smart_server_with_call_log()
878
t = self.make_branch_and_tree('from')
879
for count in range(9):
880
t.commit(message='commit %d' % count)
881
out, err = self.run_bzr(['checkout', '--lightweight', self.get_url('from'),
883
self.reset_smart_call_log()
884
self.build_tree(['target/afile'])
885
self.run_bzr(['add', 'target/afile'])
886
out, err = self.run_bzr(['commit', '-m', 'do something', 'target'])
887
# This figure represent the amount of work to perform this use case. It
888
# is entirely ok to reduce this number if a test fails due to rpc_count
889
# being too low. If rpc_count increases, more network roundtrips have
890
# become necessary for this use case. Please do not adjust this number
891
# upwards without agreement from bzr's network support maintainers.
892
self.assertLength(214, self.hpss_calls)
893
self.assertLength(2, self.hpss_connections)
894
self.expectFailure("commit still uses VFS calls",
895
self.assertThat, self.hpss_calls, ContainsNoVfsCalls)