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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
"""Tests for the commit CLI of bzr."""
25
from testtools.matchers import DocTestMatches
33
from ...controldir import ControlDir
38
from .. import TestCaseWithTransport
39
from ..test_bedding import override_whoami
42
class TestCommit(TestCaseWithTransport):
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):
44
36
def test_05_empty_commit(self):
45
37
"""Commit of tree with no versioned files should fail"""
46
38
# If forced, it should succeed, but this is not tested here.
47
self.make_branch_and_tree('.')
48
40
self.build_tree(['hello.txt'])
49
out, err = self.run_bzr('commit -m empty', retcode=3)
41
out,err = self.run_bzr("commit", "-m", "empty", retcode=3)
50
42
self.assertEqual('', out)
52
# 1) We really don't want 'aborting commit write group' anymore.
53
# 2) brz: ERROR: is a really long line, so we wrap it with '\'
58
brz: ERROR: No changes to commit.\
59
Please 'brz add' the files you want to commit,\
60
or use --unchanged to force an empty commit.
61
""", flags=doctest.ELLIPSIS | doctest.REPORT_UDIFF))
43
self.assertStartsWith(err, 'bzr: ERROR: no changes to commit.'
44
' use --unchanged to commit anyhow\n')
63
46
def test_commit_success(self):
64
47
"""Successful commit should not leave behind a bzr-commit-* file"""
65
self.make_branch_and_tree('.')
66
self.run_bzr('commit --unchanged -m message')
67
self.assertEqual('', self.run_bzr('unknowns')[0])
49
self.run_bzr("commit", "--unchanged", "-m", "message")
50
self.assertEqual('', self.capture('unknowns'))
69
52
# same for unicode messages
70
self.run_bzr(["commit", "--unchanged", "-m", u'foo\xb5'])
71
self.assertEqual('', self.run_bzr('unknowns')[0])
73
def test_commit_lossy_native(self):
74
"""A --lossy option to commit is supported."""
75
self.make_branch_and_tree('.')
76
self.run_bzr('commit --lossy --unchanged -m message')
77
self.assertEqual('', self.run_bzr('unknowns')[0])
79
def test_commit_lossy_foreign(self):
80
test_foreign.register_dummy_foreign_for_test(self)
81
self.make_branch_and_tree('.',
82
format=test_foreign.DummyForeignVcsDirFormat())
83
self.run_bzr('commit --lossy --unchanged -m message')
84
output = self.run_bzr('revision-info')[0]
85
self.assertTrue(output.startswith('1 dummy-'))
53
self.run_bzr("commit", "--unchanged", "-m", u'foo\xb5')
54
self.assertEqual('', self.capture('unknowns'))
87
56
def test_commit_with_path(self):
88
57
"""Commit tree with path of root specified"""
89
a_tree = self.make_branch_and_tree('a')
58
self.run_bzr('init', 'a')
90
59
self.build_tree(['a/a_file'])
92
self.run_bzr(['commit', '-m', 'first commit', 'a'])
94
b_tree = a_tree.controldir.sprout('b').open_workingtree()
95
self.build_tree_contents([('b/a_file', b'changes in b')])
96
self.run_bzr(['commit', '-m', 'first commit in b', 'b'])
98
self.build_tree_contents([('a/a_file', b'new contents')])
99
self.run_bzr(['commit', '-m', 'change in a', 'a'])
101
b_tree.merge_from_branch(a_tree.branch)
102
self.assertEqual(len(b_tree.conflicts()), 1)
103
self.run_bzr('resolved b/a_file')
104
self.run_bzr(['commit', '-m', 'merge into b', 'b'])
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')
106
77
def test_10_verbose_commit(self):
107
78
"""Add one file and examine verbose commit output"""
108
tree = self.make_branch_and_tree('.')
109
80
self.build_tree(['hello.txt'])
110
tree.add("hello.txt")
111
out, err = self.run_bzr('commit -m added')
81
self.runbzr("add hello.txt")
82
out,err = self.run_bzr("commit", "-m", "added")
112
83
self.assertEqual('', out)
113
self.assertContainsRe(err, '^Committing to: .*\n'
115
'Committed revision 1.\n$',)
84
self.assertEqual('added hello.txt\n'
85
'Committed revision 1.\n',
117
88
def prepare_simple_history(self):
118
89
"""Prepare and return a working tree with one commit of one file"""
119
90
# Commit with modified file should say so
120
wt = ControlDir.create_standalone_workingtree('.')
91
wt = BzrDir.create_standalone_workingtree('.')
121
92
self.build_tree(['hello.txt', 'extra.txt'])
122
93
wt.add(['hello.txt'])
123
94
wt.commit(message='added')
126
97
def test_verbose_commit_modified(self):
127
98
# Verbose commit of modified file should say so
128
99
wt = self.prepare_simple_history()
129
self.build_tree_contents([('hello.txt', b'new contents')])
130
out, err = self.run_bzr('commit -m modified')
100
self.build_tree_contents([('hello.txt', 'new contents')])
101
out, err = self.run_bzr("commit", "-m", "modified")
131
102
self.assertEqual('', out)
132
self.assertContainsRe(err, '^Committing to: .*\n'
133
'modified hello\\.txt\n'
134
'Committed revision 2\\.\n$')
136
def test_unicode_commit_message_is_filename(self):
137
"""Unicode commit message same as a filename (Bug #563646).
139
self.requireFeature(features.UnicodeFilenameFeature)
140
file_name = u'\N{euro sign}'
141
self.run_bzr(['init'])
142
with open(file_name, 'w') as f:
143
f.write('hello world')
144
self.run_bzr(['add'])
145
out, err = self.run_bzr(['commit', '-m', file_name])
146
reflags = re.MULTILINE | re.DOTALL | re.UNICODE
147
te = osutils.get_terminal_encoding()
148
self.assertContainsRe(err,
149
u'The commit message is a file name:',
152
# Run same test with a filename that causes encode
153
# error for the terminal encoding. We do this
154
# by forcing terminal encoding of ascii for
155
# osutils.get_terminal_encoding which is used
156
# by ui.text.show_warning
157
default_get_terminal_enc = osutils.get_terminal_encoding
159
osutils.get_terminal_encoding = lambda trace=None: 'ascii'
160
file_name = u'foo\u1234'
161
with open(file_name, 'w') as f:
162
f.write('hello world')
163
self.run_bzr(['add'])
164
out, err = self.run_bzr(['commit', '-m', file_name])
165
reflags = re.MULTILINE | re.DOTALL | re.UNICODE
166
te = osutils.get_terminal_encoding()
167
self.assertContainsRe(err,
168
u'The commit message is a file name:',
171
osutils.get_terminal_encoding = default_get_terminal_enc
173
def test_non_ascii_file_unversioned_utf8(self):
174
self.requireFeature(features.UnicodeFilenameFeature)
175
tree = self.make_branch_and_tree(".")
176
self.build_tree(["f"])
178
out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
179
encoding="utf-8", retcode=3)
180
self.assertContainsRe(err, b"(?m)not versioned: \"\xc2\xa7\"$")
182
def test_non_ascii_file_unversioned_iso_8859_5(self):
183
self.requireFeature(features.UnicodeFilenameFeature)
184
tree = self.make_branch_and_tree(".")
185
self.build_tree(["f"])
187
out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
188
encoding="iso-8859-5", retcode=3)
189
self.assertNotContainsString(err, b"\xc2\xa7")
190
self.assertContainsRe(err, b"(?m)not versioned: \"\xfd\"$")
192
def test_warn_about_forgotten_commit_message(self):
193
"""Test that the lack of -m parameter is caught"""
194
wt = self.make_branch_and_tree('.')
195
self.build_tree(['one', 'two'])
197
out, err = self.run_bzr('commit -m one two')
198
self.assertContainsRe(err, "The commit message is a file name")
103
self.assertEqual('modified hello.txt\n'
104
'Committed revision 2.\n',
200
107
def test_verbose_commit_renamed(self):
201
108
# Verbose commit of renamed file should say so
202
109
wt = self.prepare_simple_history()
203
110
wt.rename_one('hello.txt', 'gutentag.txt')
204
out, err = self.run_bzr('commit -m renamed')
111
out, err = self.run_bzr("commit", "-m", "renamed")
205
112
self.assertEqual('', out)
206
self.assertContainsRe(err, '^Committing to: .*\n'
207
'renamed hello\\.txt => gutentag\\.txt\n'
208
'Committed revision 2\\.$\n')
113
self.assertEqual('renamed hello.txt => gutentag.txt\n'
114
'Committed revision 2.\n',
210
117
def test_verbose_commit_moved(self):
211
118
# Verbose commit of file moved to new directory should say so
213
120
os.mkdir('subdir')
214
121
wt.add(['subdir'])
215
122
wt.rename_one('hello.txt', 'subdir/hello.txt')
216
out, err = self.run_bzr('commit -m renamed')
123
out, err = self.run_bzr("commit", "-m", "renamed")
217
124
self.assertEqual('', out)
219
'Committing to: %s/' % osutils.getcwd(),
221
'renamed hello.txt => subdir/hello.txt',
222
'Committed revision 2.',
224
}, set(err.split('\n')))
125
self.assertEqualDiff('added subdir\n'
126
'renamed hello.txt => subdir/hello.txt\n'
127
'Committed revision 2.\n',
226
130
def test_verbose_commit_with_unknown(self):
227
131
"""Unknown files should not be listed by default in verbose output"""
228
132
# Is that really the best policy?
229
wt = ControlDir.create_standalone_workingtree('.')
133
wt = BzrDir.create_standalone_workingtree('.')
230
134
self.build_tree(['hello.txt', 'extra.txt'])
231
135
wt.add(['hello.txt'])
232
out, err = self.run_bzr('commit -m added')
136
out,err = self.run_bzr("commit", "-m", "added")
233
137
self.assertEqual('', out)
234
self.assertContainsRe(err, '^Committing to: .*\n'
235
'added hello\\.txt\n'
236
'Committed revision 1\\.\n$')
138
self.assertEqual('added hello.txt\n'
139
'Committed revision 1.\n',
238
142
def test_verbose_commit_with_unchanged(self):
239
143
"""Unchanged files should not be listed by default in verbose output"""
240
tree = self.make_branch_and_tree('.')
241
145
self.build_tree(['hello.txt', 'unchanged.txt'])
242
tree.add('unchanged.txt')
243
self.run_bzr('commit -m unchanged unchanged.txt')
244
tree.add("hello.txt")
245
out, err = self.run_bzr('commit -m added')
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")
246
150
self.assertEqual('', out)
247
self.assertContainsRe(err, '^Committing to: .*\n'
248
'added hello\\.txt\n'
249
'Committed revision 2\\.$\n')
251
def test_verbose_commit_includes_master_location(self):
252
"""Location of master is displayed when committing to bound branch"""
253
a_tree = self.make_branch_and_tree('a')
254
self.build_tree(['a/b'])
256
a_tree.commit(message='Initial message')
258
b_tree = a_tree.branch.create_checkout('b')
259
expected = "%s/" % (osutils.abspath('a'), )
260
out, err = self.run_bzr('commit -m blah --unchanged', working_dir='b')
261
self.assertEqual(err, 'Committing to: %s\n'
262
'Committed revision 2.\n' % expected)
264
def test_commit_sanitizes_CR_in_message(self):
265
# See bug #433779, basically Emacs likes to pass '\r\n' style line
266
# endings to 'brz commit -m ""' which breaks because we don't allow
267
# '\r' in commit messages. (Mostly because of issues where XML style
268
# formats arbitrarily strip it out of the data while parsing.)
269
# To make life easier for users, we just always translate '\r\n' =>
270
# '\n'. And '\r' => '\n'.
271
a_tree = self.make_branch_and_tree('a')
272
self.build_tree(['a/b'])
274
self.run_bzr(['commit',
275
'-m', 'a string\r\n\r\nwith mixed\r\rendings\n'],
277
rev_id = a_tree.branch.last_revision()
278
rev = a_tree.branch.repository.get_revision(rev_id)
279
self.assertEqualDiff('a string\n\nwith mixed\n\nendings\n',
151
self.assertEqual('added hello.txt\n'
152
'Committed revision 2.\n',
282
155
def test_commit_merge_reports_all_modified_files(self):
283
156
# the commit command should show all the files that are shown by
284
# brz diff or brz status when committing, even when they were not
157
# bzr diff or bzr status when committing, even when they were not
285
158
# changed by the user but rather through doing a merge.
286
159
this_tree = self.make_branch_and_tree('this')
287
160
# we need a bunch of files and dirs, to perform one action on each.
310
183
this_tree.commit('create_files')
311
other_dir = this_tree.controldir.sprout('other')
184
other_dir = this_tree.bzrdir.sprout('other')
312
185
other_tree = other_dir.open_workingtree()
313
with other_tree.lock_write():
314
# perform the needed actions on the files and dirs.
186
other_tree.lock_write()
187
# perform the needed actions on the files and dirs.
315
189
other_tree.rename_one('dirtorename', 'renameddir')
316
190
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
317
191
other_tree.rename_one('filetorename', 'renamedfile')
318
other_tree.rename_one('filetoreparent',
319
'renameddir/reparentedfile')
192
other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
320
193
other_tree.remove(['dirtoremove', 'filetoremove'])
321
194
self.build_tree_contents([
323
('other/filetomodify', b'new content'),
324
('other/newfile', b'new file content')])
196
('other/filetomodify', 'new content'),
197
('other/newfile', 'new file content')])
325
198
other_tree.add('newfile')
326
199
other_tree.add('newdir/')
327
200
other_tree.commit('modify all sample files and dirs.')
328
203
this_tree.merge_from_branch(other_tree.branch)
329
out, err = self.run_bzr('commit -m added', working_dir='this')
205
out,err = self.run_bzr("commit", "-m", "added")
330
207
self.assertEqual('', out)
332
'Committing to: %s/' % osutils.pathjoin(osutils.getcwd(), 'this'),
333
'modified filetomodify',
336
'renamed dirtorename => renameddir',
337
'renamed filetorename => renamedfile',
338
'renamed dirtoreparent => renameddir/reparenteddir',
339
'renamed filetoreparent => renameddir/reparentedfile',
340
'deleted dirtoremove',
341
'deleted filetoremove',
342
'Committed revision 2.',
344
}, set(err.split('\n')))
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',
346
221
def test_empty_commit_message(self):
347
tree = self.make_branch_and_tree('.')
348
self.build_tree_contents([('foo.c', b'int main() {}')])
350
self.run_bzr('commit -m ""')
223
file('foo.c', 'wt').write('int main() {}')
224
self.runbzr(['add', 'foo.c'])
225
self.runbzr(["commit", "-m", ""] , retcode=3)
352
227
def test_other_branch_commit(self):
353
228
# this branch is to ensure consistent behaviour, whether we're run
354
229
# inside a branch, or not.
355
outer_tree = self.make_branch_and_tree('.')
356
inner_tree = self.make_branch_and_tree('branch')
357
self.build_tree_contents([
358
('branch/foo.c', b'int main() {}'),
359
('branch/bar.c', b'int main() {}')])
360
inner_tree.add(['foo.c', 'bar.c'])
230
os.mkdir('empty_branch')
231
os.chdir('empty_branch')
236
file('foo.c', 'wt').write('int main() {}')
237
file('bar.c', 'wt').write('int main() {}')
239
self.runbzr(['add', 'branch/foo.c'])
240
self.runbzr(['add', 'branch'])
361
241
# can't commit files in different trees; sane error
362
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
363
# can commit to branch - records foo.c only
364
self.run_bzr('commit -m newstuff branch/foo.c')
365
# can commit to branch - records bar.c
366
self.run_bzr('commit -m newstuff branch')
368
self.run_bzr_error(["No changes to commit"],
369
'commit -m newstuff branch')
242
self.runbzr('commit -m newstuff branch/foo.c .', retcode=3)
243
self.runbzr('commit -m newstuff branch/foo.c')
244
self.runbzr('commit -m newstuff branch')
245
self.runbzr('commit -m newstuff branch', retcode=3)
371
247
def test_out_of_date_tree_commit(self):
372
248
# check we get an error code and a clear message committing with an out
373
249
# of date checkout
374
tree = self.make_branch_and_tree('branch')
250
self.make_branch_and_tree('branch')
375
251
# make a checkout
376
checkout = tree.branch.create_checkout('checkout', lightweight=True)
252
self.runbzr('checkout --lightweight branch checkout')
377
253
# commit to the original branch to make the checkout out of date
378
tree.commit('message branch', allow_pointless=True)
254
self.runbzr('commit --unchanged -m message branch')
379
255
# now commit to the checkout should emit
380
# ERROR: Out of date with the branch, 'brz update' is suggested
381
output = self.run_bzr('commit --unchanged -m checkout_message '
382
'checkout', retcode=3)
256
# ERROR: Out of date with the branch, 'bzr update' is suggested
257
output = self.runbzr('commit --unchanged -m checkout_message '
258
'checkout', retcode=3)
383
259
self.assertEqual(output,
385
"brz: ERROR: Working tree is out of date, please "
386
"run 'brz update'.\n"))
261
"bzr: ERROR: Working tree is out of date, please run "
388
264
def test_local_commit_unbound(self):
389
265
# a --local commit on an unbound branch is an error
390
266
self.make_branch_and_tree('.')
391
out, err = self.run_bzr('commit --local', retcode=3)
267
out, err = self.run_bzr('commit', '--local', retcode=3)
392
268
self.assertEqualDiff('', out)
393
self.assertEqualDiff('brz: ERROR: Cannot perform local-only commits '
269
self.assertEqualDiff('bzr: ERROR: Cannot perform local-only commits '
394
270
'on unbound branches.\n', err)
396
272
def test_commit_a_text_merge_in_a_checkout(self):
397
273
# checkouts perform multiple actions in a transaction across bond
398
274
# branches and their master, and have been observed to fail in the
399
# past. This is a user story reported to fail in bug #43959 where
275
# past. This is a user story reported to fail in bug #43959 where
400
276
# a merge done in a checkout (using the update command) failed to
401
277
# commit correctly.
402
trunk = self.make_branch_and_tree('trunk')
404
u1 = trunk.branch.create_checkout('u1')
405
self.build_tree_contents([('u1/hosts', b'initial contents\n')])
407
self.run_bzr('commit -m add-hosts u1')
409
u2 = trunk.branch.create_checkout('u2')
410
self.build_tree_contents([('u2/hosts', b'altered in u2\n')])
411
self.run_bzr('commit -m checkin-from-u2 u2')
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')
413
289
# make an offline commits
414
self.build_tree_contents(
415
[('u1/hosts', b'first offline change in u1\n')])
416
self.run_bzr('commit -m checkin-offline --local u1')
290
self.build_tree_contents([('u1/hosts', 'first offline change in u1')])
291
self.run_bzr('commit', '-m', 'checkin offline', '--local', 'u1')
418
293
# now try to pull in online work from u2, and then commit our offline
419
294
# work as a merge
420
295
# retcode 1 as we expect a text conflict
421
self.run_bzr('update u1', retcode=1)
422
self.assertFileEqual(b'''\
424
first offline change in u1
431
self.run_bzr('resolved u1/hosts')
296
self.run_bzr('update', 'u1', retcode=1)
297
self.run_bzr('resolved', 'u1/hosts')
432
298
# add a text change here to represent resolving the merge conflicts in
433
299
# favour of a new version of the file not identical to either the u1
434
300
# version or the u2 version.
435
self.build_tree_contents([('u1/hosts', b'merge resolution\n')])
436
self.run_bzr('commit -m checkin-merge-of-the-offline-work-from-u1 u1')
438
def test_commit_exclude_excludes_modified_files(self):
439
"""Commit -x foo should ignore changes to foo."""
440
tree = self.make_branch_and_tree('.')
441
self.build_tree(['a', 'b', 'c'])
442
tree.smart_add(['.'])
443
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b'])
444
self.assertFalse('added b' in out)
445
self.assertFalse('added b' in err)
446
# If b was excluded it will still be 'added' in status.
447
out, err = self.run_bzr(['added'])
448
self.assertEqual('b\n', out)
449
self.assertEqual('', err)
451
def test_commit_exclude_twice_uses_both_rules(self):
452
"""Commit -x foo -x bar should ignore changes to foo and bar."""
453
tree = self.make_branch_and_tree('.')
454
self.build_tree(['a', 'b', 'c'])
455
tree.smart_add(['.'])
456
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b', '-x', 'c'])
457
self.assertFalse('added b' in out)
458
self.assertFalse('added c' in out)
459
self.assertFalse('added b' in err)
460
self.assertFalse('added c' in err)
461
# If b was excluded it will still be 'added' in status.
462
out, err = self.run_bzr(['added'])
463
self.assertTrue('b\n' in out)
464
self.assertTrue('c\n' in out)
465
self.assertEqual('', err)
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')
467
304
def test_commit_respects_spec_for_removals(self):
468
305
"""Commit with a file spec should only commit removals that match"""
514
352
self.build_tree(['tree/b', 'tree/c'])
516
354
self.run_bzr_error(['Commit refused because there are unknown files'],
517
'commit --strict -m add-b',
355
'commit', '--strict', '-m', 'add b',
518
356
working_dir='tree')
520
358
# --no-strict overrides --strict
521
self.run_bzr('commit --strict -m add-b --no-strict',
359
self.run_bzr('commit', '--strict', '-m', 'add b', '--no-strict',
522
360
working_dir='tree')
524
def test_fixes_bug_output(self):
525
"""commit --fixes=lp:23452 succeeds without output."""
526
tree = self.make_branch_and_tree('tree')
527
self.build_tree(['tree/hello.txt'])
528
tree.add('hello.txt')
529
output, err = self.run_bzr(
530
'commit -m hello --fixes=lp:23452 tree/hello.txt')
531
self.assertEqual('', output)
532
self.assertContainsRe(err, 'Committing to: .*\n'
533
'added hello\\.txt\n'
534
'Committed revision 1\\.\n')
536
def test_fixes_bug_unicode(self):
537
"""commit --fixes=lp:unicode succeeds without output."""
538
tree = self.make_branch_and_tree('tree')
539
self.build_tree(['tree/hello.txt'])
540
tree.add('hello.txt')
541
output, err = self.run_bzr_raw(
542
['commit', '-m', 'hello',
543
u'--fixes=generic:\u20ac', 'tree/hello.txt'],
544
encoding='utf-8', retcode=3)
545
self.assertEqual(b'', output)
546
self.assertContainsRe(err,
547
b'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
549
def test_no_bugs_no_properties(self):
550
"""If no bugs are fixed, the bugs property is not set.
552
see https://beta.launchpad.net/bzr/+bug/109613
554
tree = self.make_branch_and_tree('tree')
555
self.build_tree(['tree/hello.txt'])
556
tree.add('hello.txt')
557
self.run_bzr('commit -m hello tree/hello.txt')
558
# Get the revision properties, ignoring the branch-nick property, which
559
# we don't care about for this test.
560
last_rev = tree.branch.repository.get_revision(tree.last_revision())
561
properties = dict(last_rev.properties)
562
del properties['branch-nick']
563
self.assertFalse('bugs' in properties)
565
def test_bugs_sets_property(self):
566
"""commit --bugs=lp:234 sets the lp:234 revprop to 'related'."""
567
tree = self.make_branch_and_tree('tree')
568
self.build_tree(['tree/hello.txt'])
569
tree.add('hello.txt')
570
self.run_bzr('commit -m hello --bugs=lp:234 tree/hello.txt')
572
# Get the revision properties, ignoring the branch-nick property, which
573
# we don't care about for this test.
574
last_rev = tree.branch.repository.get_revision(tree.last_revision())
575
properties = dict(last_rev.properties)
576
del properties[u'branch-nick']
578
self.assertEqual({u'bugs': 'https://launchpad.net/bugs/234 related'},
581
def test_fixes_bug_sets_property(self):
582
"""commit --fixes=lp:234 sets the lp:234 revprop to 'fixed'."""
583
tree = self.make_branch_and_tree('tree')
584
self.build_tree(['tree/hello.txt'])
585
tree.add('hello.txt')
586
self.run_bzr('commit -m hello --fixes=lp:234 tree/hello.txt')
588
# Get the revision properties, ignoring the branch-nick property, which
589
# we don't care about for this test.
590
last_rev = tree.branch.repository.get_revision(tree.last_revision())
591
properties = dict(last_rev.properties)
592
del properties[u'branch-nick']
594
self.assertEqual({u'bugs': 'https://launchpad.net/bugs/234 fixed'},
597
def test_fixes_multiple_bugs_sets_properties(self):
598
"""--fixes can be used more than once to show that bugs are fixed."""
599
tree = self.make_branch_and_tree('tree')
600
self.build_tree(['tree/hello.txt'])
601
tree.add('hello.txt')
602
self.run_bzr('commit -m hello --fixes=lp:123 --fixes=lp:235'
605
# Get the revision properties, ignoring the branch-nick property, which
606
# we don't care about for this test.
607
last_rev = tree.branch.repository.get_revision(tree.last_revision())
608
properties = dict(last_rev.properties)
609
del properties['branch-nick']
612
{u'bugs': 'https://launchpad.net/bugs/123 fixed\n'
613
'https://launchpad.net/bugs/235 fixed'},
616
def test_fixes_bug_with_alternate_trackers(self):
617
"""--fixes can be used on a properly configured branch to mark bug
618
fixes on multiple trackers.
620
tree = self.make_branch_and_tree('tree')
621
tree.branch.get_config().set_user_option(
622
'trac_twisted_url', 'http://twistedmatrix.com/trac')
623
self.build_tree(['tree/hello.txt'])
624
tree.add('hello.txt')
626
'commit -m hello --fixes=lp:123 --fixes=twisted:235 tree/')
628
# Get the revision properties, ignoring the branch-nick property, which
629
# we don't care about for this test.
630
last_rev = tree.branch.repository.get_revision(tree.last_revision())
631
properties = dict(last_rev.properties)
632
del properties['branch-nick']
635
{'bugs': 'https://launchpad.net/bugs/123 fixed\n'
636
'http://twistedmatrix.com/trac/ticket/235 fixed'},
639
def test_fixes_unknown_bug_prefix(self):
640
tree = self.make_branch_and_tree('tree')
641
self.build_tree(['tree/hello.txt'])
642
tree.add('hello.txt')
644
["Unrecognized bug %s. Commit refused." % 'xxx:123'],
645
'commit -m add-b --fixes=xxx:123',
648
def test_fixes_bug_with_default_tracker(self):
649
"""commit --fixes=234 uses the default bug tracker."""
650
tree = self.make_branch_and_tree('tree')
651
self.build_tree(['tree/hello.txt'])
652
tree.add('hello.txt')
654
["brz: ERROR: No tracker specified for bug 123. Use the form "
655
"'tracker:id' or specify a default bug tracker using the "
656
"`bugtracker` option.\n"
657
"See \"brz help bugs\" for more information on this feature. "
659
'commit -m add-b --fixes=123',
661
tree.branch.get_config_stack().set("bugtracker", "lp")
662
self.run_bzr('commit -m hello --fixes=234 tree/hello.txt')
663
last_rev = tree.branch.repository.get_revision(tree.last_revision())
664
self.assertEqual('https://launchpad.net/bugs/234 fixed',
665
last_rev.properties['bugs'])
667
def test_fixes_invalid_bug_number(self):
668
tree = self.make_branch_and_tree('tree')
669
self.build_tree(['tree/hello.txt'])
670
tree.add('hello.txt')
672
["Did not understand bug identifier orange: Must be an integer. "
673
"See \"brz help bugs\" for more information on this feature.\n"
675
'commit -m add-b --fixes=lp:orange',
678
def test_fixes_invalid_argument(self):
679
"""Raise an appropriate error when the fixes argument isn't tag:id."""
680
tree = self.make_branch_and_tree('tree')
681
self.build_tree(['tree/hello.txt'])
682
tree.add('hello.txt')
684
[r"Invalid bug orange:apples:bananas. Must be in the form of "
685
r"'tracker:id'\. See \"brz help bugs\" for more information on "
686
r"this feature.\nCommit refused\."],
687
'commit -m add-b --fixes=orange:apples:bananas',
690
def test_no_author(self):
691
"""If the author is not specified, the author property is not set."""
692
tree = self.make_branch_and_tree('tree')
693
self.build_tree(['tree/hello.txt'])
694
tree.add('hello.txt')
695
self.run_bzr('commit -m hello tree/hello.txt')
696
last_rev = tree.branch.repository.get_revision(tree.last_revision())
697
properties = last_rev.properties
698
self.assertFalse('author' in properties)
700
def test_author_sets_property(self):
701
"""commit --author='John Doe <jdoe@example.com>' sets the author
704
tree = self.make_branch_and_tree('tree')
705
self.build_tree(['tree/hello.txt'])
706
tree.add('hello.txt')
707
self.run_bzr(["commit", '-m', 'hello',
708
'--author', u'John D\xf6 <jdoe@example.com>',
710
last_rev = tree.branch.repository.get_revision(tree.last_revision())
711
properties = last_rev.properties
712
self.assertEqual(u'John D\xf6 <jdoe@example.com>',
713
properties['authors'])
715
def test_author_no_email(self):
716
"""Author's name without an email address is allowed, too."""
717
tree = self.make_branch_and_tree('tree')
718
self.build_tree(['tree/hello.txt'])
719
tree.add('hello.txt')
720
out, err = self.run_bzr("commit -m hello --author='John Doe' "
722
last_rev = tree.branch.repository.get_revision(tree.last_revision())
723
properties = last_rev.properties
724
self.assertEqual('John Doe', properties['authors'])
726
def test_multiple_authors(self):
727
"""Multiple authors can be specyfied, and all are stored."""
728
tree = self.make_branch_and_tree('tree')
729
self.build_tree(['tree/hello.txt'])
730
tree.add('hello.txt')
731
out, err = self.run_bzr("commit -m hello --author='John Doe' "
732
"--author='Jane Rey' tree/hello.txt")
733
last_rev = tree.branch.repository.get_revision(tree.last_revision())
734
properties = last_rev.properties
735
self.assertEqual('John Doe\nJane Rey', properties['authors'])
737
def test_commit_time(self):
738
tree = self.make_branch_and_tree('tree')
739
self.build_tree(['tree/hello.txt'])
740
tree.add('hello.txt')
741
out, err = self.run_bzr("commit -m hello "
742
"--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
743
last_rev = tree.branch.repository.get_revision(tree.last_revision())
745
'Sat 2009-10-10 08:00:00 +0100',
746
osutils.format_date(last_rev.timestamp, last_rev.timezone))
748
def test_commit_time_bad_time(self):
749
tree = self.make_branch_and_tree('tree')
750
self.build_tree(['tree/hello.txt'])
751
tree.add('hello.txt')
752
out, err = self.run_bzr("commit -m hello "
753
"--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
754
self.assertStartsWith(
755
err, "brz: ERROR: Could not parse --commit-time:")
757
def test_commit_time_missing_tz(self):
758
tree = self.make_branch_and_tree('tree')
759
self.build_tree(['tree/hello.txt'])
760
tree.add('hello.txt')
761
out, err = self.run_bzr("commit -m hello "
762
"--commit-time='2009-10-10 08:00:00' tree/hello.txt", retcode=3)
763
self.assertStartsWith(
764
err, "brz: ERROR: Could not parse --commit-time:")
765
# Test that it is actually checking and does not simply crash with
766
# some other exception
767
self.assertContainsString(err, "missing a timezone offset")
769
def test_partial_commit_with_renames_in_tree(self):
770
# this test illustrates bug #140419
771
t = self.make_branch_and_tree('.')
772
self.build_tree(['dir/', 'dir/a', 'test'])
773
t.add(['dir/', 'dir/a', 'test'])
774
t.commit('initial commit')
775
# important part: file dir/a should change parent
776
# and should appear before old parent
777
# then during partial commit we have error
778
# parent_id {dir-XXX} not in inventory
779
t.rename_one('dir/a', 'a')
780
self.build_tree_contents([('test', b'changes in test')])
782
out, err = self.run_bzr('commit test -m "partial commit"')
783
self.assertEqual('', out)
784
self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
786
def test_commit_readonly_checkout(self):
787
# https://bugs.launchpad.net/bzr/+bug/129701
788
# "UnlockableTransport error trying to commit in checkout of readonly
790
self.make_branch('master')
791
master = ControlDir.open_from_transport(
792
self.get_readonly_transport('master')).open_branch()
793
master.create_checkout('checkout')
794
out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
796
self.assertContainsRe(err,
797
r'^brz: ERROR: Cannot lock.*readonly transport')
799
def setup_editor(self):
800
# Test that commit template hooks work
801
if sys.platform == "win32":
802
with open('fed.bat', 'w') as f:
803
f.write('@rem dummy fed')
804
self.overrideEnv('BRZ_EDITOR', "fed.bat")
806
with open('fed.sh', 'wb') as f:
807
f.write(b'#!/bin/sh\n')
808
os.chmod('fed.sh', 0o755)
809
self.overrideEnv('BRZ_EDITOR', "./fed.sh")
811
def setup_commit_with_template(self):
813
msgeditor.hooks.install_named_hook("commit_message_template",
814
lambda commit_obj, msg: "save me some typing\n", None)
815
tree = self.make_branch_and_tree('tree')
816
self.build_tree(['tree/hello.txt'])
817
tree.add('hello.txt')
820
def test_edit_empty_message(self):
821
tree = self.make_branch_and_tree('tree')
823
self.build_tree(['tree/hello.txt'])
824
tree.add('hello.txt')
825
out, err = self.run_bzr("commit tree/hello.txt", retcode=3,
827
self.assertContainsRe(err,
828
"brz: ERROR: Empty commit message specified")
830
def test_commit_hook_template_accepted(self):
831
tree = self.setup_commit_with_template()
832
out, err = self.run_bzr("commit tree/hello.txt", stdin="y\n")
833
last_rev = tree.branch.repository.get_revision(tree.last_revision())
834
self.assertEqual('save me some typing\n', last_rev.message)
836
def test_commit_hook_template_rejected(self):
837
tree = self.setup_commit_with_template()
838
expected = tree.last_revision()
839
out, err = self.run_bzr_error(["Empty commit message specified."
840
" Please specify a commit message with either"
841
" --message or --file or leave a blank message"
842
" with --message \"\"."],
843
"commit tree/hello.txt", stdin="n\n")
844
self.assertEqual(expected, tree.last_revision())
846
def test_set_commit_message(self):
847
msgeditor.hooks.install_named_hook("set_commit_message",
848
lambda commit_obj, msg: "save me some typing\n", None)
849
tree = self.make_branch_and_tree('tree')
850
self.build_tree(['tree/hello.txt'])
851
tree.add('hello.txt')
852
out, err = self.run_bzr("commit tree/hello.txt")
853
last_rev = tree.branch.repository.get_revision(tree.last_revision())
854
self.assertEqual('save me some typing\n', last_rev.message)
856
def test_commit_without_username(self):
857
"""Ensure commit error if username is not set.
859
self.run_bzr(['init', 'foo'])
860
with open('foo/foo.txt', 'w') as f:
862
self.run_bzr(['add'], working_dir='foo')
863
override_whoami(self)
865
['Unable to determine your name'],
866
['commit', '-m', 'initial'], working_dir='foo')
868
def test_commit_recursive_checkout(self):
869
"""Ensure that a commit to a recursive checkout fails cleanly.
871
self.run_bzr(['init', 'test_branch'])
872
self.run_bzr(['checkout', 'test_branch', 'test_checkout'])
874
self.run_bzr(['bind', '.'], working_dir='test_checkout')
875
with open('test_checkout/foo.txt', 'w') as f:
877
self.run_bzr(['add'], working_dir='test_checkout')
878
out, err = self.run_bzr_error(
879
['Branch.*test_checkout.*appears to be bound to itself'],
880
['commit', '-m', 'addedfoo'], working_dir='test_checkout')
882
def test_mv_dirs_non_ascii(self):
883
"""Move directory with non-ascii name and containing files.
885
Regression test for bug 185211.
887
tree = self.make_branch_and_tree('.')
888
self.build_tree([u'abc\xa7/', u'abc\xa7/foo'])
890
tree.add([u'abc\xa7/', u'abc\xa7/foo'])
891
tree.commit('checkin')
893
tree.rename_one(u'abc\xa7', 'abc')
895
self.run_bzr('ci -m "non-ascii mv"')
added
removed
bzrlib/tests/blackbox/test_commit.py
