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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
18
"""Tests for the commit CLI of bzr."""
24
23
from bzrlib import (
27
from bzrlib.branch import Branch
28
29
from bzrlib.bzrdir import BzrDir
29
from bzrlib.errors import BzrCommandError
30
from bzrlib.tests import (
30
34
from bzrlib.tests.blackbox import ExternalBase
31
from bzrlib.workingtree import WorkingTree
34
37
class TestCommit(ExternalBase):
36
39
def test_05_empty_commit(self):
37
40
"""Commit of tree with no versioned files should fail"""
38
41
# If forced, it should succeed, but this is not tested here.
42
self.make_branch_and_tree('.')
40
43
self.build_tree(['hello.txt'])
41
44
out,err = self.run_bzr('commit -m empty', retcode=3)
42
45
self.assertEqual('', out)
43
self.assertStartsWith(err, 'bzr: ERROR: no changes to commit.'
44
' use --unchanged to commit anyhow\n')
46
self.assertContainsRe(err, 'bzr: ERROR: No changes to commit\.'
47
' Use --unchanged to commit anyhow.\n')
46
49
def test_commit_success(self):
47
50
"""Successful commit should not leave behind a bzr-commit-* file"""
51
self.make_branch_and_tree('.')
49
52
self.run_bzr('commit --unchanged -m message')
50
53
self.assertEqual('', self.run_bzr('unknowns')[0])
56
59
def test_commit_with_path(self):
57
60
"""Commit tree with path of root specified"""
58
self.run_bzr('init a')
61
a_tree = self.make_branch_and_tree('a')
59
62
self.build_tree(['a/a_file'])
60
self.run_bzr('add a/a_file')
61
64
self.run_bzr(['commit', '-m', 'first commit', 'a'])
63
self.run_bzr('branch a b')
66
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
64
67
self.build_tree_contents([('b/a_file', 'changes in b')])
65
68
self.run_bzr(['commit', '-m', 'first commit in b', 'b'])
67
70
self.build_tree_contents([('a/a_file', 'new contents')])
68
71
self.run_bzr(['commit', '-m', 'change in a', 'a'])
71
self.run_bzr('merge ../a', retcode=1) # will conflict
73
b_tree.merge_from_branch(a_tree.branch)
74
self.assertEqual(len(b_tree.conflicts()), 1)
73
75
self.run_bzr('resolved b/a_file')
74
76
self.run_bzr(['commit', '-m', 'merge into b', 'b'])
77
79
def test_10_verbose_commit(self):
78
80
"""Add one file and examine verbose commit output"""
81
tree = self.make_branch_and_tree('.')
80
82
self.build_tree(['hello.txt'])
81
self.run_bzr("add hello.txt")
82
84
out,err = self.run_bzr('commit -m added')
83
85
self.assertEqual('', out)
84
self.assertEqual('added hello.txt\n'
85
'Committed revision 1.\n',
86
self.assertContainsRe(err, '^Committing to: .*\n'
88
'Committed revision 1.\n$',)
88
90
def prepare_simple_history(self):
89
91
"""Prepare and return a working tree with one commit of one file"""
100
102
self.build_tree_contents([('hello.txt', 'new contents')])
101
103
out, err = self.run_bzr('commit -m modified')
102
104
self.assertEqual('', out)
103
self.assertEqual('modified hello.txt\n'
104
'Committed revision 2.\n',
105
self.assertContainsRe(err, '^Committing to: .*\n'
106
'modified hello\.txt\n'
107
'Committed revision 2\.\n$')
107
109
def test_verbose_commit_renamed(self):
108
110
# Verbose commit of renamed file should say so
110
112
wt.rename_one('hello.txt', 'gutentag.txt')
111
113
out, err = self.run_bzr('commit -m renamed')
112
114
self.assertEqual('', out)
113
self.assertEqual('renamed hello.txt => gutentag.txt\n'
114
'Committed revision 2.\n',
115
self.assertContainsRe(err, '^Committing to: .*\n'
116
'renamed hello\.txt => gutentag\.txt\n'
117
'Committed revision 2\.$\n')
117
119
def test_verbose_commit_moved(self):
118
120
# Verbose commit of file moved to new directory should say so
122
124
wt.rename_one('hello.txt', 'subdir/hello.txt')
123
125
out, err = self.run_bzr('commit -m renamed')
124
126
self.assertEqual('', out)
125
self.assertEqualDiff('added subdir\n'
126
'renamed hello.txt => subdir/hello.txt\n'
127
'Committed revision 2.\n',
127
self.assertEqual(set([
128
'Committing to: %s/' % osutils.getcwd(),
130
'renamed hello.txt => subdir/hello.txt',
131
'Committed revision 2.',
133
]), set(err.split('\n')))
130
135
def test_verbose_commit_with_unknown(self):
131
136
"""Unknown files should not be listed by default in verbose output"""
135
140
wt.add(['hello.txt'])
136
141
out,err = self.run_bzr('commit -m added')
137
142
self.assertEqual('', out)
138
self.assertEqual('added hello.txt\n'
139
'Committed revision 1.\n',
143
self.assertContainsRe(err, '^Committing to: .*\n'
145
'Committed revision 1\.\n$')
142
147
def test_verbose_commit_with_unchanged(self):
143
148
"""Unchanged files should not be listed by default in verbose output"""
149
tree = self.make_branch_and_tree('.')
145
150
self.build_tree(['hello.txt', 'unchanged.txt'])
146
self.run_bzr('add unchanged.txt')
151
tree.add('unchanged.txt')
147
152
self.run_bzr('commit -m unchanged unchanged.txt')
148
self.run_bzr("add hello.txt")
153
tree.add("hello.txt")
149
154
out,err = self.run_bzr('commit -m added')
150
155
self.assertEqual('', out)
151
self.assertEqual('added hello.txt\n'
152
'Committed revision 2.\n',
156
self.assertContainsRe(err, '^Committing to: .*\n'
158
'Committed revision 2\.$\n')
160
def test_verbose_commit_includes_master_location(self):
161
"""Location of master is displayed when committing to bound branch"""
162
a_tree = self.make_branch_and_tree('a')
163
self.build_tree(['a/b'])
165
a_tree.commit(message='Initial message')
167
b_tree = a_tree.branch.create_checkout('b')
168
expected = "%s/" % (osutils.abspath('a'), )
169
out, err = self.run_bzr('commit -m blah --unchanged', working_dir='b')
170
self.assertEqual(err, 'Committing to: %s\n'
171
'Committed revision 2.\n' % expected)
155
173
def test_commit_merge_reports_all_modified_files(self):
156
174
# the commit command should show all the files that are shown by
189
207
other_tree.rename_one('dirtorename', 'renameddir')
190
208
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
191
209
other_tree.rename_one('filetorename', 'renamedfile')
192
other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
210
other_tree.rename_one('filetoreparent',
211
'renameddir/reparentedfile')
193
212
other_tree.remove(['dirtoremove', 'filetoremove'])
194
213
self.build_tree_contents([
196
215
('other/filetomodify', 'new content'),
197
216
('other/newfile', 'new file content')])
198
217
other_tree.add('newfile')
203
222
this_tree.merge_from_branch(other_tree.branch)
205
224
out,err = self.run_bzr('commit -m added')
207
225
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',
226
self.assertEqual(set([
227
'Committing to: %s/' % osutils.getcwd(),
228
'modified filetomodify',
231
'renamed dirtorename => renameddir',
232
'renamed filetorename => renamedfile',
233
'renamed dirtoreparent => renameddir/reparenteddir',
234
'renamed filetoreparent => renameddir/reparentedfile',
235
'deleted dirtoremove',
236
'deleted filetoremove',
237
'Committed revision 2.',
239
]), set(err.split('\n')))
221
241
def test_empty_commit_message(self):
223
file('foo.c', 'wt').write('int main() {}')
224
self.run_bzr('add foo.c')
242
tree = self.make_branch_and_tree('.')
243
self.build_tree_contents([('foo.c', 'int main() {}')])
225
245
self.run_bzr('commit -m ""', retcode=3)
227
247
def test_unsupported_encoding_commit_message(self):
228
248
tree = self.make_branch_and_tree('.')
229
249
self.build_tree_contents([('foo.c', 'int main() {}')])
230
250
tree.add('foo.c')
231
out,err = self.run_bzr_subprocess('commit -m "\xff"', retcode=1,
232
env_changes={'LANG': 'C'})
251
# LANG env variable has no effect on Windows
252
# but some characters anyway cannot be represented
253
# in default user encoding
254
char = probe_bad_non_ascii(osutils.get_user_encoding())
256
raise TestSkipped('Cannot find suitable non-ascii character'
257
'for user_encoding (%s)' % osutils.get_user_encoding())
258
# TODO: jam 2009-07-23 This test seems to fail on Windows now. My best
259
# guess is that the change to use Unicode command lines means
260
# that we no longer pay any attention to LANG=C when decoding the
261
# commandline arguments.
262
out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
264
env_changes={'LANG': 'C'})
233
265
self.assertContainsRe(err, r'bzrlib.errors.BzrError: Parameter.*is '
234
266
'unsupported by the current encoding.')
236
268
def test_other_branch_commit(self):
237
269
# this branch is to ensure consistent behaviour, whether we're run
238
270
# 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')
271
outer_tree = self.make_branch_and_tree('.')
272
inner_tree = self.make_branch_and_tree('branch')
273
self.build_tree_contents([
274
('branch/foo.c', 'int main() {}'),
275
('branch/bar.c', 'int main() {}')])
276
inner_tree.add('foo.c')
277
inner_tree.add('bar.c')
250
278
# can't commit files in different trees; sane error
251
279
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
252
280
self.run_bzr('commit -m newstuff branch/foo.c')
256
284
def test_out_of_date_tree_commit(self):
257
285
# check we get an error code and a clear message committing with an out
258
286
# of date checkout
259
self.make_branch_and_tree('branch')
287
tree = self.make_branch_and_tree('branch')
260
288
# make a checkout
261
self.run_bzr('checkout --lightweight branch checkout')
289
checkout = tree.branch.create_checkout('checkout', lightweight=True)
262
290
# commit to the original branch to make the checkout out of date
263
self.run_bzr('commit --unchanged -m message branch')
291
tree.commit('message branch', allow_pointless=True)
264
292
# now commit to the checkout should emit
265
293
# ERROR: Out of date with the branch, 'bzr update' is suggested
266
294
output = self.run_bzr('commit --unchanged -m checkout_message '
267
295
'checkout', retcode=3)
268
296
self.assertEqual(output,
270
"bzr: ERROR: Working tree is out of date, please run "
298
"bzr: ERROR: Working tree is out of date, please "
299
"run 'bzr update'.\n"))
273
301
def test_local_commit_unbound(self):
274
302
# a --local commit on an unbound branch is an error
281
309
def test_commit_a_text_merge_in_a_checkout(self):
282
310
# checkouts perform multiple actions in a transaction across bond
283
311
# 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
312
# past. This is a user story reported to fail in bug #43959 where
285
313
# a merge done in a checkout (using the update command) failed to
286
314
# commit correctly.
287
self.run_bzr('init trunk')
315
trunk = self.make_branch_and_tree('trunk')
289
self.run_bzr('checkout trunk u1')
317
u1 = trunk.branch.create_checkout('u1')
290
318
self.build_tree_contents([('u1/hosts', 'initial contents')])
291
self.run_bzr('add u1/hosts')
292
320
self.run_bzr('commit -m add-hosts u1')
294
self.run_bzr('checkout trunk u2')
322
u2 = trunk.branch.create_checkout('u2')
295
323
self.build_tree_contents([('u2/hosts', 'altered in u2')])
296
324
self.run_bzr('commit -m checkin-from-u2 u2')
310
338
self.build_tree_contents([('u1/hosts', 'merge resolution\n')])
311
339
self.run_bzr('commit -m checkin-merge-of-the-offline-work-from-u1 u1')
341
def test_commit_exclude_excludes_modified_files(self):
342
"""Commit -x foo should ignore changes to foo."""
343
tree = self.make_branch_and_tree('.')
344
self.build_tree(['a', 'b', 'c'])
345
tree.smart_add(['.'])
346
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b'])
347
self.assertFalse('added b' in out)
348
self.assertFalse('added b' in err)
349
# If b was excluded it will still be 'added' in status.
350
out, err = self.run_bzr(['added'])
351
self.assertEqual('b\n', out)
352
self.assertEqual('', err)
354
def test_commit_exclude_twice_uses_both_rules(self):
355
"""Commit -x foo -x bar should ignore changes to foo and bar."""
356
tree = self.make_branch_and_tree('.')
357
self.build_tree(['a', 'b', 'c'])
358
tree.smart_add(['.'])
359
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b', '-x', 'c'])
360
self.assertFalse('added b' in out)
361
self.assertFalse('added c' in out)
362
self.assertFalse('added b' in err)
363
self.assertFalse('added c' in err)
364
# If b was excluded it will still be 'added' in status.
365
out, err = self.run_bzr(['added'])
366
self.assertTrue('b\n' in out)
367
self.assertTrue('c\n' in out)
368
self.assertEqual('', err)
313
370
def test_commit_respects_spec_for_removals(self):
314
371
"""Commit with a file spec should only commit removals that match"""
315
372
t = self.make_branch_and_tree('.')
376
433
output, err = self.run_bzr(
377
434
'commit -m hello --fixes=lp:23452 tree/hello.txt')
378
435
self.assertEqual('', output)
379
self.assertEqual('added hello.txt\nCommitted revision 1.\n', err)
436
self.assertContainsRe(err, 'Committing to: .*\n'
438
'Committed revision 1\.\n')
381
440
def test_no_bugs_no_properties(self):
382
441
"""If no bugs are fixed, the bugs property is not set.
497
559
tree = self.make_branch_and_tree('tree')
498
560
self.build_tree(['tree/hello.txt'])
499
561
tree.add('hello.txt')
500
self.run_bzr("commit -m hello --author='John Doe <jdoe@example.com>' "
562
self.run_bzr(["commit", '-m', 'hello',
563
'--author', u'John D\xf6 <jdoe@example.com>',
502
565
last_rev = tree.branch.repository.get_revision(tree.last_revision())
503
566
properties = last_rev.properties
504
self.assertEqual('John Doe <jdoe@example.com>', properties['author'])
567
self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['authors'])
506
569
def test_author_no_email(self):
507
570
"""Author's name without an email address is allowed, too."""
512
575
"tree/hello.txt")
513
576
last_rev = tree.branch.repository.get_revision(tree.last_revision())
514
577
properties = last_rev.properties
515
self.assertEqual('John Doe', properties['author'])
578
self.assertEqual('John Doe', properties['authors'])
580
def test_multiple_authors(self):
581
"""Multiple authors can be specyfied, and all are stored."""
582
tree = self.make_branch_and_tree('tree')
583
self.build_tree(['tree/hello.txt'])
584
tree.add('hello.txt')
585
out, err = self.run_bzr("commit -m hello --author='John Doe' "
586
"--author='Jane Rey' tree/hello.txt")
587
last_rev = tree.branch.repository.get_revision(tree.last_revision())
588
properties = last_rev.properties
589
self.assertEqual('John Doe\nJane Rey', properties['authors'])
591
def test_partial_commit_with_renames_in_tree(self):
592
# this test illustrates bug #140419
593
t = self.make_branch_and_tree('.')
594
self.build_tree(['dir/', 'dir/a', 'test'])
595
t.add(['dir/', 'dir/a', 'test'])
596
t.commit('initial commit')
597
# important part: file dir/a should change parent
598
# and should appear before old parent
599
# then during partial commit we have error
600
# parent_id {dir-XXX} not in inventory
601
t.rename_one('dir/a', 'a')
602
self.build_tree_contents([('test', 'changes in test')])
604
out, err = self.run_bzr('commit test -m "partial commit"')
605
self.assertEquals('', out)
606
self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
608
def test_commit_readonly_checkout(self):
609
# https://bugs.edge.launchpad.net/bzr/+bug/129701
610
# "UnlockableTransport error trying to commit in checkout of readonly
612
self.make_branch('master')
613
master = BzrDir.open_from_transport(
614
self.get_readonly_transport('master')).open_branch()
615
master.create_checkout('checkout')
616
out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
618
self.assertContainsRe(err,
619
r'^bzr: ERROR: Cannot lock.*readonly transport')
621
def test_commit_hook_template(self):
622
# Test that commit template hooks work
623
def restoreDefaults():
624
msgeditor.hooks['commit_message_template'] = []
625
osutils.set_or_unset_env('BZR_EDITOR', default_editor)
626
if sys.platform == "win32":
627
f = file('fed.bat', 'w')
628
f.write('@rem dummy fed')
630
default_editor = osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
632
f = file('fed.sh', 'wb')
633
f.write('#!/bin/sh\n')
635
os.chmod('fed.sh', 0755)
636
default_editor = osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
637
self.addCleanup(restoreDefaults)
638
msgeditor.hooks.install_named_hook("commit_message_template",
639
lambda commit_obj, msg: "save me some typing\n", None)
640
tree = self.make_branch_and_tree('tree')
641
self.build_tree(['tree/hello.txt'])
642
tree.add('hello.txt')
643
out, err = self.run_bzr("commit tree/hello.txt")
644
last_rev = tree.branch.repository.get_revision(tree.last_revision())
645
self.assertEqual('save me some typing\n', last_rev.message)
added
removed
bzrlib/tests/blackbox/test_commit.py
