18
18
"""Tests for the commit CLI of bzr."""
24
22
from bzrlib import (
27
from bzrlib.branch import Branch
28
25
from bzrlib.bzrdir import BzrDir
29
from bzrlib.errors import BzrCommandError
30
26
from bzrlib.tests.blackbox import ExternalBase
31
from bzrlib.workingtree import WorkingTree
34
29
class TestCommit(ExternalBase):
36
31
def test_05_empty_commit(self):
37
32
"""Commit of tree with no versioned files should fail"""
38
33
# If forced, it should succeed, but this is not tested here.
34
self.make_branch_and_tree('.')
40
35
self.build_tree(['hello.txt'])
41
36
out,err = self.run_bzr('commit -m empty', retcode=3)
42
37
self.assertEqual('', out)
43
self.assertStartsWith(err, 'bzr: ERROR: no changes to commit.'
38
self.assertContainsRe(err, 'bzr: ERROR: no changes to commit\.'
44
39
' use --unchanged to commit anyhow\n')
46
41
def test_commit_success(self):
47
42
"""Successful commit should not leave behind a bzr-commit-* file"""
43
self.make_branch_and_tree('.')
49
44
self.run_bzr('commit --unchanged -m message')
50
45
self.assertEqual('', self.run_bzr('unknowns')[0])
56
51
def test_commit_with_path(self):
57
52
"""Commit tree with path of root specified"""
58
self.run_bzr('init a')
53
a_tree = self.make_branch_and_tree('a')
59
54
self.build_tree(['a/a_file'])
60
self.run_bzr('add a/a_file')
61
56
self.run_bzr(['commit', '-m', 'first commit', 'a'])
63
self.run_bzr('branch a b')
58
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
64
59
self.build_tree_contents([('b/a_file', 'changes in b')])
65
60
self.run_bzr(['commit', '-m', 'first commit in b', 'b'])
67
62
self.build_tree_contents([('a/a_file', 'new contents')])
68
63
self.run_bzr(['commit', '-m', 'change in a', 'a'])
71
self.run_bzr('merge ../a', retcode=1) # will conflict
65
b_tree.merge_from_branch(a_tree.branch)
66
self.assertEqual(len(b_tree.conflicts()), 1)
73
67
self.run_bzr('resolved b/a_file')
74
68
self.run_bzr(['commit', '-m', 'merge into b', 'b'])
77
71
def test_10_verbose_commit(self):
78
72
"""Add one file and examine verbose commit output"""
73
tree = self.make_branch_and_tree('.')
80
74
self.build_tree(['hello.txt'])
81
self.run_bzr("add hello.txt")
82
76
out,err = self.run_bzr('commit -m added')
83
77
self.assertEqual('', out)
84
self.assertEqual('added hello.txt\n'
85
'Committed revision 1.\n',
78
self.assertContainsRe(err, '^Committing revision 1 to ".*"\.\n'
80
'Committed revision 1.\n$',)
88
82
def prepare_simple_history(self):
89
83
"""Prepare and return a working tree with one commit of one file"""
100
94
self.build_tree_contents([('hello.txt', 'new contents')])
101
95
out, err = self.run_bzr('commit -m modified')
102
96
self.assertEqual('', out)
103
self.assertEqual('modified hello.txt\n'
104
'Committed revision 2.\n',
97
self.assertContainsRe(err, '^Committing revision 2 to ".*"\.\n'
98
'modified hello\.txt\n'
99
'Committed revision 2\.\n$')
107
101
def test_verbose_commit_renamed(self):
108
102
# Verbose commit of renamed file should say so
110
104
wt.rename_one('hello.txt', 'gutentag.txt')
111
105
out, err = self.run_bzr('commit -m renamed')
112
106
self.assertEqual('', out)
113
self.assertEqual('renamed hello.txt => gutentag.txt\n'
114
'Committed revision 2.\n',
107
self.assertContainsRe(err, '^Committing revision 2 to ".*"\.\n'
108
'renamed hello\.txt => gutentag\.txt\n'
109
'Committed revision 2\.$\n')
117
111
def test_verbose_commit_moved(self):
118
112
# Verbose commit of file moved to new directory should say so
122
116
wt.rename_one('hello.txt', 'subdir/hello.txt')
123
117
out, err = self.run_bzr('commit -m renamed')
124
118
self.assertEqual('', out)
125
self.assertEqualDiff('added subdir\n'
126
'renamed hello.txt => subdir/hello.txt\n'
127
'Committed revision 2.\n',
119
self.assertContainsRe(err, '^Committing revision 2 to ".*"\.\n'
121
'renamed hello\.txt => subdir/hello\.txt\n'
122
'Committed revision 2\.\n$')
130
124
def test_verbose_commit_with_unknown(self):
131
125
"""Unknown files should not be listed by default in verbose output"""
135
129
wt.add(['hello.txt'])
136
130
out,err = self.run_bzr('commit -m added')
137
131
self.assertEqual('', out)
138
self.assertEqual('added hello.txt\n'
139
'Committed revision 1.\n',
132
self.assertContainsRe(err, '^Committing revision 1 to ".*"\.\n'
134
'Committed revision 1\.\n$')
142
136
def test_verbose_commit_with_unchanged(self):
143
137
"""Unchanged files should not be listed by default in verbose output"""
138
tree = self.make_branch_and_tree('.')
145
139
self.build_tree(['hello.txt', 'unchanged.txt'])
146
self.run_bzr('add unchanged.txt')
140
tree.add('unchanged.txt')
147
141
self.run_bzr('commit -m unchanged unchanged.txt')
148
self.run_bzr("add hello.txt")
142
tree.add("hello.txt")
149
143
out,err = self.run_bzr('commit -m added')
150
144
self.assertEqual('', out)
151
self.assertEqual('added hello.txt\n'
152
'Committed revision 2.\n',
145
self.assertContainsRe(err, '^Committing revision 2 to ".*"\.\n'
147
'Committed revision 2\.$\n')
149
def test_verbose_commit_includes_master_location(self):
150
"""Location of master is displayed when committing to bound branch"""
151
a_tree = self.make_branch_and_tree('a')
152
self.build_tree(['a/b'])
154
a_tree.commit(message='Initial message')
156
b_tree = a_tree.branch.create_checkout('b')
157
expected = "%s/" % (os.path.abspath('a'), )
158
out, err = self.run_bzr('commit -m blah --unchanged', working_dir='b')
159
self.assertEqual(err, 'Committing revision 2 to "%s".\n'
160
'Committed revision 2.\n' % expected)
155
162
def test_commit_merge_reports_all_modified_files(self):
156
163
# the commit command should show all the files that are shown by
189
196
other_tree.rename_one('dirtorename', 'renameddir')
190
197
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
191
198
other_tree.rename_one('filetorename', 'renamedfile')
192
other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
199
other_tree.rename_one('filetoreparent',
200
'renameddir/reparentedfile')
193
201
other_tree.remove(['dirtoremove', 'filetoremove'])
194
202
self.build_tree_contents([
196
204
('other/filetomodify', 'new content'),
197
205
('other/newfile', 'new file content')])
198
206
other_tree.add('newfile')
203
211
this_tree.merge_from_branch(other_tree.branch)
205
213
out,err = self.run_bzr('commit -m added')
207
214
self.assertEqual('', out)
215
expected = '%s/' % (os.getcwd(), )
208
216
self.assertEqualDiff(
217
'Committing revision 2 to "%s".\n'
209
218
'modified filetomodify\n'
211
220
'added newfile\n'
215
224
'renamed filetorename => renamedfile\n'
216
225
'deleted dirtoremove\n'
217
226
'deleted filetoremove\n'
218
'Committed revision 2.\n',
227
'Committed revision 2.\n' % (expected, ),
221
230
def test_empty_commit_message(self):
223
file('foo.c', 'wt').write('int main() {}')
224
self.run_bzr('add foo.c')
231
tree = self.make_branch_and_tree('.')
232
self.build_tree_contents([('foo.c', 'int main() {}')])
225
234
self.run_bzr('commit -m ""', retcode=3)
227
236
def test_unsupported_encoding_commit_message(self):
236
245
def test_other_branch_commit(self):
237
246
# this branch is to ensure consistent behaviour, whether we're run
238
247
# 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')
248
outer_tree = self.make_branch_and_tree('.')
249
inner_tree = self.make_branch_and_tree('branch')
250
self.build_tree_contents([
251
('branch/foo.c', 'int main() {}'),
252
('branch/bar.c', 'int main() {}')])
253
inner_tree.add('foo.c')
254
inner_tree.add('bar.c')
250
255
# can't commit files in different trees; sane error
251
256
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
252
257
self.run_bzr('commit -m newstuff branch/foo.c')
256
261
def test_out_of_date_tree_commit(self):
257
262
# check we get an error code and a clear message committing with an out
258
263
# of date checkout
259
self.make_branch_and_tree('branch')
264
tree = self.make_branch_and_tree('branch')
260
265
# make a checkout
261
self.run_bzr('checkout --lightweight branch checkout')
266
checkout = tree.branch.create_checkout('checkout', lightweight=True)
262
267
# commit to the original branch to make the checkout out of date
263
self.run_bzr('commit --unchanged -m message branch')
268
tree.commit('message branch', allow_pointless=True)
264
269
# now commit to the checkout should emit
265
270
# ERROR: Out of date with the branch, 'bzr update' is suggested
266
271
output = self.run_bzr('commit --unchanged -m checkout_message '
267
272
'checkout', retcode=3)
268
273
self.assertEqual(output,
270
"bzr: ERROR: Working tree is out of date, please run "
275
"bzr: ERROR: Working tree is out of date, please "
276
"run 'bzr update'.\n"))
273
278
def test_local_commit_unbound(self):
274
279
# a --local commit on an unbound branch is an error
284
289
# past. This is a user story reported to fail in bug #43959 where
285
290
# a merge done in a checkout (using the update command) failed to
286
291
# commit correctly.
287
self.run_bzr('init trunk')
292
trunk = self.make_branch_and_tree('trunk')
289
self.run_bzr('checkout trunk u1')
294
u1 = trunk.branch.create_checkout('u1')
290
295
self.build_tree_contents([('u1/hosts', 'initial contents')])
291
self.run_bzr('add u1/hosts')
292
297
self.run_bzr('commit -m add-hosts u1')
294
self.run_bzr('checkout trunk u2')
299
u2 = trunk.branch.create_checkout('u2')
295
300
self.build_tree_contents([('u2/hosts', 'altered in u2')])
296
301
self.run_bzr('commit -m checkin-from-u2 u2')
376
381
output, err = self.run_bzr(
377
382
'commit -m hello --fixes=lp:23452 tree/hello.txt')
378
383
self.assertEqual('', output)
379
self.assertEqual('added hello.txt\nCommitted revision 1.\n', err)
384
self.assertContainsRe(err, 'Committing revision 1 to ".*"\.\n'
386
'Committed revision 1\.\n')
381
388
def test_no_bugs_no_properties(self):
382
389
"""If no bugs are fixed, the bugs property is not set.
added
removed
bzrlib/tests/blackbox/test_commit.py
