1
# Copyright (C) 2005, 2006 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."""
27
from bzrlib.branch import Branch
28
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):
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.run_bzr('unknowns')[0])
52
# same for unicode messages
53
self.run_bzr(["commit", "--unchanged", "-m", u'foo\xb5'])
54
self.assertEqual('', self.run_bzr('unknowns')[0])
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.run_bzr("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.run_bzr('add unchanged.txt')
147
self.run_bzr('commit -m unchanged unchanged.txt')
148
self.run_bzr("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',
221
def test_empty_commit_message(self):
223
file('foo.c', 'wt').write('int main() {}')
224
self.run_bzr('add foo.c')
225
self.run_bzr('commit -m ""', retcode=3)
227
def test_unsupported_encoding_commit_message(self):
228
tree = self.make_branch_and_tree('.')
229
self.build_tree_contents([('foo.c', 'int main() {}')])
231
out,err = self.run_bzr_subprocess('commit -m "\xff"', retcode=1,
232
env_changes={'LANG': 'C'})
233
self.assertContainsRe(err, r'bzrlib.errors.BzrError: Parameter.*is '
234
'unsupported by the current encoding.')
236
def test_other_branch_commit(self):
237
# this branch is to ensure consistent behaviour, whether we're run
238
# 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')
250
# can't commit files in different trees; sane error
251
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
252
self.run_bzr('commit -m newstuff branch/foo.c')
253
self.run_bzr('commit -m newstuff branch')
254
self.run_bzr('commit -m newstuff branch', retcode=3)
256
def test_out_of_date_tree_commit(self):
257
# check we get an error code and a clear message committing with an out
259
self.make_branch_and_tree('branch')
261
self.run_bzr('checkout --lightweight branch checkout')
262
# commit to the original branch to make the checkout out of date
263
self.run_bzr('commit --unchanged -m message branch')
264
# now commit to the checkout should emit
265
# ERROR: Out of date with the branch, 'bzr update' is suggested
266
output = self.run_bzr('commit --unchanged -m checkout_message '
267
'checkout', retcode=3)
268
self.assertEqual(output,
270
"bzr: ERROR: Working tree is out of date, please run "
273
def test_local_commit_unbound(self):
274
# a --local commit on an unbound branch is an error
275
self.make_branch_and_tree('.')
276
out, err = self.run_bzr('commit --local', retcode=3)
277
self.assertEqualDiff('', out)
278
self.assertEqualDiff('bzr: ERROR: Cannot perform local-only commits '
279
'on unbound branches.\n', err)
281
def test_commit_a_text_merge_in_a_checkout(self):
282
# checkouts perform multiple actions in a transaction across bond
283
# 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
285
# a merge done in a checkout (using the update command) failed to
287
self.run_bzr('init trunk')
289
self.run_bzr('checkout trunk u1')
290
self.build_tree_contents([('u1/hosts', 'initial contents')])
291
self.run_bzr('add u1/hosts')
292
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')])
296
self.run_bzr('commit -m checkin-from-u2 u2')
298
# make an offline commits
299
self.build_tree_contents([('u1/hosts', 'first offline change in u1')])
300
self.run_bzr('commit -m checkin-offline --local u1')
302
# now try to pull in online work from u2, and then commit our offline
304
# retcode 1 as we expect a text conflict
305
self.run_bzr('update u1', retcode=1)
306
self.run_bzr('resolved u1/hosts')
307
# add a text change here to represent resolving the merge conflicts in
308
# favour of a new version of the file not identical to either the u1
309
# version or the u2 version.
310
self.build_tree_contents([('u1/hosts', 'merge resolution\n')])
311
self.run_bzr('commit -m checkin-merge-of-the-offline-work-from-u1 u1')
313
def test_commit_respects_spec_for_removals(self):
314
"""Commit with a file spec should only commit removals that match"""
315
t = self.make_branch_and_tree('.')
316
self.build_tree(['file-a', 'dir-a/', 'dir-a/file-b'])
317
t.add(['file-a', 'dir-a', 'dir-a/file-b'])
319
t.remove(['file-a', 'dir-a/file-b'])
321
result = self.run_bzr('commit . -m removed-file-b')[1]
322
self.assertNotContainsRe(result, 'file-a')
323
result = self.run_bzr('status')[0]
324
self.assertContainsRe(result, 'removed:\n file-a')
326
def test_strict_commit(self):
327
"""Commit with --strict works if everything is known"""
328
ignores._set_user_ignores([])
329
tree = self.make_branch_and_tree('tree')
330
self.build_tree(['tree/a'])
332
# A simple change should just work
333
self.run_bzr('commit --strict -m adding-a',
336
def test_strict_commit_no_changes(self):
337
"""commit --strict gives "no changes" if there is nothing to commit"""
338
tree = self.make_branch_and_tree('tree')
339
self.build_tree(['tree/a'])
341
tree.commit('adding a')
343
# With no changes, it should just be 'no changes'
344
# Make sure that commit is failing because there is nothing to do
345
self.run_bzr_error(['no changes to commit'],
346
'commit --strict -m no-changes',
349
# But --strict doesn't care if you supply --unchanged
350
self.run_bzr('commit --strict --unchanged -m no-changes',
353
def test_strict_commit_unknown(self):
354
"""commit --strict fails if a file is unknown"""
355
tree = self.make_branch_and_tree('tree')
356
self.build_tree(['tree/a'])
358
tree.commit('adding a')
360
# Add one file so there is a change, but forget the other
361
self.build_tree(['tree/b', 'tree/c'])
363
self.run_bzr_error(['Commit refused because there are unknown files'],
364
'commit --strict -m add-b',
367
# --no-strict overrides --strict
368
self.run_bzr('commit --strict -m add-b --no-strict',
371
def test_fixes_bug_output(self):
372
"""commit --fixes=lp:23452 succeeds without output."""
373
tree = self.make_branch_and_tree('tree')
374
self.build_tree(['tree/hello.txt'])
375
tree.add('hello.txt')
376
output, err = self.run_bzr(
377
'commit -m hello --fixes=lp:23452 tree/hello.txt')
378
self.assertEqual('', output)
379
self.assertEqual('added hello.txt\nCommitted revision 1.\n', err)
381
def test_no_bugs_no_properties(self):
382
"""If no bugs are fixed, the bugs property is not set.
384
see https://beta.launchpad.net/bzr/+bug/109613
386
tree = self.make_branch_and_tree('tree')
387
self.build_tree(['tree/hello.txt'])
388
tree.add('hello.txt')
389
self.run_bzr( 'commit -m hello tree/hello.txt')
390
# Get the revision properties, ignoring the branch-nick property, which
391
# we don't care about for this test.
392
last_rev = tree.branch.repository.get_revision(tree.last_revision())
393
properties = dict(last_rev.properties)
394
del properties['branch-nick']
395
self.assertFalse('bugs' in properties)
397
def test_fixes_bug_sets_property(self):
398
"""commit --fixes=lp:234 sets the lp:234 revprop to 'fixed'."""
399
tree = self.make_branch_and_tree('tree')
400
self.build_tree(['tree/hello.txt'])
401
tree.add('hello.txt')
402
self.run_bzr('commit -m hello --fixes=lp:234 tree/hello.txt')
404
# Get the revision properties, ignoring the branch-nick property, which
405
# we don't care about for this test.
406
last_rev = tree.branch.repository.get_revision(tree.last_revision())
407
properties = dict(last_rev.properties)
408
del properties['branch-nick']
410
self.assertEqual({'bugs': 'https://launchpad.net/bugs/234 fixed'},
413
def test_fixes_multiple_bugs_sets_properties(self):
414
"""--fixes can be used more than once to show that bugs are fixed."""
415
tree = self.make_branch_and_tree('tree')
416
self.build_tree(['tree/hello.txt'])
417
tree.add('hello.txt')
418
self.run_bzr('commit -m hello --fixes=lp:123 --fixes=lp:235'
421
# Get the revision properties, ignoring the branch-nick property, which
422
# we don't care about for this test.
423
last_rev = tree.branch.repository.get_revision(tree.last_revision())
424
properties = dict(last_rev.properties)
425
del properties['branch-nick']
428
{'bugs': 'https://launchpad.net/bugs/123 fixed\n'
429
'https://launchpad.net/bugs/235 fixed'},
432
def test_fixes_bug_with_alternate_trackers(self):
433
"""--fixes can be used on a properly configured branch to mark bug
434
fixes on multiple trackers.
436
tree = self.make_branch_and_tree('tree')
437
tree.branch.get_config().set_user_option(
438
'trac_twisted_url', 'http://twistedmatrix.com/trac')
439
self.build_tree(['tree/hello.txt'])
440
tree.add('hello.txt')
441
self.run_bzr('commit -m hello --fixes=lp:123 --fixes=twisted:235 tree/')
443
# Get the revision properties, ignoring the branch-nick property, which
444
# we don't care about for this test.
445
last_rev = tree.branch.repository.get_revision(tree.last_revision())
446
properties = dict(last_rev.properties)
447
del properties['branch-nick']
450
{'bugs': 'https://launchpad.net/bugs/123 fixed\n'
451
'http://twistedmatrix.com/trac/ticket/235 fixed'},
454
def test_fixes_unknown_bug_prefix(self):
455
tree = self.make_branch_and_tree('tree')
456
self.build_tree(['tree/hello.txt'])
457
tree.add('hello.txt')
459
["Unrecognized bug %s. Commit refused." % 'xxx:123'],
460
'commit -m add-b --fixes=xxx:123',
463
def test_fixes_invalid_bug_number(self):
464
tree = self.make_branch_and_tree('tree')
465
self.build_tree(['tree/hello.txt'])
466
tree.add('hello.txt')
468
["Invalid bug identifier for %s. Commit refused." % 'lp:orange'],
469
'commit -m add-b --fixes=lp:orange',
472
def test_fixes_invalid_argument(self):
473
"""Raise an appropriate error when the fixes argument isn't tag:id."""
474
tree = self.make_branch_and_tree('tree')
475
self.build_tree(['tree/hello.txt'])
476
tree.add('hello.txt')
478
[r"Invalid bug orange. Must be in the form of 'tag:id'\. "
479
r"Commit refused\."],
480
'commit -m add-b --fixes=orange',
483
def test_no_author(self):
484
"""If the author is not specified, the author property is not set."""
485
tree = self.make_branch_and_tree('tree')
486
self.build_tree(['tree/hello.txt'])
487
tree.add('hello.txt')
488
self.run_bzr( 'commit -m hello tree/hello.txt')
489
last_rev = tree.branch.repository.get_revision(tree.last_revision())
490
properties = last_rev.properties
491
self.assertFalse('author' in properties)
493
def test_author_sets_property(self):
494
"""commit --author='John Doe <jdoe@example.com>' sets the author
497
tree = self.make_branch_and_tree('tree')
498
self.build_tree(['tree/hello.txt'])
499
tree.add('hello.txt')
500
self.run_bzr("commit -m hello --author='John Doe <jdoe@example.com>' "
502
last_rev = tree.branch.repository.get_revision(tree.last_revision())
503
properties = last_rev.properties
504
self.assertEqual('John Doe <jdoe@example.com>', properties['author'])
506
def test_author_no_email(self):
507
"""Author's name without an email address is allowed, too."""
508
tree = self.make_branch_and_tree('tree')
509
self.build_tree(['tree/hello.txt'])
510
tree.add('hello.txt')
511
out, err = self.run_bzr("commit -m hello --author='John Doe' "
513
last_rev = tree.branch.repository.get_revision(tree.last_revision())
514
properties = last_rev.properties
515
self.assertEqual('John Doe', properties['author'])
added
removed
bzrlib/tests/blackbox/test_commit.py
