1
# Copyright (C) 2005, 2006 by Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
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
18
"""Tests for the commit CLI of bzr."""
24
from bzrlib.branch import Branch
25
from bzrlib.bzrdir import BzrDir
26
from bzrlib.errors import BzrCommandError
27
from bzrlib.tests.blackbox import ExternalBase
28
from bzrlib.workingtree import WorkingTree
31
class TestCommit(ExternalBase):
33
def test_05_empty_commit(self):
34
"""Commit of tree with no versioned files should fail"""
35
# If forced, it should succeed, but this is not tested here.
37
self.build_tree(['hello.txt'])
38
self.runbzr("commit -m empty", retcode=3)
40
def test_commit_with_path(self):
41
"""Commit tree with path of root specified"""
42
self.run_bzr('init', 'a')
43
self.build_tree(['a/a_file'])
44
self.run_bzr('add', 'a/a_file')
45
self.run_bzr('commit', '-m', 'first commit', 'a')
47
self.run_bzr('branch', 'a', 'b')
48
self.build_tree_contents([('b/a_file', 'changes in b')])
49
self.run_bzr('commit', '-m', 'first commit in b', 'b')
51
self.build_tree_contents([('a/a_file', 'new contents')])
52
self.run_bzr('commit', '-m', 'change in a', 'a')
55
self.run_bzr('merge', '../a', retcode=1) # will conflict
57
self.run_bzr('resolved', 'b/a_file')
58
self.run_bzr('commit', '-m', 'merge into b', 'b')
61
def test_10_verbose_commit(self):
62
"""Add one file and examine verbose commit output"""
64
self.build_tree(['hello.txt'])
65
self.runbzr("add hello.txt")
66
out,err = self.run_bzr("commit", "-m", "added")
67
self.assertEqual('', out)
68
self.assertEqual('added hello.txt\n'
69
'Committed revision 1.\n',
72
def prepare_simple_history(self):
73
"""Prepare and return a working tree with one commit of one file"""
74
# Commit with modified file should say so
75
wt = BzrDir.create_standalone_workingtree('.')
76
self.build_tree(['hello.txt', 'extra.txt'])
78
wt.commit(message='added')
81
def test_verbose_commit_modified(self):
82
# Verbose commit of modified file should say so
83
wt = self.prepare_simple_history()
84
self.build_tree_contents([('hello.txt', 'new contents')])
85
out, err = self.run_bzr("commit", "-m", "modified")
86
self.assertEqual('', out)
87
self.assertEqual('modified hello.txt\n'
88
'Committed revision 2.\n',
91
def test_verbose_commit_renamed(self):
92
# Verbose commit of renamed file should say so
93
wt = self.prepare_simple_history()
94
wt.rename_one('hello.txt', 'gutentag.txt')
95
out, err = self.run_bzr("commit", "-m", "renamed")
96
self.assertEqual('', out)
97
self.assertEqual('renamed hello.txt => gutentag.txt\n'
98
'Committed revision 2.\n',
101
def test_verbose_commit_moved(self):
102
# Verbose commit of file moved to new directory should say so
103
wt = self.prepare_simple_history()
106
wt.rename_one('hello.txt', 'subdir/hello.txt')
107
out, err = self.run_bzr("commit", "-m", "renamed")
108
self.assertEqual('', out)
109
self.assertEqualDiff('added subdir\n'
110
'renamed hello.txt => subdir/hello.txt\n'
111
'Committed revision 2.\n',
114
def test_verbose_commit_with_unknown(self):
115
"""Unknown files should not be listed by default in verbose output"""
116
# Is that really the best policy?
117
wt = BzrDir.create_standalone_workingtree('.')
118
self.build_tree(['hello.txt', 'extra.txt'])
119
wt.add(['hello.txt'])
120
out,err = self.run_bzr("commit", "-m", "added")
121
self.assertEqual('', out)
122
self.assertEqual('added hello.txt\n'
123
'Committed revision 1.\n',
126
def test_verbose_commit_with_unchanged(self):
127
"""Unchanged files should not be listed by default in verbose output"""
129
self.build_tree(['hello.txt', 'unchanged.txt'])
130
self.runbzr('add unchanged.txt')
131
self.runbzr('commit -m unchanged unchanged.txt')
132
self.runbzr("add hello.txt")
133
out,err = self.run_bzr("commit", "-m", "added")
134
self.assertEqual('', out)
135
self.assertEqual('added hello.txt\n'
136
'Committed revision 2.\n',
139
def test_commit_merge_reports_all_modified_files(self):
140
# the commit command should show all the files that are shown by
141
# bzr diff or bzr status when committing, even when they were not
142
# changed by the user but rather through doing a merge.
143
this_tree = self.make_branch_and_tree('this')
144
# we need a bunch of files and dirs, to perform one action on each.
147
'this/dirtoreparent/',
150
'this/filetoreparent',
167
this_tree.commit('create_files')
168
other_dir = this_tree.bzrdir.sprout('other')
169
other_tree = other_dir.open_workingtree()
170
other_tree.lock_write()
171
# perform the needed actions on the files and dirs.
173
other_tree.rename_one('dirtorename', 'renameddir')
174
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
175
other_tree.rename_one('filetorename', 'renamedfile')
176
other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
177
other_tree.remove(['dirtoremove', 'filetoremove'])
178
self.build_tree_contents([
180
('other/filetomodify', 'new content'),
181
('other/newfile', 'new file content')])
182
other_tree.add('newfile')
183
other_tree.add('newdir/')
184
other_tree.commit('modify all sample files and dirs.')
187
self.merge(other_tree.branch, this_tree)
189
out,err = self.run_bzr("commit", "-m", "added")
191
self.assertEqual('', out)
192
self.assertEqualDiff(
193
'modified filetomodify\n'
196
'renamed dirtorename => renameddir\n'
197
'renamed dirtoreparent => renameddir/reparenteddir\n'
198
'renamed filetoreparent => renameddir/reparentedfile\n'
199
'renamed filetorename => renamedfile\n'
200
'deleted dirtoremove\n'
201
'deleted filetoremove\n'
202
'Committed revision 2.\n',
205
def test_empty_commit_message(self):
207
file('foo.c', 'wt').write('int main() {}')
208
self.runbzr(['add', 'foo.c'])
209
self.runbzr(["commit", "-m", ""] , retcode=3)
211
def test_other_branch_commit(self):
212
# this branch is to ensure consistent behaviour, whether we're run
213
# inside a branch, or not.
214
os.mkdir('empty_branch')
215
os.chdir('empty_branch')
220
file('foo.c', 'wt').write('int main() {}')
221
file('bar.c', 'wt').write('int main() {}')
223
self.runbzr(['add', 'branch/foo.c'])
224
self.runbzr(['add', 'branch'])
225
# can't commit files in different trees; sane error
226
self.runbzr('commit -m newstuff branch/foo.c .', retcode=3)
227
self.runbzr('commit -m newstuff branch/foo.c')
228
self.runbzr('commit -m newstuff branch')
229
self.runbzr('commit -m newstuff branch', retcode=3)
231
def test_out_of_date_tree_commit(self):
232
# check we get an error code and a clear message committing with an out
234
self.make_branch_and_tree('branch')
236
self.runbzr('checkout --lightweight branch checkout')
237
# commit to the original branch to make the checkout out of date
238
self.runbzr('commit --unchanged -m message branch')
239
# now commit to the checkout should emit
240
# ERROR: Out of date with the branch, 'bzr update' is suggested
241
output = self.runbzr('commit --unchanged -m checkout_message '
242
'checkout', retcode=3)
243
self.assertEqual(output,
245
"bzr: ERROR: Working tree is out of date, please run "
248
def test_local_commit_unbound(self):
249
# a --local commit on an unbound branch is an error
250
self.make_branch_and_tree('.')
251
out, err = self.run_bzr('commit', '--local', retcode=3)
252
self.assertEqualDiff('', out)
253
self.assertEqualDiff('bzr: ERROR: Cannot perform local-only commits '
254
'on unbound branches.\n', err)
256
def test_commit_a_text_merge_in_a_checkout(self):
257
# checkouts perform multiple actions in a transaction across bond
258
# branches and their master, and have been observed to fail in the
259
# past. This is a user story reported to fail in bug #43959 where
260
# a merge done in a checkout (using the update command) failed to
262
self.run_bzr('init', 'trunk')
264
self.run_bzr('checkout', 'trunk', 'u1')
265
self.build_tree_contents([('u1/hosts', 'initial contents')])
266
self.run_bzr('add', 'u1/hosts')
267
self.run_bzr('commit', '-m', 'add hosts', 'u1')
269
self.run_bzr('checkout', 'trunk', 'u2')
270
self.build_tree_contents([('u2/hosts', 'altered in u2')])
271
self.run_bzr('commit', '-m', 'checkin from u2', 'u2')
273
# make an offline commits
274
self.build_tree_contents([('u1/hosts', 'first offline change in u1')])
275
self.run_bzr('commit', '-m', 'checkin offline', '--local', 'u1')
277
# now try to pull in online work from u2, and then commit our offline
279
# retcode 1 as we expect a text conflict
280
self.run_bzr('update', 'u1', retcode=1)
281
self.run_bzr('resolved', 'u1/hosts')
282
# add a text change here to represent resolving the merge conflicts in
283
# favour of a new version of the file not identical to either the u1
284
# version or the u2 version.
285
self.build_tree_contents([('u1/hosts', 'merge resolution\n')])
286
self.run_bzr('commit', '-m', 'checkin merge of the offline work from u1', 'u1')
added
removed
bzrlib/tests/blackbox/test_commit.py
