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