34
34
class TestCommit(ExternalBase):
36
def test_05_empty_commit(self):
37
"""Commit of tree with no versioned files should fail"""
38
# If forced, it should succeed, but this is not tested here.
40
self.build_tree(['hello.txt'])
41
out,err = self.run_bzr("commit", "-m", "empty", retcode=3)
42
self.assertEqual('', out)
43
self.assertStartsWith(err, 'bzr: ERROR: no changes to commit.'
44
' use --unchanged to commit anyhow\n')
46
def test_commit_success(self):
47
"""Successful commit should not leave behind a bzr-commit-* file"""
49
self.run_bzr("commit", "--unchanged", "-m", "message")
50
self.assertEqual('', self.capture('unknowns'))
52
# same for unicode messages
53
self.run_bzr("commit", "--unchanged", "-m", u'foo\xb5')
54
self.assertEqual('', self.capture('unknowns'))
56
def test_commit_with_path(self):
57
"""Commit tree with path of root specified"""
58
self.run_bzr('init', 'a')
59
self.build_tree(['a/a_file'])
60
self.run_bzr('add', 'a/a_file')
61
self.run_bzr('commit', '-m', 'first commit', 'a')
63
self.run_bzr('branch', 'a', 'b')
64
self.build_tree_contents([('b/a_file', 'changes in b')])
65
self.run_bzr('commit', '-m', 'first commit in b', 'b')
67
self.build_tree_contents([('a/a_file', 'new contents')])
68
self.run_bzr('commit', '-m', 'change in a', 'a')
71
self.run_bzr('merge', '../a', retcode=1) # will conflict
73
self.run_bzr('resolved', 'b/a_file')
74
self.run_bzr('commit', '-m', 'merge into b', 'b')
77
def test_10_verbose_commit(self):
78
"""Add one file and examine verbose commit output"""
80
self.build_tree(['hello.txt'])
81
self.runbzr("add hello.txt")
82
out,err = self.run_bzr("commit", "-m", "added")
83
self.assertEqual('', out)
84
self.assertEqual('added hello.txt\n'
85
'Committed revision 1.\n',
88
def prepare_simple_history(self):
89
"""Prepare and return a working tree with one commit of one file"""
90
# Commit with modified file should say so
91
wt = BzrDir.create_standalone_workingtree('.')
92
self.build_tree(['hello.txt', 'extra.txt'])
94
wt.commit(message='added')
97
def test_verbose_commit_modified(self):
98
# Verbose commit of modified file should say so
99
wt = self.prepare_simple_history()
100
self.build_tree_contents([('hello.txt', 'new contents')])
101
out, err = self.run_bzr("commit", "-m", "modified")
102
self.assertEqual('', out)
103
self.assertEqual('modified hello.txt\n'
104
'Committed revision 2.\n',
107
def test_verbose_commit_renamed(self):
108
# Verbose commit of renamed file should say so
109
wt = self.prepare_simple_history()
110
wt.rename_one('hello.txt', 'gutentag.txt')
111
out, err = self.run_bzr("commit", "-m", "renamed")
112
self.assertEqual('', out)
113
self.assertEqual('renamed hello.txt => gutentag.txt\n'
114
'Committed revision 2.\n',
117
def test_verbose_commit_moved(self):
118
# Verbose commit of file moved to new directory should say so
119
wt = self.prepare_simple_history()
122
wt.rename_one('hello.txt', 'subdir/hello.txt')
123
out, err = self.run_bzr("commit", "-m", "renamed")
124
self.assertEqual('', out)
125
self.assertEqualDiff('added subdir\n'
126
'renamed hello.txt => subdir/hello.txt\n'
127
'Committed revision 2.\n',
130
def test_verbose_commit_with_unknown(self):
131
"""Unknown files should not be listed by default in verbose output"""
132
# Is that really the best policy?
133
wt = BzrDir.create_standalone_workingtree('.')
134
self.build_tree(['hello.txt', 'extra.txt'])
135
wt.add(['hello.txt'])
136
out,err = self.run_bzr("commit", "-m", "added")
137
self.assertEqual('', out)
138
self.assertEqual('added hello.txt\n'
139
'Committed revision 1.\n',
142
def test_verbose_commit_with_unchanged(self):
143
"""Unchanged files should not be listed by default in verbose output"""
145
self.build_tree(['hello.txt', 'unchanged.txt'])
146
self.runbzr('add unchanged.txt')
147
self.runbzr('commit -m unchanged unchanged.txt')
148
self.runbzr("add hello.txt")
149
out,err = self.run_bzr("commit", "-m", "added")
150
self.assertEqual('', out)
151
self.assertEqual('added hello.txt\n'
152
'Committed revision 2.\n',
155
def test_commit_merge_reports_all_modified_files(self):
156
# the commit command should show all the files that are shown by
157
# bzr diff or bzr status when committing, even when they were not
158
# changed by the user but rather through doing a merge.
159
this_tree = self.make_branch_and_tree('this')
160
# we need a bunch of files and dirs, to perform one action on each.
163
'this/dirtoreparent/',
166
'this/filetoreparent',
183
this_tree.commit('create_files')
184
other_dir = this_tree.bzrdir.sprout('other')
185
other_tree = other_dir.open_workingtree()
186
other_tree.lock_write()
187
# perform the needed actions on the files and dirs.
189
other_tree.rename_one('dirtorename', 'renameddir')
190
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
191
other_tree.rename_one('filetorename', 'renamedfile')
192
other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
193
other_tree.remove(['dirtoremove', 'filetoremove'])
194
self.build_tree_contents([
196
('other/filetomodify', 'new content'),
197
('other/newfile', 'new file content')])
198
other_tree.add('newfile')
199
other_tree.add('newdir/')
200
other_tree.commit('modify all sample files and dirs.')
203
this_tree.merge_from_branch(other_tree.branch)
205
out,err = self.run_bzr("commit", "-m", "added")
207
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',
36
def test_empty_commit(self):
38
self.build_tree(['hello.txt'])
39
self.runbzr("commit -m empty", retcode=3)
40
self.runbzr("add hello.txt")
41
self.runbzr("commit -m added")
221
43
def test_empty_commit_message(self):
222
44
self.runbzr("init")
223
45
file('foo.c', 'wt').write('int main() {}')
224
46
self.runbzr(['add', 'foo.c'])
225
self.runbzr(["commit", "-m", ""] , retcode=3)
47
self.runbzr(["commit", "-m", ""] , retcode=3)
227
49
def test_other_branch_commit(self):
228
50
# this branch is to ensure consistent behaviour, whether we're run
261
83
"bzr: ERROR: Working tree is out of date, please run "
262
84
"'bzr update'.\n"))
264
def test_local_commit_unbound(self):
265
# a --local commit on an unbound branch is an error
266
self.make_branch_and_tree('.')
267
out, err = self.run_bzr('commit', '--local', retcode=3)
268
self.assertEqualDiff('', out)
269
self.assertEqualDiff('bzr: ERROR: Cannot perform local-only commits '
270
'on unbound branches.\n', err)
272
def test_commit_a_text_merge_in_a_checkout(self):
273
# checkouts perform multiple actions in a transaction across bond
274
# branches and their master, and have been observed to fail in the
275
# past. This is a user story reported to fail in bug #43959 where
276
# a merge done in a checkout (using the update command) failed to
278
self.run_bzr('init', 'trunk')
280
self.run_bzr('checkout', 'trunk', 'u1')
281
self.build_tree_contents([('u1/hosts', 'initial contents')])
282
self.run_bzr('add', 'u1/hosts')
283
self.run_bzr('commit', '-m', 'add hosts', 'u1')
285
self.run_bzr('checkout', 'trunk', 'u2')
286
self.build_tree_contents([('u2/hosts', 'altered in u2')])
287
self.run_bzr('commit', '-m', 'checkin from u2', 'u2')
289
# make an offline commits
290
self.build_tree_contents([('u1/hosts', 'first offline change in u1')])
291
self.run_bzr('commit', '-m', 'checkin offline', '--local', 'u1')
293
# now try to pull in online work from u2, and then commit our offline
295
# retcode 1 as we expect a text conflict
296
self.run_bzr('update', 'u1', retcode=1)
297
self.run_bzr('resolved', 'u1/hosts')
298
# add a text change here to represent resolving the merge conflicts in
299
# favour of a new version of the file not identical to either the u1
300
# version or the u2 version.
301
self.build_tree_contents([('u1/hosts', 'merge resolution\n')])
302
self.run_bzr('commit', '-m', 'checkin merge of the offline work from u1', 'u1')
304
def test_commit_respects_spec_for_removals(self):
305
"""Commit with a file spec should only commit removals that match"""
306
t = self.make_branch_and_tree('.')
307
self.build_tree(['file-a', 'dir-a/', 'dir-a/file-b'])
308
t.add(['file-a', 'dir-a', 'dir-a/file-b'])
310
t.remove(['file-a', 'dir-a/file-b'])
312
result = self.run_bzr('commit', '.', '-m' 'removed file-b')[1]
313
self.assertNotContainsRe(result, 'file-a')
314
result = self.run_bzr('status')[0]
315
self.assertContainsRe(result, 'removed:\n file-a')
317
def test_strict_commit(self):
318
"""Commit with --strict works if everything is known"""
319
ignores._set_user_ignores([])
320
tree = self.make_branch_and_tree('tree')
321
self.build_tree(['tree/a'])
323
# A simple change should just work
324
self.run_bzr('commit', '--strict', '-m', 'adding a',
327
def test_strict_commit_no_changes(self):
328
"""commit --strict gives "no changes" if there is nothing to commit"""
329
tree = self.make_branch_and_tree('tree')
330
self.build_tree(['tree/a'])
332
tree.commit('adding a')
334
# With no changes, it should just be 'no changes'
335
# Make sure that commit is failing because there is nothing to do
336
self.run_bzr_error(['no changes to commit'],
337
'commit', '--strict', '-m', 'no changes',
340
# But --strict doesn't care if you supply --unchanged
341
self.run_bzr('commit', '--strict', '--unchanged', '-m', 'no changes',
344
def test_strict_commit_unknown(self):
345
"""commit --strict fails if a file is unknown"""
346
tree = self.make_branch_and_tree('tree')
347
self.build_tree(['tree/a'])
349
tree.commit('adding a')
351
# Add one file so there is a change, but forget the other
352
self.build_tree(['tree/b', 'tree/c'])
354
self.run_bzr_error(['Commit refused because there are unknown files'],
355
'commit', '--strict', '-m', 'add b',
358
# --no-strict overrides --strict
359
self.run_bzr('commit', '--strict', '-m', 'add b', '--no-strict',
added
removed
bzrlib/tests/blackbox/test_commit.py
