41
36
def test_05_empty_commit(self):
42
37
"""Commit of tree with no versioned files should fail"""
43
38
# If forced, it should succeed, but this is not tested here.
44
self.make_branch_and_tree('.')
45
40
self.build_tree(['hello.txt'])
46
41
out,err = self.run_bzr('commit -m empty', retcode=3)
47
42
self.assertEqual('', out)
48
self.assertContainsRe(err, 'bzr: ERROR: No changes to commit\.'
49
' Use --unchanged to commit anyhow.\n')
43
self.assertStartsWith(err, 'bzr: ERROR: no changes to commit.'
44
' use --unchanged to commit anyhow\n')
51
46
def test_commit_success(self):
52
47
"""Successful commit should not leave behind a bzr-commit-* file"""
53
self.make_branch_and_tree('.')
54
49
self.run_bzr('commit --unchanged -m message')
55
50
self.assertEqual('', self.run_bzr('unknowns')[0])
61
56
def test_commit_with_path(self):
62
57
"""Commit tree with path of root specified"""
63
a_tree = self.make_branch_and_tree('a')
58
self.run_bzr('init a')
64
59
self.build_tree(['a/a_file'])
60
self.run_bzr('add a/a_file')
66
61
self.run_bzr(['commit', '-m', 'first commit', 'a'])
68
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
63
self.run_bzr('branch a b')
69
64
self.build_tree_contents([('b/a_file', 'changes in b')])
70
65
self.run_bzr(['commit', '-m', 'first commit in b', 'b'])
72
67
self.build_tree_contents([('a/a_file', 'new contents')])
73
68
self.run_bzr(['commit', '-m', 'change in a', 'a'])
75
b_tree.merge_from_branch(a_tree.branch)
76
self.assertEqual(len(b_tree.conflicts()), 1)
71
self.run_bzr('merge ../a', retcode=1) # will conflict
77
73
self.run_bzr('resolved b/a_file')
78
74
self.run_bzr(['commit', '-m', 'merge into b', 'b'])
81
77
def test_10_verbose_commit(self):
82
78
"""Add one file and examine verbose commit output"""
83
tree = self.make_branch_and_tree('.')
84
80
self.build_tree(['hello.txt'])
81
self.run_bzr("add hello.txt")
86
82
out,err = self.run_bzr('commit -m added')
87
83
self.assertEqual('', out)
88
self.assertContainsRe(err, '^Committing to: .*\n'
90
'Committed revision 1.\n$',)
84
self.assertEqual('added hello.txt\n'
85
'Committed revision 1.\n',
92
88
def prepare_simple_history(self):
93
89
"""Prepare and return a working tree with one commit of one file"""
104
100
self.build_tree_contents([('hello.txt', 'new contents')])
105
101
out, err = self.run_bzr('commit -m modified')
106
102
self.assertEqual('', out)
107
self.assertContainsRe(err, '^Committing to: .*\n'
108
'modified hello\.txt\n'
109
'Committed revision 2\.\n$')
111
def test_unicode_commit_message_is_filename(self):
112
"""Unicode commit message same as a filename (Bug #563646).
114
file_name = u'\N{euro sign}'
115
self.run_bzr(['init'])
116
open(file_name, 'w').write('hello world')
117
self.run_bzr(['add'])
118
out, err = self.run_bzr(['commit', '-m', file_name])
119
reflags = re.MULTILINE|re.DOTALL|re.UNICODE
120
te = osutils.get_terminal_encoding()
121
self.assertContainsRe(err.decode(te),
122
u'The commit message is a file name:',
125
# Run same test with a filename that causes encode
126
# error for the terminal encoding. We do this
127
# by forcing terminal encoding of ascii for
128
# osutils.get_terminal_encoding which is used
129
# by ui.text.show_warning
130
default_get_terminal_enc = osutils.get_terminal_encoding
132
osutils.get_terminal_encoding = lambda: 'ascii'
133
file_name = u'foo\u1234'
134
open(file_name, 'w').write('hello world')
135
self.run_bzr(['add'])
136
out, err = self.run_bzr(['commit', '-m', file_name])
137
reflags = re.MULTILINE|re.DOTALL|re.UNICODE
138
te = osutils.get_terminal_encoding()
139
self.assertContainsRe(err.decode(te, 'replace'),
140
u'The commit message is a file name:',
143
osutils.get_terminal_encoding = default_get_terminal_enc
145
def test_warn_about_forgotten_commit_message(self):
146
"""Test that the lack of -m parameter is caught"""
147
wt = self.make_branch_and_tree('.')
148
self.build_tree(['one', 'two'])
150
out, err = self.run_bzr('commit -m one two')
151
self.assertContainsRe(err, "The commit message is a file name")
103
self.assertEqual('modified hello.txt\n'
104
'Committed revision 2.\n',
153
107
def test_verbose_commit_renamed(self):
154
108
# Verbose commit of renamed file should say so
184
135
wt.add(['hello.txt'])
185
136
out,err = self.run_bzr('commit -m added')
186
137
self.assertEqual('', out)
187
self.assertContainsRe(err, '^Committing to: .*\n'
189
'Committed revision 1\.\n$')
138
self.assertEqual('added hello.txt\n'
139
'Committed revision 1.\n',
191
142
def test_verbose_commit_with_unchanged(self):
192
143
"""Unchanged files should not be listed by default in verbose output"""
193
tree = self.make_branch_and_tree('.')
194
145
self.build_tree(['hello.txt', 'unchanged.txt'])
195
tree.add('unchanged.txt')
146
self.run_bzr('add unchanged.txt')
196
147
self.run_bzr('commit -m unchanged unchanged.txt')
197
tree.add("hello.txt")
148
self.run_bzr("add hello.txt")
198
149
out,err = self.run_bzr('commit -m added')
199
150
self.assertEqual('', out)
200
self.assertContainsRe(err, '^Committing to: .*\n'
202
'Committed revision 2\.$\n')
204
def test_verbose_commit_includes_master_location(self):
205
"""Location of master is displayed when committing to bound branch"""
206
a_tree = self.make_branch_and_tree('a')
207
self.build_tree(['a/b'])
209
a_tree.commit(message='Initial message')
211
b_tree = a_tree.branch.create_checkout('b')
212
expected = "%s/" % (osutils.abspath('a'), )
213
out, err = self.run_bzr('commit -m blah --unchanged', working_dir='b')
214
self.assertEqual(err, 'Committing to: %s\n'
215
'Committed revision 2.\n' % expected)
217
def test_commit_sanitizes_CR_in_message(self):
218
# See bug #433779, basically Emacs likes to pass '\r\n' style line
219
# endings to 'bzr commit -m ""' which breaks because we don't allow
220
# '\r' in commit messages. (Mostly because of issues where XML style
221
# formats arbitrarily strip it out of the data while parsing.)
222
# To make life easier for users, we just always translate '\r\n' =>
223
# '\n'. And '\r' => '\n'.
224
a_tree = self.make_branch_and_tree('a')
225
self.build_tree(['a/b'])
227
self.run_bzr(['commit',
228
'-m', 'a string\r\n\r\nwith mixed\r\rendings\n'],
230
rev_id = a_tree.branch.last_revision()
231
rev = a_tree.branch.repository.get_revision(rev_id)
232
self.assertEqualDiff('a string\n\nwith mixed\n\nendings\n',
151
self.assertEqual('added hello.txt\n'
152
'Committed revision 2.\n',
235
155
def test_commit_merge_reports_all_modified_files(self):
236
156
# the commit command should show all the files that are shown by
284
203
this_tree.merge_from_branch(other_tree.branch)
286
205
out,err = self.run_bzr('commit -m added')
287
207
self.assertEqual('', out)
288
self.assertEqual(set([
289
'Committing to: %s/' % osutils.getcwd(),
290
'modified filetomodify',
293
'renamed dirtorename => renameddir',
294
'renamed filetorename => renamedfile',
295
'renamed dirtoreparent => renameddir/reparenteddir',
296
'renamed filetoreparent => renameddir/reparentedfile',
297
'deleted dirtoremove',
298
'deleted filetoremove',
299
'Committed revision 2.',
301
]), set(err.split('\n')))
208
self.assertEqualDiff(
209
'modified filetomodify\n'
212
'renamed dirtorename => renameddir\n'
213
'renamed dirtoreparent => renameddir/reparenteddir\n'
214
'renamed filetoreparent => renameddir/reparentedfile\n'
215
'renamed filetorename => renamedfile\n'
216
'deleted dirtoremove\n'
217
'deleted filetoremove\n'
218
'Committed revision 2.\n',
303
221
def test_empty_commit_message(self):
304
tree = self.make_branch_and_tree('.')
305
self.build_tree_contents([('foo.c', 'int main() {}')])
223
file('foo.c', 'wt').write('int main() {}')
224
self.run_bzr('add foo.c')
307
225
self.run_bzr('commit -m ""', retcode=3)
309
227
def test_unsupported_encoding_commit_message(self):
310
if sys.platform == 'win32':
311
raise tests.TestNotApplicable('Win32 parses arguments directly'
312
' as Unicode, so we can\'t pass invalid non-ascii')
313
228
tree = self.make_branch_and_tree('.')
314
229
self.build_tree_contents([('foo.c', 'int main() {}')])
315
230
tree.add('foo.c')
316
# LANG env variable has no effect on Windows
317
# but some characters anyway cannot be represented
318
# in default user encoding
319
char = probe_bad_non_ascii(osutils.get_user_encoding())
321
raise TestSkipped('Cannot find suitable non-ascii character'
322
'for user_encoding (%s)' % osutils.get_user_encoding())
323
out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
325
env_changes={'LANG': 'C'})
231
out,err = self.run_bzr_subprocess('commit -m "\xff"', retcode=1,
232
env_changes={'LANG': 'C'})
326
233
self.assertContainsRe(err, r'bzrlib.errors.BzrError: Parameter.*is '
327
234
'unsupported by the current encoding.')
329
236
def test_other_branch_commit(self):
330
237
# this branch is to ensure consistent behaviour, whether we're run
331
238
# inside a branch, or not.
332
outer_tree = self.make_branch_and_tree('.')
333
inner_tree = self.make_branch_and_tree('branch')
334
self.build_tree_contents([
335
('branch/foo.c', 'int main() {}'),
336
('branch/bar.c', 'int main() {}')])
337
inner_tree.add(['foo.c', 'bar.c'])
239
os.mkdir('empty_branch')
240
os.chdir('empty_branch')
245
file('foo.c', 'wt').write('int main() {}')
246
file('bar.c', 'wt').write('int main() {}')
248
self.run_bzr('add branch/foo.c')
249
self.run_bzr('add branch')
338
250
# can't commit files in different trees; sane error
339
251
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
340
# can commit to branch - records foo.c only
341
252
self.run_bzr('commit -m newstuff branch/foo.c')
342
# can commit to branch - records bar.c
343
253
self.run_bzr('commit -m newstuff branch')
345
self.run_bzr_error(["No changes to commit"], 'commit -m newstuff branch')
254
self.run_bzr('commit -m newstuff branch', retcode=3)
347
256
def test_out_of_date_tree_commit(self):
348
257
# check we get an error code and a clear message committing with an out
349
258
# of date checkout
350
tree = self.make_branch_and_tree('branch')
259
self.make_branch_and_tree('branch')
351
260
# make a checkout
352
checkout = tree.branch.create_checkout('checkout', lightweight=True)
261
self.run_bzr('checkout --lightweight branch checkout')
353
262
# commit to the original branch to make the checkout out of date
354
tree.commit('message branch', allow_pointless=True)
263
self.run_bzr('commit --unchanged -m message branch')
355
264
# now commit to the checkout should emit
356
265
# ERROR: Out of date with the branch, 'bzr update' is suggested
357
266
output = self.run_bzr('commit --unchanged -m checkout_message '
358
267
'checkout', retcode=3)
359
268
self.assertEqual(output,
361
"bzr: ERROR: Working tree is out of date, please "
362
"run 'bzr update'.\n"))
270
"bzr: ERROR: Working tree is out of date, please run "
364
273
def test_local_commit_unbound(self):
365
274
# a --local commit on an unbound branch is an error
372
281
def test_commit_a_text_merge_in_a_checkout(self):
373
282
# checkouts perform multiple actions in a transaction across bond
374
283
# branches and their master, and have been observed to fail in the
375
# past. This is a user story reported to fail in bug #43959 where
284
# past. This is a user story reported to fail in bug #43959 where
376
285
# a merge done in a checkout (using the update command) failed to
377
286
# commit correctly.
378
trunk = self.make_branch_and_tree('trunk')
287
self.run_bzr('init trunk')
380
u1 = trunk.branch.create_checkout('u1')
381
self.build_tree_contents([('u1/hosts', 'initial contents\n')])
289
self.run_bzr('checkout trunk u1')
290
self.build_tree_contents([('u1/hosts', 'initial contents')])
291
self.run_bzr('add u1/hosts')
383
292
self.run_bzr('commit -m add-hosts u1')
385
u2 = trunk.branch.create_checkout('u2')
386
self.build_tree_contents([('u2/hosts', 'altered in u2\n')])
294
self.run_bzr('checkout trunk u2')
295
self.build_tree_contents([('u2/hosts', 'altered in u2')])
387
296
self.run_bzr('commit -m checkin-from-u2 u2')
389
298
# make an offline commits
390
self.build_tree_contents([('u1/hosts', 'first offline change in u1\n')])
299
self.build_tree_contents([('u1/hosts', 'first offline change in u1')])
391
300
self.run_bzr('commit -m checkin-offline --local u1')
393
302
# now try to pull in online work from u2, and then commit our offline
394
303
# work as a merge
395
304
# retcode 1 as we expect a text conflict
396
305
self.run_bzr('update u1', retcode=1)
397
self.assertFileEqual('''\
399
first offline change in u1
406
306
self.run_bzr('resolved u1/hosts')
407
307
# add a text change here to represent resolving the merge conflicts in
408
308
# favour of a new version of the file not identical to either the u1
410
310
self.build_tree_contents([('u1/hosts', 'merge resolution\n')])
411
311
self.run_bzr('commit -m checkin-merge-of-the-offline-work-from-u1 u1')
413
def test_commit_exclude_excludes_modified_files(self):
414
"""Commit -x foo should ignore changes to foo."""
415
tree = self.make_branch_and_tree('.')
416
self.build_tree(['a', 'b', 'c'])
417
tree.smart_add(['.'])
418
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b'])
419
self.assertFalse('added b' in out)
420
self.assertFalse('added b' in err)
421
# If b was excluded it will still be 'added' in status.
422
out, err = self.run_bzr(['added'])
423
self.assertEqual('b\n', out)
424
self.assertEqual('', err)
426
def test_commit_exclude_twice_uses_both_rules(self):
427
"""Commit -x foo -x bar should ignore changes to foo and bar."""
428
tree = self.make_branch_and_tree('.')
429
self.build_tree(['a', 'b', 'c'])
430
tree.smart_add(['.'])
431
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b', '-x', 'c'])
432
self.assertFalse('added b' in out)
433
self.assertFalse('added c' in out)
434
self.assertFalse('added b' in err)
435
self.assertFalse('added c' in err)
436
# If b was excluded it will still be 'added' in status.
437
out, err = self.run_bzr(['added'])
438
self.assertTrue('b\n' in out)
439
self.assertTrue('c\n' in out)
440
self.assertEqual('', err)
442
313
def test_commit_respects_spec_for_removals(self):
443
314
"""Commit with a file spec should only commit removals that match"""
444
315
t = self.make_branch_and_tree('.')
647
512
"tree/hello.txt")
648
513
last_rev = tree.branch.repository.get_revision(tree.last_revision())
649
514
properties = last_rev.properties
650
self.assertEqual('John Doe', properties['authors'])
652
def test_multiple_authors(self):
653
"""Multiple authors can be specyfied, and all are stored."""
654
tree = self.make_branch_and_tree('tree')
655
self.build_tree(['tree/hello.txt'])
656
tree.add('hello.txt')
657
out, err = self.run_bzr("commit -m hello --author='John Doe' "
658
"--author='Jane Rey' tree/hello.txt")
659
last_rev = tree.branch.repository.get_revision(tree.last_revision())
660
properties = last_rev.properties
661
self.assertEqual('John Doe\nJane Rey', properties['authors'])
663
def test_commit_time(self):
664
tree = self.make_branch_and_tree('tree')
665
self.build_tree(['tree/hello.txt'])
666
tree.add('hello.txt')
667
out, err = self.run_bzr("commit -m hello "
668
"--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
669
last_rev = tree.branch.repository.get_revision(tree.last_revision())
671
'Sat 2009-10-10 08:00:00 +0100',
672
osutils.format_date(last_rev.timestamp, last_rev.timezone))
674
def test_commit_time_bad_time(self):
675
tree = self.make_branch_and_tree('tree')
676
self.build_tree(['tree/hello.txt'])
677
tree.add('hello.txt')
678
out, err = self.run_bzr("commit -m hello "
679
"--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
680
self.assertStartsWith(
681
err, "bzr: ERROR: Could not parse --commit-time:")
683
def test_partial_commit_with_renames_in_tree(self):
684
# this test illustrates bug #140419
685
t = self.make_branch_and_tree('.')
686
self.build_tree(['dir/', 'dir/a', 'test'])
687
t.add(['dir/', 'dir/a', 'test'])
688
t.commit('initial commit')
689
# important part: file dir/a should change parent
690
# and should appear before old parent
691
# then during partial commit we have error
692
# parent_id {dir-XXX} not in inventory
693
t.rename_one('dir/a', 'a')
694
self.build_tree_contents([('test', 'changes in test')])
696
out, err = self.run_bzr('commit test -m "partial commit"')
697
self.assertEquals('', out)
698
self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
700
def test_commit_readonly_checkout(self):
701
# https://bugs.edge.launchpad.net/bzr/+bug/129701
702
# "UnlockableTransport error trying to commit in checkout of readonly
704
self.make_branch('master')
705
master = BzrDir.open_from_transport(
706
self.get_readonly_transport('master')).open_branch()
707
master.create_checkout('checkout')
708
out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
710
self.assertContainsRe(err,
711
r'^bzr: ERROR: Cannot lock.*readonly transport')
713
def setup_editor(self):
714
# Test that commit template hooks work
715
if sys.platform == "win32":
716
f = file('fed.bat', 'w')
717
f.write('@rem dummy fed')
719
osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
721
f = file('fed.sh', 'wb')
722
f.write('#!/bin/sh\n')
724
os.chmod('fed.sh', 0755)
725
osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
727
def setup_commit_with_template(self):
729
msgeditor.hooks.install_named_hook("commit_message_template",
730
lambda commit_obj, msg: "save me some typing\n", None)
731
tree = self.make_branch_and_tree('tree')
732
self.build_tree(['tree/hello.txt'])
733
tree.add('hello.txt')
736
def test_commit_hook_template_accepted(self):
737
tree = self.setup_commit_with_template()
738
out, err = self.run_bzr("commit tree/hello.txt", stdin="y\n")
739
last_rev = tree.branch.repository.get_revision(tree.last_revision())
740
self.assertEqual('save me some typing\n', last_rev.message)
742
def test_commit_hook_template_rejected(self):
743
tree = self.setup_commit_with_template()
744
expected = tree.last_revision()
745
out, err = self.run_bzr_error(["empty commit message"],
746
"commit tree/hello.txt", stdin="n\n")
747
self.assertEqual(expected, tree.last_revision())
749
def test_commit_without_username(self):
750
"""Ensure commit error if username is not set.
752
self.run_bzr(['init', 'foo'])
754
open('foo.txt', 'w').write('hello')
755
self.run_bzr(['add'])
756
osutils.set_or_unset_env('EMAIL', None)
757
osutils.set_or_unset_env('BZR_EMAIL', None)
758
out, err = self.run_bzr(['commit', '-m', 'initial'], 3)
759
self.assertContainsRe(err, 'Unable to determine your name')
515
self.assertEqual('John Doe', properties['author'])
added
removed
bzrlib/tests/blackbox/test_commit.py
