1
# Copyright (C) 2006-2012, 2016 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
"""Tests for the commit CLI of bzr."""
25
from testtools.matchers import DocTestMatches
33
from ...controldir import ControlDir
34
from ...sixish import PY3
39
from .. import TestCaseWithTransport
40
from ..matchers import ContainsNoVfsCalls
43
class TestCommit(TestCaseWithTransport):
45
def test_05_empty_commit(self):
46
"""Commit of tree with no versioned files should fail"""
47
# If forced, it should succeed, but this is not tested here.
48
self.make_branch_and_tree('.')
49
self.build_tree(['hello.txt'])
50
out, err = self.run_bzr('commit -m empty', retcode=3)
51
self.assertEqual('', out)
53
# 1) We really don't want 'aborting commit write group' anymore.
54
# 2) brz: ERROR: is a really long line, so we wrap it with '\'
59
brz: ERROR: No changes to commit.\
60
Please 'brz add' the files you want to commit,\
61
or use --unchanged to force an empty commit.
62
""", flags=doctest.ELLIPSIS | doctest.REPORT_UDIFF))
64
def test_commit_success(self):
65
"""Successful commit should not leave behind a bzr-commit-* file"""
66
self.make_branch_and_tree('.')
67
self.run_bzr('commit --unchanged -m message')
68
self.assertEqual('', self.run_bzr('unknowns')[0])
70
# same for unicode messages
71
self.run_bzr(["commit", "--unchanged", "-m", u'foo\xb5'])
72
self.assertEqual('', self.run_bzr('unknowns')[0])
74
def test_commit_lossy_native(self):
75
"""A --lossy option to commit is supported."""
76
self.make_branch_and_tree('.')
77
self.run_bzr('commit --lossy --unchanged -m message')
78
self.assertEqual('', self.run_bzr('unknowns')[0])
80
def test_commit_lossy_foreign(self):
81
test_foreign.register_dummy_foreign_for_test(self)
82
self.make_branch_and_tree('.',
83
format=test_foreign.DummyForeignVcsDirFormat())
84
self.run_bzr('commit --lossy --unchanged -m message')
85
output = self.run_bzr('revision-info')[0]
86
self.assertTrue(output.startswith('1 dummy-'))
88
def test_commit_with_path(self):
89
"""Commit tree with path of root specified"""
90
a_tree = self.make_branch_and_tree('a')
91
self.build_tree(['a/a_file'])
93
self.run_bzr(['commit', '-m', 'first commit', 'a'])
95
b_tree = a_tree.controldir.sprout('b').open_workingtree()
96
self.build_tree_contents([('b/a_file', b'changes in b')])
97
self.run_bzr(['commit', '-m', 'first commit in b', 'b'])
99
self.build_tree_contents([('a/a_file', b'new contents')])
100
self.run_bzr(['commit', '-m', 'change in a', 'a'])
102
b_tree.merge_from_branch(a_tree.branch)
103
self.assertEqual(len(b_tree.conflicts()), 1)
104
self.run_bzr('resolved b/a_file')
105
self.run_bzr(['commit', '-m', 'merge into b', 'b'])
107
def test_10_verbose_commit(self):
108
"""Add one file and examine verbose commit output"""
109
tree = self.make_branch_and_tree('.')
110
self.build_tree(['hello.txt'])
111
tree.add("hello.txt")
112
out, err = self.run_bzr('commit -m added')
113
self.assertEqual('', out)
114
self.assertContainsRe(err, '^Committing to: .*\n'
116
'Committed revision 1.\n$',)
118
def prepare_simple_history(self):
119
"""Prepare and return a working tree with one commit of one file"""
120
# Commit with modified file should say so
121
wt = ControlDir.create_standalone_workingtree('.')
122
self.build_tree(['hello.txt', 'extra.txt'])
123
wt.add(['hello.txt'])
124
wt.commit(message='added')
127
def test_verbose_commit_modified(self):
128
# Verbose commit of modified file should say so
129
wt = self.prepare_simple_history()
130
self.build_tree_contents([('hello.txt', b'new contents')])
131
out, err = self.run_bzr('commit -m modified')
132
self.assertEqual('', out)
133
self.assertContainsRe(err, '^Committing to: .*\n'
134
'modified hello\\.txt\n'
135
'Committed revision 2\\.\n$')
137
def test_unicode_commit_message_is_filename(self):
138
"""Unicode commit message same as a filename (Bug #563646).
140
self.requireFeature(features.UnicodeFilenameFeature)
141
file_name = u'\N{euro sign}'
142
self.run_bzr(['init'])
143
with open(file_name, 'w') as f:
144
f.write('hello world')
145
self.run_bzr(['add'])
146
out, err = self.run_bzr(['commit', '-m', file_name])
147
reflags = re.MULTILINE | re.DOTALL | re.UNICODE
148
te = osutils.get_terminal_encoding()
149
self.assertContainsRe(err if PY3 else err.decode(te),
150
u'The commit message is a file name:',
153
# Run same test with a filename that causes encode
154
# error for the terminal encoding. We do this
155
# by forcing terminal encoding of ascii for
156
# osutils.get_terminal_encoding which is used
157
# by ui.text.show_warning
158
default_get_terminal_enc = osutils.get_terminal_encoding
160
osutils.get_terminal_encoding = lambda trace=None: 'ascii'
161
file_name = u'foo\u1234'
162
with open(file_name, 'w') as f:
163
f.write('hello world')
164
self.run_bzr(['add'])
165
out, err = self.run_bzr(['commit', '-m', file_name])
166
reflags = re.MULTILINE | re.DOTALL | re.UNICODE
167
te = osutils.get_terminal_encoding()
168
self.assertContainsRe(err if PY3 else err.decode(te, 'replace'),
169
u'The commit message is a file name:',
172
osutils.get_terminal_encoding = default_get_terminal_enc
174
def test_non_ascii_file_unversioned_utf8(self):
175
self.requireFeature(features.UnicodeFilenameFeature)
176
tree = self.make_branch_and_tree(".")
177
self.build_tree(["f"])
179
out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
180
encoding="utf-8", retcode=3)
181
self.assertContainsRe(err, b"(?m)not versioned: \"\xc2\xa7\"$")
183
def test_non_ascii_file_unversioned_iso_8859_5(self):
184
self.requireFeature(features.UnicodeFilenameFeature)
185
tree = self.make_branch_and_tree(".")
186
self.build_tree(["f"])
188
out, err = self.run_bzr_raw(["commit", "-m", "Wrong filename", u"\xa7"],
189
encoding="iso-8859-5", retcode=3)
191
self.expectFailure("Error messages are always written as UTF-8",
192
self.assertNotContainsString, err, b"\xc2\xa7")
194
self.assertNotContainsString(err, b"\xc2\xa7")
195
self.assertContainsRe(err, b"(?m)not versioned: \"\xfd\"$")
197
def test_warn_about_forgotten_commit_message(self):
198
"""Test that the lack of -m parameter is caught"""
199
wt = self.make_branch_and_tree('.')
200
self.build_tree(['one', 'two'])
202
out, err = self.run_bzr('commit -m one two')
203
self.assertContainsRe(err, "The commit message is a file name")
205
def test_verbose_commit_renamed(self):
206
# Verbose commit of renamed file should say so
207
wt = self.prepare_simple_history()
208
wt.rename_one('hello.txt', 'gutentag.txt')
209
out, err = self.run_bzr('commit -m renamed')
210
self.assertEqual('', out)
211
self.assertContainsRe(err, '^Committing to: .*\n'
212
'renamed hello\\.txt => gutentag\\.txt\n'
213
'Committed revision 2\\.$\n')
215
def test_verbose_commit_moved(self):
216
# Verbose commit of file moved to new directory should say so
217
wt = self.prepare_simple_history()
220
wt.rename_one('hello.txt', 'subdir/hello.txt')
221
out, err = self.run_bzr('commit -m renamed')
222
self.assertEqual('', out)
224
'Committing to: %s/' % osutils.getcwd(),
226
'renamed hello.txt => subdir/hello.txt',
227
'Committed revision 2.',
229
}, set(err.split('\n')))
231
def test_verbose_commit_with_unknown(self):
232
"""Unknown files should not be listed by default in verbose output"""
233
# Is that really the best policy?
234
wt = ControlDir.create_standalone_workingtree('.')
235
self.build_tree(['hello.txt', 'extra.txt'])
236
wt.add(['hello.txt'])
237
out, err = self.run_bzr('commit -m added')
238
self.assertEqual('', out)
239
self.assertContainsRe(err, '^Committing to: .*\n'
240
'added hello\\.txt\n'
241
'Committed revision 1\\.\n$')
243
def test_verbose_commit_with_unchanged(self):
244
"""Unchanged files should not be listed by default in verbose output"""
245
tree = self.make_branch_and_tree('.')
246
self.build_tree(['hello.txt', 'unchanged.txt'])
247
tree.add('unchanged.txt')
248
self.run_bzr('commit -m unchanged unchanged.txt')
249
tree.add("hello.txt")
250
out, err = self.run_bzr('commit -m added')
251
self.assertEqual('', out)
252
self.assertContainsRe(err, '^Committing to: .*\n'
253
'added hello\\.txt\n'
254
'Committed revision 2\\.$\n')
256
def test_verbose_commit_includes_master_location(self):
257
"""Location of master is displayed when committing to bound branch"""
258
a_tree = self.make_branch_and_tree('a')
259
self.build_tree(['a/b'])
261
a_tree.commit(message='Initial message')
263
b_tree = a_tree.branch.create_checkout('b')
264
expected = "%s/" % (osutils.abspath('a'), )
265
out, err = self.run_bzr('commit -m blah --unchanged', working_dir='b')
266
self.assertEqual(err, 'Committing to: %s\n'
267
'Committed revision 2.\n' % expected)
269
def test_commit_sanitizes_CR_in_message(self):
270
# See bug #433779, basically Emacs likes to pass '\r\n' style line
271
# endings to 'brz commit -m ""' which breaks because we don't allow
272
# '\r' in commit messages. (Mostly because of issues where XML style
273
# formats arbitrarily strip it out of the data while parsing.)
274
# To make life easier for users, we just always translate '\r\n' =>
275
# '\n'. And '\r' => '\n'.
276
a_tree = self.make_branch_and_tree('a')
277
self.build_tree(['a/b'])
279
self.run_bzr(['commit',
280
'-m', 'a string\r\n\r\nwith mixed\r\rendings\n'],
282
rev_id = a_tree.branch.last_revision()
283
rev = a_tree.branch.repository.get_revision(rev_id)
284
self.assertEqualDiff('a string\n\nwith mixed\n\nendings\n',
287
def test_commit_merge_reports_all_modified_files(self):
288
# the commit command should show all the files that are shown by
289
# brz diff or brz status when committing, even when they were not
290
# changed by the user but rather through doing a merge.
291
this_tree = self.make_branch_and_tree('this')
292
# we need a bunch of files and dirs, to perform one action on each.
295
'this/dirtoreparent/',
298
'this/filetoreparent',
315
this_tree.commit('create_files')
316
other_dir = this_tree.controldir.sprout('other')
317
other_tree = other_dir.open_workingtree()
318
other_tree.lock_write()
319
# perform the needed actions on the files and dirs.
321
other_tree.rename_one('dirtorename', 'renameddir')
322
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
323
other_tree.rename_one('filetorename', 'renamedfile')
324
other_tree.rename_one('filetoreparent',
325
'renameddir/reparentedfile')
326
other_tree.remove(['dirtoremove', 'filetoremove'])
327
self.build_tree_contents([
329
('other/filetomodify', b'new content'),
330
('other/newfile', b'new file content')])
331
other_tree.add('newfile')
332
other_tree.add('newdir/')
333
other_tree.commit('modify all sample files and dirs.')
336
this_tree.merge_from_branch(other_tree.branch)
337
out, err = self.run_bzr('commit -m added', working_dir='this')
338
self.assertEqual('', out)
340
'Committing to: %s/' % osutils.pathjoin(osutils.getcwd(), 'this'),
341
'modified filetomodify',
344
'renamed dirtorename => renameddir',
345
'renamed filetorename => renamedfile',
346
'renamed dirtoreparent => renameddir/reparenteddir',
347
'renamed filetoreparent => renameddir/reparentedfile',
348
'deleted dirtoremove',
349
'deleted filetoremove',
350
'Committed revision 2.',
352
}, set(err.split('\n')))
354
def test_empty_commit_message(self):
355
tree = self.make_branch_and_tree('.')
356
self.build_tree_contents([('foo.c', b'int main() {}')])
358
self.run_bzr('commit -m ""')
360
def test_other_branch_commit(self):
361
# this branch is to ensure consistent behaviour, whether we're run
362
# inside a branch, or not.
363
outer_tree = self.make_branch_and_tree('.')
364
inner_tree = self.make_branch_and_tree('branch')
365
self.build_tree_contents([
366
('branch/foo.c', b'int main() {}'),
367
('branch/bar.c', b'int main() {}')])
368
inner_tree.add(['foo.c', 'bar.c'])
369
# can't commit files in different trees; sane error
370
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
371
# can commit to branch - records foo.c only
372
self.run_bzr('commit -m newstuff branch/foo.c')
373
# can commit to branch - records bar.c
374
self.run_bzr('commit -m newstuff branch')
376
self.run_bzr_error(["No changes to commit"],
377
'commit -m newstuff branch')
379
def test_out_of_date_tree_commit(self):
380
# check we get an error code and a clear message committing with an out
382
tree = self.make_branch_and_tree('branch')
384
checkout = tree.branch.create_checkout('checkout', lightweight=True)
385
# commit to the original branch to make the checkout out of date
386
tree.commit('message branch', allow_pointless=True)
387
# now commit to the checkout should emit
388
# ERROR: Out of date with the branch, 'brz update' is suggested
389
output = self.run_bzr('commit --unchanged -m checkout_message '
390
'checkout', retcode=3)
391
self.assertEqual(output,
393
"brz: ERROR: Working tree is out of date, please "
394
"run 'brz update'.\n"))
396
def test_local_commit_unbound(self):
397
# a --local commit on an unbound branch is an error
398
self.make_branch_and_tree('.')
399
out, err = self.run_bzr('commit --local', retcode=3)
400
self.assertEqualDiff('', out)
401
self.assertEqualDiff('brz: ERROR: Cannot perform local-only commits '
402
'on unbound branches.\n', err)
404
def test_commit_a_text_merge_in_a_checkout(self):
405
# checkouts perform multiple actions in a transaction across bond
406
# branches and their master, and have been observed to fail in the
407
# past. This is a user story reported to fail in bug #43959 where
408
# a merge done in a checkout (using the update command) failed to
410
trunk = self.make_branch_and_tree('trunk')
412
u1 = trunk.branch.create_checkout('u1')
413
self.build_tree_contents([('u1/hosts', b'initial contents\n')])
415
self.run_bzr('commit -m add-hosts u1')
417
u2 = trunk.branch.create_checkout('u2')
418
self.build_tree_contents([('u2/hosts', b'altered in u2\n')])
419
self.run_bzr('commit -m checkin-from-u2 u2')
421
# make an offline commits
422
self.build_tree_contents(
423
[('u1/hosts', b'first offline change in u1\n')])
424
self.run_bzr('commit -m checkin-offline --local u1')
426
# now try to pull in online work from u2, and then commit our offline
428
# retcode 1 as we expect a text conflict
429
self.run_bzr('update u1', retcode=1)
430
self.assertFileEqual(b'''\
432
first offline change in u1
439
self.run_bzr('resolved u1/hosts')
440
# add a text change here to represent resolving the merge conflicts in
441
# favour of a new version of the file not identical to either the u1
442
# version or the u2 version.
443
self.build_tree_contents([('u1/hosts', b'merge resolution\n')])
444
self.run_bzr('commit -m checkin-merge-of-the-offline-work-from-u1 u1')
446
def test_commit_exclude_excludes_modified_files(self):
447
"""Commit -x foo should ignore changes to foo."""
448
tree = self.make_branch_and_tree('.')
449
self.build_tree(['a', 'b', 'c'])
450
tree.smart_add(['.'])
451
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b'])
452
self.assertFalse('added b' in out)
453
self.assertFalse('added b' in err)
454
# If b was excluded it will still be 'added' in status.
455
out, err = self.run_bzr(['added'])
456
self.assertEqual('b\n', out)
457
self.assertEqual('', err)
459
def test_commit_exclude_twice_uses_both_rules(self):
460
"""Commit -x foo -x bar should ignore changes to foo and bar."""
461
tree = self.make_branch_and_tree('.')
462
self.build_tree(['a', 'b', 'c'])
463
tree.smart_add(['.'])
464
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b', '-x', 'c'])
465
self.assertFalse('added b' in out)
466
self.assertFalse('added c' in out)
467
self.assertFalse('added b' in err)
468
self.assertFalse('added c' in err)
469
# If b was excluded it will still be 'added' in status.
470
out, err = self.run_bzr(['added'])
471
self.assertTrue('b\n' in out)
472
self.assertTrue('c\n' in out)
473
self.assertEqual('', err)
475
def test_commit_respects_spec_for_removals(self):
476
"""Commit with a file spec should only commit removals that match"""
477
t = self.make_branch_and_tree('.')
478
self.build_tree(['file-a', 'dir-a/', 'dir-a/file-b'])
479
t.add(['file-a', 'dir-a', 'dir-a/file-b'])
481
t.remove(['file-a', 'dir-a/file-b'])
482
result = self.run_bzr('commit . -m removed-file-b',
483
working_dir='dir-a')[1]
484
self.assertNotContainsRe(result, 'file-a')
485
result = self.run_bzr('status', working_dir='dir-a')[0]
486
self.assertContainsRe(result, 'removed:\n file-a')
488
def test_strict_commit(self):
489
"""Commit with --strict works if everything is known"""
490
ignores._set_user_ignores([])
491
tree = self.make_branch_and_tree('tree')
492
self.build_tree(['tree/a'])
494
# A simple change should just work
495
self.run_bzr('commit --strict -m adding-a', working_dir='tree')
497
def test_strict_commit_no_changes(self):
498
"""commit --strict gives "no changes" if there is nothing to commit"""
499
tree = self.make_branch_and_tree('tree')
500
self.build_tree(['tree/a'])
502
tree.commit('adding a')
504
# With no changes, it should just be 'no changes'
505
# Make sure that commit is failing because there is nothing to do
506
self.run_bzr_error(['No changes to commit'],
507
'commit --strict -m no-changes',
510
# But --strict doesn't care if you supply --unchanged
511
self.run_bzr('commit --strict --unchanged -m no-changes',
514
def test_strict_commit_unknown(self):
515
"""commit --strict fails if a file is unknown"""
516
tree = self.make_branch_and_tree('tree')
517
self.build_tree(['tree/a'])
519
tree.commit('adding a')
521
# Add one file so there is a change, but forget the other
522
self.build_tree(['tree/b', 'tree/c'])
524
self.run_bzr_error(['Commit refused because there are unknown files'],
525
'commit --strict -m add-b',
528
# --no-strict overrides --strict
529
self.run_bzr('commit --strict -m add-b --no-strict',
532
def test_fixes_bug_output(self):
533
"""commit --fixes=lp:23452 succeeds without output."""
534
tree = self.make_branch_and_tree('tree')
535
self.build_tree(['tree/hello.txt'])
536
tree.add('hello.txt')
537
output, err = self.run_bzr(
538
'commit -m hello --fixes=lp:23452 tree/hello.txt')
539
self.assertEqual('', output)
540
self.assertContainsRe(err, 'Committing to: .*\n'
541
'added hello\\.txt\n'
542
'Committed revision 1\\.\n')
544
def test_fixes_bug_unicode(self):
545
"""commit --fixes=lp:unicode succeeds without output."""
546
tree = self.make_branch_and_tree('tree')
547
self.build_tree(['tree/hello.txt'])
548
tree.add('hello.txt')
549
output, err = self.run_bzr_raw(
550
['commit', '-m', 'hello',
551
u'--fixes=generic:\u20ac', 'tree/hello.txt'],
552
encoding='utf-8', retcode=3)
553
self.assertEqual(b'', output)
554
self.assertContainsRe(err,
555
b'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
557
def test_no_bugs_no_properties(self):
558
"""If no bugs are fixed, the bugs property is not set.
560
see https://beta.launchpad.net/bzr/+bug/109613
562
tree = self.make_branch_and_tree('tree')
563
self.build_tree(['tree/hello.txt'])
564
tree.add('hello.txt')
565
self.run_bzr('commit -m hello tree/hello.txt')
566
# Get the revision properties, ignoring the branch-nick property, which
567
# we don't care about for this test.
568
last_rev = tree.branch.repository.get_revision(tree.last_revision())
569
properties = dict(last_rev.properties)
570
del properties['branch-nick']
571
self.assertFalse('bugs' in properties)
573
def test_bugs_sets_property(self):
574
"""commit --bugs=lp:234 sets the lp:234 revprop to 'related'."""
575
tree = self.make_branch_and_tree('tree')
576
self.build_tree(['tree/hello.txt'])
577
tree.add('hello.txt')
578
self.run_bzr('commit -m hello --bugs=lp:234 tree/hello.txt')
580
# Get the revision properties, ignoring the branch-nick property, which
581
# we don't care about for this test.
582
last_rev = tree.branch.repository.get_revision(tree.last_revision())
583
properties = dict(last_rev.properties)
584
del properties[u'branch-nick']
586
self.assertEqual({u'bugs': 'https://launchpad.net/bugs/234 related'},
589
def test_fixes_bug_sets_property(self):
590
"""commit --fixes=lp:234 sets the lp:234 revprop to 'fixed'."""
591
tree = self.make_branch_and_tree('tree')
592
self.build_tree(['tree/hello.txt'])
593
tree.add('hello.txt')
594
self.run_bzr('commit -m hello --fixes=lp:234 tree/hello.txt')
596
# Get the revision properties, ignoring the branch-nick property, which
597
# we don't care about for this test.
598
last_rev = tree.branch.repository.get_revision(tree.last_revision())
599
properties = dict(last_rev.properties)
600
del properties[u'branch-nick']
602
self.assertEqual({u'bugs': 'https://launchpad.net/bugs/234 fixed'},
605
def test_fixes_multiple_bugs_sets_properties(self):
606
"""--fixes can be used more than once to show that bugs are fixed."""
607
tree = self.make_branch_and_tree('tree')
608
self.build_tree(['tree/hello.txt'])
609
tree.add('hello.txt')
610
self.run_bzr('commit -m hello --fixes=lp:123 --fixes=lp:235'
613
# Get the revision properties, ignoring the branch-nick property, which
614
# we don't care about for this test.
615
last_rev = tree.branch.repository.get_revision(tree.last_revision())
616
properties = dict(last_rev.properties)
617
del properties['branch-nick']
620
{u'bugs': 'https://launchpad.net/bugs/123 fixed\n'
621
'https://launchpad.net/bugs/235 fixed'},
624
def test_fixes_bug_with_alternate_trackers(self):
625
"""--fixes can be used on a properly configured branch to mark bug
626
fixes on multiple trackers.
628
tree = self.make_branch_and_tree('tree')
629
tree.branch.get_config().set_user_option(
630
'trac_twisted_url', 'http://twistedmatrix.com/trac')
631
self.build_tree(['tree/hello.txt'])
632
tree.add('hello.txt')
634
'commit -m hello --fixes=lp:123 --fixes=twisted:235 tree/')
636
# Get the revision properties, ignoring the branch-nick property, which
637
# we don't care about for this test.
638
last_rev = tree.branch.repository.get_revision(tree.last_revision())
639
properties = dict(last_rev.properties)
640
del properties['branch-nick']
643
{'bugs': 'https://launchpad.net/bugs/123 fixed\n'
644
'http://twistedmatrix.com/trac/ticket/235 fixed'},
647
def test_fixes_unknown_bug_prefix(self):
648
tree = self.make_branch_and_tree('tree')
649
self.build_tree(['tree/hello.txt'])
650
tree.add('hello.txt')
652
["Unrecognized bug %s. Commit refused." % 'xxx:123'],
653
'commit -m add-b --fixes=xxx:123',
656
def test_fixes_bug_with_default_tracker(self):
657
"""commit --fixes=234 uses the default bug tracker."""
658
tree = self.make_branch_and_tree('tree')
659
self.build_tree(['tree/hello.txt'])
660
tree.add('hello.txt')
662
["brz: ERROR: No tracker specified for bug 123. Use the form "
663
"'tracker:id' or specify a default bug tracker using the "
664
"`bugtracker` option.\n"
665
"See \"brz help bugs\" for more information on this feature. "
667
'commit -m add-b --fixes=123',
669
tree.branch.get_config_stack().set("bugtracker", "lp")
670
self.run_bzr('commit -m hello --fixes=234 tree/hello.txt')
671
last_rev = tree.branch.repository.get_revision(tree.last_revision())
672
self.assertEqual('https://launchpad.net/bugs/234 fixed',
673
last_rev.properties['bugs'])
675
def test_fixes_invalid_bug_number(self):
676
tree = self.make_branch_and_tree('tree')
677
self.build_tree(['tree/hello.txt'])
678
tree.add('hello.txt')
680
["Did not understand bug identifier orange: Must be an integer. "
681
"See \"brz help bugs\" for more information on this feature.\n"
683
'commit -m add-b --fixes=lp:orange',
686
def test_fixes_invalid_argument(self):
687
"""Raise an appropriate error when the fixes argument isn't tag:id."""
688
tree = self.make_branch_and_tree('tree')
689
self.build_tree(['tree/hello.txt'])
690
tree.add('hello.txt')
692
[r"Invalid bug orange:apples:bananas. Must be in the form of "
693
r"'tracker:id'\. See \"brz help bugs\" for more information on "
694
r"this feature.\nCommit refused\."],
695
'commit -m add-b --fixes=orange:apples:bananas',
698
def test_no_author(self):
699
"""If the author is not specified, the author property is not set."""
700
tree = self.make_branch_and_tree('tree')
701
self.build_tree(['tree/hello.txt'])
702
tree.add('hello.txt')
703
self.run_bzr('commit -m hello tree/hello.txt')
704
last_rev = tree.branch.repository.get_revision(tree.last_revision())
705
properties = last_rev.properties
706
self.assertFalse('author' in properties)
708
def test_author_sets_property(self):
709
"""commit --author='John Doe <jdoe@example.com>' sets the author
712
tree = self.make_branch_and_tree('tree')
713
self.build_tree(['tree/hello.txt'])
714
tree.add('hello.txt')
715
self.run_bzr(["commit", '-m', 'hello',
716
'--author', u'John D\xf6 <jdoe@example.com>',
718
last_rev = tree.branch.repository.get_revision(tree.last_revision())
719
properties = last_rev.properties
720
self.assertEqual(u'John D\xf6 <jdoe@example.com>',
721
properties['authors'])
723
def test_author_no_email(self):
724
"""Author's name without an email address is allowed, too."""
725
tree = self.make_branch_and_tree('tree')
726
self.build_tree(['tree/hello.txt'])
727
tree.add('hello.txt')
728
out, err = self.run_bzr("commit -m hello --author='John Doe' "
730
last_rev = tree.branch.repository.get_revision(tree.last_revision())
731
properties = last_rev.properties
732
self.assertEqual('John Doe', properties['authors'])
734
def test_multiple_authors(self):
735
"""Multiple authors can be specyfied, and all are stored."""
736
tree = self.make_branch_and_tree('tree')
737
self.build_tree(['tree/hello.txt'])
738
tree.add('hello.txt')
739
out, err = self.run_bzr("commit -m hello --author='John Doe' "
740
"--author='Jane Rey' tree/hello.txt")
741
last_rev = tree.branch.repository.get_revision(tree.last_revision())
742
properties = last_rev.properties
743
self.assertEqual('John Doe\nJane Rey', properties['authors'])
745
def test_commit_time(self):
746
tree = self.make_branch_and_tree('tree')
747
self.build_tree(['tree/hello.txt'])
748
tree.add('hello.txt')
749
out, err = self.run_bzr("commit -m hello "
750
"--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
751
last_rev = tree.branch.repository.get_revision(tree.last_revision())
753
'Sat 2009-10-10 08:00:00 +0100',
754
osutils.format_date(last_rev.timestamp, last_rev.timezone))
756
def test_commit_time_bad_time(self):
757
tree = self.make_branch_and_tree('tree')
758
self.build_tree(['tree/hello.txt'])
759
tree.add('hello.txt')
760
out, err = self.run_bzr("commit -m hello "
761
"--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
762
self.assertStartsWith(
763
err, "brz: ERROR: Could not parse --commit-time:")
765
def test_commit_time_missing_tz(self):
766
tree = self.make_branch_and_tree('tree')
767
self.build_tree(['tree/hello.txt'])
768
tree.add('hello.txt')
769
out, err = self.run_bzr("commit -m hello "
770
"--commit-time='2009-10-10 08:00:00' tree/hello.txt", retcode=3)
771
self.assertStartsWith(
772
err, "brz: ERROR: Could not parse --commit-time:")
773
# Test that it is actually checking and does not simply crash with
774
# some other exception
775
self.assertContainsString(err, "missing a timezone offset")
777
def test_partial_commit_with_renames_in_tree(self):
778
# this test illustrates bug #140419
779
t = self.make_branch_and_tree('.')
780
self.build_tree(['dir/', 'dir/a', 'test'])
781
t.add(['dir/', 'dir/a', 'test'])
782
t.commit('initial commit')
783
# important part: file dir/a should change parent
784
# and should appear before old parent
785
# then during partial commit we have error
786
# parent_id {dir-XXX} not in inventory
787
t.rename_one('dir/a', 'a')
788
self.build_tree_contents([('test', b'changes in test')])
790
out, err = self.run_bzr('commit test -m "partial commit"')
791
self.assertEqual('', out)
792
self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
794
def test_commit_readonly_checkout(self):
795
# https://bugs.launchpad.net/bzr/+bug/129701
796
# "UnlockableTransport error trying to commit in checkout of readonly
798
self.make_branch('master')
799
master = ControlDir.open_from_transport(
800
self.get_readonly_transport('master')).open_branch()
801
master.create_checkout('checkout')
802
out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
804
self.assertContainsRe(err,
805
r'^brz: ERROR: Cannot lock.*readonly transport')
807
def setup_editor(self):
808
# Test that commit template hooks work
809
if sys.platform == "win32":
810
with open('fed.bat', 'w') as f:
811
f.write('@rem dummy fed')
812
self.overrideEnv('BRZ_EDITOR', "fed.bat")
814
with open('fed.sh', 'wb') as f:
815
f.write(b'#!/bin/sh\n')
816
os.chmod('fed.sh', 0o755)
817
self.overrideEnv('BRZ_EDITOR', "./fed.sh")
819
def setup_commit_with_template(self):
821
msgeditor.hooks.install_named_hook("commit_message_template",
822
lambda commit_obj, msg: "save me some typing\n", None)
823
tree = self.make_branch_and_tree('tree')
824
self.build_tree(['tree/hello.txt'])
825
tree.add('hello.txt')
828
def test_edit_empty_message(self):
829
tree = self.make_branch_and_tree('tree')
831
self.build_tree(['tree/hello.txt'])
832
tree.add('hello.txt')
833
out, err = self.run_bzr("commit tree/hello.txt", retcode=3,
835
self.assertContainsRe(err,
836
"brz: ERROR: Empty commit message specified")
838
def test_commit_hook_template_accepted(self):
839
tree = self.setup_commit_with_template()
840
out, err = self.run_bzr("commit tree/hello.txt", stdin="y\n")
841
last_rev = tree.branch.repository.get_revision(tree.last_revision())
842
self.assertEqual('save me some typing\n', last_rev.message)
844
def test_commit_hook_template_rejected(self):
845
tree = self.setup_commit_with_template()
846
expected = tree.last_revision()
847
out, err = self.run_bzr_error(["Empty commit message specified."
848
" Please specify a commit message with either"
849
" --message or --file or leave a blank message"
850
" with --message \"\"."],
851
"commit tree/hello.txt", stdin="n\n")
852
self.assertEqual(expected, tree.last_revision())
854
def test_set_commit_message(self):
855
msgeditor.hooks.install_named_hook("set_commit_message",
856
lambda commit_obj, msg: "save me some typing\n", None)
857
tree = self.make_branch_and_tree('tree')
858
self.build_tree(['tree/hello.txt'])
859
tree.add('hello.txt')
860
out, err = self.run_bzr("commit tree/hello.txt")
861
last_rev = tree.branch.repository.get_revision(tree.last_revision())
862
self.assertEqual('save me some typing\n', last_rev.message)
864
def test_commit_without_username(self):
865
"""Ensure commit error if username is not set.
867
self.run_bzr(['init', 'foo'])
868
with open('foo/foo.txt', 'w') as f:
870
self.run_bzr(['add'], working_dir='foo')
871
self.overrideEnv('EMAIL', None)
872
self.overrideEnv('BRZ_EMAIL', None)
873
# Also, make sure that it's not inferred from mailname.
874
self.overrideAttr(config, '_auto_user_id',
875
lambda: (None, None))
877
['Unable to determine your name'],
878
['commit', '-m', 'initial'], working_dir='foo')
880
def test_commit_recursive_checkout(self):
881
"""Ensure that a commit to a recursive checkout fails cleanly.
883
self.run_bzr(['init', 'test_branch'])
884
self.run_bzr(['checkout', 'test_branch', 'test_checkout'])
886
self.run_bzr(['bind', '.'], working_dir='test_checkout')
887
with open('test_checkout/foo.txt', 'w') as f:
889
self.run_bzr(['add'], working_dir='test_checkout')
890
out, err = self.run_bzr_error(
891
['Branch.*test_checkout.*appears to be bound to itself'],
892
['commit', '-m', 'addedfoo'], working_dir='test_checkout')
894
def test_mv_dirs_non_ascii(self):
895
"""Move directory with non-ascii name and containing files.
897
Regression test for bug 185211.
899
tree = self.make_branch_and_tree('.')
900
self.build_tree([u'abc\xa7/', u'abc\xa7/foo'])
902
tree.add([u'abc\xa7/', u'abc\xa7/foo'])
903
tree.commit('checkin')
905
tree.rename_one(u'abc\xa7', 'abc')
907
self.run_bzr('ci -m "non-ascii mv"')
910
class TestSmartServerCommit(TestCaseWithTransport):
912
def test_commit_to_lightweight(self):
913
self.setup_smart_server_with_call_log()
914
t = self.make_branch_and_tree('from')
915
for count in range(9):
916
t.commit(message='commit %d' % count)
917
out, err = self.run_bzr(['checkout', '--lightweight', self.get_url('from'),
919
self.reset_smart_call_log()
920
self.build_tree(['target/afile'])
921
self.run_bzr(['add', 'target/afile'])
922
out, err = self.run_bzr(['commit', '-m', 'do something', 'target'])
923
# This figure represent the amount of work to perform this use case. It
924
# is entirely ok to reduce this number if a test fails due to rpc_count
925
# being too low. If rpc_count increases, more network roundtrips have
926
# become necessary for this use case. Please do not adjust this number
927
# upwards without agreement from bzr's network support maintainers.
928
self.assertLength(211, self.hpss_calls)
929
self.assertLength(2, self.hpss_connections)
930
self.expectFailure("commit still uses VFS calls",
931
self.assertThat, self.hpss_calls, ContainsNoVfsCalls)
added
removed
breezy/tests/blackbox/test_commit.py
