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
38
from .. import TestCaseWithTransport
39
from ..matchers import ContainsNoVfsCalls
40
from ..test_bedding import override_whoami
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,
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,
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)
190
self.assertNotContainsString(err, b"\xc2\xa7")
191
self.assertContainsRe(err, b"(?m)not versioned: \"\xfd\"$")
193
def test_warn_about_forgotten_commit_message(self):
194
"""Test that the lack of -m parameter is caught"""
195
wt = self.make_branch_and_tree('.')
196
self.build_tree(['one', 'two'])
198
out, err = self.run_bzr('commit -m one two')
199
self.assertContainsRe(err, "The commit message is a file name")
201
def test_verbose_commit_renamed(self):
202
# Verbose commit of renamed file should say so
203
wt = self.prepare_simple_history()
204
wt.rename_one('hello.txt', 'gutentag.txt')
205
out, err = self.run_bzr('commit -m renamed')
206
self.assertEqual('', out)
207
self.assertContainsRe(err, '^Committing to: .*\n'
208
'renamed hello\\.txt => gutentag\\.txt\n'
209
'Committed revision 2\\.$\n')
211
def test_verbose_commit_moved(self):
212
# Verbose commit of file moved to new directory should say so
213
wt = self.prepare_simple_history()
216
wt.rename_one('hello.txt', 'subdir/hello.txt')
217
out, err = self.run_bzr('commit -m renamed')
218
self.assertEqual('', out)
220
'Committing to: %s/' % osutils.getcwd(),
222
'renamed hello.txt => subdir/hello.txt',
223
'Committed revision 2.',
225
}, set(err.split('\n')))
227
def test_verbose_commit_with_unknown(self):
228
"""Unknown files should not be listed by default in verbose output"""
229
# Is that really the best policy?
230
wt = ControlDir.create_standalone_workingtree('.')
231
self.build_tree(['hello.txt', 'extra.txt'])
232
wt.add(['hello.txt'])
233
out, err = self.run_bzr('commit -m added')
234
self.assertEqual('', out)
235
self.assertContainsRe(err, '^Committing to: .*\n'
236
'added hello\\.txt\n'
237
'Committed revision 1\\.\n$')
239
def test_verbose_commit_with_unchanged(self):
240
"""Unchanged files should not be listed by default in verbose output"""
241
tree = self.make_branch_and_tree('.')
242
self.build_tree(['hello.txt', 'unchanged.txt'])
243
tree.add('unchanged.txt')
244
self.run_bzr('commit -m unchanged unchanged.txt')
245
tree.add("hello.txt")
246
out, err = self.run_bzr('commit -m added')
247
self.assertEqual('', out)
248
self.assertContainsRe(err, '^Committing to: .*\n'
249
'added hello\\.txt\n'
250
'Committed revision 2\\.$\n')
252
def test_verbose_commit_includes_master_location(self):
253
"""Location of master is displayed when committing to bound branch"""
254
a_tree = self.make_branch_and_tree('a')
255
self.build_tree(['a/b'])
257
a_tree.commit(message='Initial message')
259
b_tree = a_tree.branch.create_checkout('b')
260
expected = "%s/" % (osutils.abspath('a'), )
261
out, err = self.run_bzr('commit -m blah --unchanged', working_dir='b')
262
self.assertEqual(err, 'Committing to: %s\n'
263
'Committed revision 2.\n' % expected)
265
def test_commit_sanitizes_CR_in_message(self):
266
# See bug #433779, basically Emacs likes to pass '\r\n' style line
267
# endings to 'brz commit -m ""' which breaks because we don't allow
268
# '\r' in commit messages. (Mostly because of issues where XML style
269
# formats arbitrarily strip it out of the data while parsing.)
270
# To make life easier for users, we just always translate '\r\n' =>
271
# '\n'. And '\r' => '\n'.
272
a_tree = self.make_branch_and_tree('a')
273
self.build_tree(['a/b'])
275
self.run_bzr(['commit',
276
'-m', 'a string\r\n\r\nwith mixed\r\rendings\n'],
278
rev_id = a_tree.branch.last_revision()
279
rev = a_tree.branch.repository.get_revision(rev_id)
280
self.assertEqualDiff('a string\n\nwith mixed\n\nendings\n',
283
def test_commit_merge_reports_all_modified_files(self):
284
# the commit command should show all the files that are shown by
285
# brz diff or brz status when committing, even when they were not
286
# changed by the user but rather through doing a merge.
287
this_tree = self.make_branch_and_tree('this')
288
# we need a bunch of files and dirs, to perform one action on each.
291
'this/dirtoreparent/',
294
'this/filetoreparent',
311
this_tree.commit('create_files')
312
other_dir = this_tree.controldir.sprout('other')
313
other_tree = other_dir.open_workingtree()
314
with other_tree.lock_write():
315
# perform the needed actions on the files and dirs.
316
other_tree.rename_one('dirtorename', 'renameddir')
317
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
318
other_tree.rename_one('filetorename', 'renamedfile')
319
other_tree.rename_one('filetoreparent',
320
'renameddir/reparentedfile')
321
other_tree.remove(['dirtoremove', 'filetoremove'])
322
self.build_tree_contents([
324
('other/filetomodify', b'new content'),
325
('other/newfile', b'new file content')])
326
other_tree.add('newfile')
327
other_tree.add('newdir/')
328
other_tree.commit('modify all sample files and dirs.')
329
this_tree.merge_from_branch(other_tree.branch)
330
out, err = self.run_bzr('commit -m added', working_dir='this')
331
self.assertEqual('', out)
333
'Committing to: %s/' % osutils.pathjoin(osutils.getcwd(), 'this'),
334
'modified filetomodify',
337
'renamed dirtorename => renameddir',
338
'renamed filetorename => renamedfile',
339
'renamed dirtoreparent => renameddir/reparenteddir',
340
'renamed filetoreparent => renameddir/reparentedfile',
341
'deleted dirtoremove',
342
'deleted filetoremove',
343
'Committed revision 2.',
345
}, set(err.split('\n')))
347
def test_empty_commit_message(self):
348
tree = self.make_branch_and_tree('.')
349
self.build_tree_contents([('foo.c', b'int main() {}')])
351
self.run_bzr('commit -m ""')
353
def test_other_branch_commit(self):
354
# this branch is to ensure consistent behaviour, whether we're run
355
# inside a branch, or not.
356
outer_tree = self.make_branch_and_tree('.')
357
inner_tree = self.make_branch_and_tree('branch')
358
self.build_tree_contents([
359
('branch/foo.c', b'int main() {}'),
360
('branch/bar.c', b'int main() {}')])
361
inner_tree.add(['foo.c', 'bar.c'])
362
# can't commit files in different trees; sane error
363
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
364
# can commit to branch - records foo.c only
365
self.run_bzr('commit -m newstuff branch/foo.c')
366
# can commit to branch - records bar.c
367
self.run_bzr('commit -m newstuff branch')
369
self.run_bzr_error(["No changes to commit"],
370
'commit -m newstuff branch')
372
def test_out_of_date_tree_commit(self):
373
# check we get an error code and a clear message committing with an out
375
tree = self.make_branch_and_tree('branch')
377
checkout = tree.branch.create_checkout('checkout', lightweight=True)
378
# commit to the original branch to make the checkout out of date
379
tree.commit('message branch', allow_pointless=True)
380
# now commit to the checkout should emit
381
# ERROR: Out of date with the branch, 'brz update' is suggested
382
output = self.run_bzr('commit --unchanged -m checkout_message '
383
'checkout', retcode=3)
384
self.assertEqual(output,
386
"brz: ERROR: Working tree is out of date, please "
387
"run 'brz update'.\n"))
389
def test_local_commit_unbound(self):
390
# a --local commit on an unbound branch is an error
391
self.make_branch_and_tree('.')
392
out, err = self.run_bzr('commit --local', retcode=3)
393
self.assertEqualDiff('', out)
394
self.assertEqualDiff('brz: ERROR: Cannot perform local-only commits '
395
'on unbound branches.\n', err)
397
def test_commit_a_text_merge_in_a_checkout(self):
398
# checkouts perform multiple actions in a transaction across bond
399
# branches and their master, and have been observed to fail in the
400
# past. This is a user story reported to fail in bug #43959 where
401
# a merge done in a checkout (using the update command) failed to
403
trunk = self.make_branch_and_tree('trunk')
405
u1 = trunk.branch.create_checkout('u1')
406
self.build_tree_contents([('u1/hosts', b'initial contents\n')])
408
self.run_bzr('commit -m add-hosts u1')
410
u2 = trunk.branch.create_checkout('u2')
411
self.build_tree_contents([('u2/hosts', b'altered in u2\n')])
412
self.run_bzr('commit -m checkin-from-u2 u2')
414
# make an offline commits
415
self.build_tree_contents(
416
[('u1/hosts', b'first offline change in u1\n')])
417
self.run_bzr('commit -m checkin-offline --local u1')
419
# now try to pull in online work from u2, and then commit our offline
421
# retcode 1 as we expect a text conflict
422
self.run_bzr('update u1', retcode=1)
423
self.assertFileEqual(b'''\
425
first offline change in u1
432
self.run_bzr('resolved u1/hosts')
433
# add a text change here to represent resolving the merge conflicts in
434
# favour of a new version of the file not identical to either the u1
435
# version or the u2 version.
436
self.build_tree_contents([('u1/hosts', b'merge resolution\n')])
437
self.run_bzr('commit -m checkin-merge-of-the-offline-work-from-u1 u1')
439
def test_commit_exclude_excludes_modified_files(self):
440
"""Commit -x foo should ignore changes to foo."""
441
tree = self.make_branch_and_tree('.')
442
self.build_tree(['a', 'b', 'c'])
443
tree.smart_add(['.'])
444
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b'])
445
self.assertFalse('added b' in out)
446
self.assertFalse('added b' in err)
447
# If b was excluded it will still be 'added' in status.
448
out, err = self.run_bzr(['added'])
449
self.assertEqual('b\n', out)
450
self.assertEqual('', err)
452
def test_commit_exclude_twice_uses_both_rules(self):
453
"""Commit -x foo -x bar should ignore changes to foo and bar."""
454
tree = self.make_branch_and_tree('.')
455
self.build_tree(['a', 'b', 'c'])
456
tree.smart_add(['.'])
457
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b', '-x', 'c'])
458
self.assertFalse('added b' in out)
459
self.assertFalse('added c' in out)
460
self.assertFalse('added b' in err)
461
self.assertFalse('added c' in err)
462
# If b was excluded it will still be 'added' in status.
463
out, err = self.run_bzr(['added'])
464
self.assertTrue('b\n' in out)
465
self.assertTrue('c\n' in out)
466
self.assertEqual('', err)
468
def test_commit_respects_spec_for_removals(self):
469
"""Commit with a file spec should only commit removals that match"""
470
t = self.make_branch_and_tree('.')
471
self.build_tree(['file-a', 'dir-a/', 'dir-a/file-b'])
472
t.add(['file-a', 'dir-a', 'dir-a/file-b'])
474
t.remove(['file-a', 'dir-a/file-b'])
475
result = self.run_bzr('commit . -m removed-file-b',
476
working_dir='dir-a')[1]
477
self.assertNotContainsRe(result, 'file-a')
478
result = self.run_bzr('status', working_dir='dir-a')[0]
479
self.assertContainsRe(result, 'removed:\n file-a')
481
def test_strict_commit(self):
482
"""Commit with --strict works if everything is known"""
483
ignores._set_user_ignores([])
484
tree = self.make_branch_and_tree('tree')
485
self.build_tree(['tree/a'])
487
# A simple change should just work
488
self.run_bzr('commit --strict -m adding-a', working_dir='tree')
490
def test_strict_commit_no_changes(self):
491
"""commit --strict gives "no changes" if there is nothing to commit"""
492
tree = self.make_branch_and_tree('tree')
493
self.build_tree(['tree/a'])
495
tree.commit('adding a')
497
# With no changes, it should just be 'no changes'
498
# Make sure that commit is failing because there is nothing to do
499
self.run_bzr_error(['No changes to commit'],
500
'commit --strict -m no-changes',
503
# But --strict doesn't care if you supply --unchanged
504
self.run_bzr('commit --strict --unchanged -m no-changes',
507
def test_strict_commit_unknown(self):
508
"""commit --strict fails if a file is unknown"""
509
tree = self.make_branch_and_tree('tree')
510
self.build_tree(['tree/a'])
512
tree.commit('adding a')
514
# Add one file so there is a change, but forget the other
515
self.build_tree(['tree/b', 'tree/c'])
517
self.run_bzr_error(['Commit refused because there are unknown files'],
518
'commit --strict -m add-b',
521
# --no-strict overrides --strict
522
self.run_bzr('commit --strict -m add-b --no-strict',
525
def test_fixes_bug_output(self):
526
"""commit --fixes=lp:23452 succeeds without output."""
527
tree = self.make_branch_and_tree('tree')
528
self.build_tree(['tree/hello.txt'])
529
tree.add('hello.txt')
530
output, err = self.run_bzr(
531
'commit -m hello --fixes=lp:23452 tree/hello.txt')
532
self.assertEqual('', output)
533
self.assertContainsRe(err, 'Committing to: .*\n'
534
'added hello\\.txt\n'
535
'Committed revision 1\\.\n')
537
def test_fixes_bug_unicode(self):
538
"""commit --fixes=lp:unicode succeeds without output."""
539
tree = self.make_branch_and_tree('tree')
540
self.build_tree(['tree/hello.txt'])
541
tree.add('hello.txt')
542
output, err = self.run_bzr_raw(
543
['commit', '-m', 'hello',
544
u'--fixes=generic:\u20ac', 'tree/hello.txt'],
545
encoding='utf-8', retcode=3)
546
self.assertEqual(b'', output)
547
self.assertContainsRe(err,
548
b'brz: ERROR: Unrecognized bug generic:\xe2\x82\xac\\. Commit refused.\n')
550
def test_no_bugs_no_properties(self):
551
"""If no bugs are fixed, the bugs property is not set.
553
see https://beta.launchpad.net/bzr/+bug/109613
555
tree = self.make_branch_and_tree('tree')
556
self.build_tree(['tree/hello.txt'])
557
tree.add('hello.txt')
558
self.run_bzr('commit -m hello tree/hello.txt')
559
# Get the revision properties, ignoring the branch-nick property, which
560
# we don't care about for this test.
561
last_rev = tree.branch.repository.get_revision(tree.last_revision())
562
properties = dict(last_rev.properties)
563
del properties['branch-nick']
564
self.assertFalse('bugs' in properties)
566
def test_bugs_sets_property(self):
567
"""commit --bugs=lp:234 sets the lp:234 revprop to 'related'."""
568
tree = self.make_branch_and_tree('tree')
569
self.build_tree(['tree/hello.txt'])
570
tree.add('hello.txt')
571
self.run_bzr('commit -m hello --bugs=lp:234 tree/hello.txt')
573
# Get the revision properties, ignoring the branch-nick property, which
574
# we don't care about for this test.
575
last_rev = tree.branch.repository.get_revision(tree.last_revision())
576
properties = dict(last_rev.properties)
577
del properties[u'branch-nick']
579
self.assertEqual({u'bugs': 'https://launchpad.net/bugs/234 related'},
582
def test_fixes_bug_sets_property(self):
583
"""commit --fixes=lp:234 sets the lp:234 revprop to 'fixed'."""
584
tree = self.make_branch_and_tree('tree')
585
self.build_tree(['tree/hello.txt'])
586
tree.add('hello.txt')
587
self.run_bzr('commit -m hello --fixes=lp:234 tree/hello.txt')
589
# Get the revision properties, ignoring the branch-nick property, which
590
# we don't care about for this test.
591
last_rev = tree.branch.repository.get_revision(tree.last_revision())
592
properties = dict(last_rev.properties)
593
del properties[u'branch-nick']
595
self.assertEqual({u'bugs': 'https://launchpad.net/bugs/234 fixed'},
598
def test_fixes_multiple_bugs_sets_properties(self):
599
"""--fixes can be used more than once to show that bugs are fixed."""
600
tree = self.make_branch_and_tree('tree')
601
self.build_tree(['tree/hello.txt'])
602
tree.add('hello.txt')
603
self.run_bzr('commit -m hello --fixes=lp:123 --fixes=lp:235'
606
# Get the revision properties, ignoring the branch-nick property, which
607
# we don't care about for this test.
608
last_rev = tree.branch.repository.get_revision(tree.last_revision())
609
properties = dict(last_rev.properties)
610
del properties['branch-nick']
613
{u'bugs': 'https://launchpad.net/bugs/123 fixed\n'
614
'https://launchpad.net/bugs/235 fixed'},
617
def test_fixes_bug_with_alternate_trackers(self):
618
"""--fixes can be used on a properly configured branch to mark bug
619
fixes on multiple trackers.
621
tree = self.make_branch_and_tree('tree')
622
tree.branch.get_config().set_user_option(
623
'trac_twisted_url', 'http://twistedmatrix.com/trac')
624
self.build_tree(['tree/hello.txt'])
625
tree.add('hello.txt')
627
'commit -m hello --fixes=lp:123 --fixes=twisted:235 tree/')
629
# Get the revision properties, ignoring the branch-nick property, which
630
# we don't care about for this test.
631
last_rev = tree.branch.repository.get_revision(tree.last_revision())
632
properties = dict(last_rev.properties)
633
del properties['branch-nick']
636
{'bugs': 'https://launchpad.net/bugs/123 fixed\n'
637
'http://twistedmatrix.com/trac/ticket/235 fixed'},
640
def test_fixes_unknown_bug_prefix(self):
641
tree = self.make_branch_and_tree('tree')
642
self.build_tree(['tree/hello.txt'])
643
tree.add('hello.txt')
645
["Unrecognized bug %s. Commit refused." % 'xxx:123'],
646
'commit -m add-b --fixes=xxx:123',
649
def test_fixes_bug_with_default_tracker(self):
650
"""commit --fixes=234 uses the default bug tracker."""
651
tree = self.make_branch_and_tree('tree')
652
self.build_tree(['tree/hello.txt'])
653
tree.add('hello.txt')
655
["brz: ERROR: No tracker specified for bug 123. Use the form "
656
"'tracker:id' or specify a default bug tracker using the "
657
"`bugtracker` option.\n"
658
"See \"brz help bugs\" for more information on this feature. "
660
'commit -m add-b --fixes=123',
662
tree.branch.get_config_stack().set("bugtracker", "lp")
663
self.run_bzr('commit -m hello --fixes=234 tree/hello.txt')
664
last_rev = tree.branch.repository.get_revision(tree.last_revision())
665
self.assertEqual('https://launchpad.net/bugs/234 fixed',
666
last_rev.properties['bugs'])
668
def test_fixes_invalid_bug_number(self):
669
tree = self.make_branch_and_tree('tree')
670
self.build_tree(['tree/hello.txt'])
671
tree.add('hello.txt')
673
["Did not understand bug identifier orange: Must be an integer. "
674
"See \"brz help bugs\" for more information on this feature.\n"
676
'commit -m add-b --fixes=lp:orange',
679
def test_fixes_invalid_argument(self):
680
"""Raise an appropriate error when the fixes argument isn't tag:id."""
681
tree = self.make_branch_and_tree('tree')
682
self.build_tree(['tree/hello.txt'])
683
tree.add('hello.txt')
685
[r"Invalid bug orange:apples:bananas. Must be in the form of "
686
r"'tracker:id'\. See \"brz help bugs\" for more information on "
687
r"this feature.\nCommit refused\."],
688
'commit -m add-b --fixes=orange:apples:bananas',
691
def test_no_author(self):
692
"""If the author is not specified, the author property is not set."""
693
tree = self.make_branch_and_tree('tree')
694
self.build_tree(['tree/hello.txt'])
695
tree.add('hello.txt')
696
self.run_bzr('commit -m hello tree/hello.txt')
697
last_rev = tree.branch.repository.get_revision(tree.last_revision())
698
properties = last_rev.properties
699
self.assertFalse('author' in properties)
701
def test_author_sets_property(self):
702
"""commit --author='John Doe <jdoe@example.com>' sets the author
705
tree = self.make_branch_and_tree('tree')
706
self.build_tree(['tree/hello.txt'])
707
tree.add('hello.txt')
708
self.run_bzr(["commit", '-m', 'hello',
709
'--author', u'John D\xf6 <jdoe@example.com>',
711
last_rev = tree.branch.repository.get_revision(tree.last_revision())
712
properties = last_rev.properties
713
self.assertEqual(u'John D\xf6 <jdoe@example.com>',
714
properties['authors'])
716
def test_author_no_email(self):
717
"""Author's name without an email address is allowed, too."""
718
tree = self.make_branch_and_tree('tree')
719
self.build_tree(['tree/hello.txt'])
720
tree.add('hello.txt')
721
out, err = self.run_bzr("commit -m hello --author='John Doe' "
723
last_rev = tree.branch.repository.get_revision(tree.last_revision())
724
properties = last_rev.properties
725
self.assertEqual('John Doe', properties['authors'])
727
def test_multiple_authors(self):
728
"""Multiple authors can be specyfied, and all are stored."""
729
tree = self.make_branch_and_tree('tree')
730
self.build_tree(['tree/hello.txt'])
731
tree.add('hello.txt')
732
out, err = self.run_bzr("commit -m hello --author='John Doe' "
733
"--author='Jane Rey' tree/hello.txt")
734
last_rev = tree.branch.repository.get_revision(tree.last_revision())
735
properties = last_rev.properties
736
self.assertEqual('John Doe\nJane Rey', properties['authors'])
738
def test_commit_time(self):
739
tree = self.make_branch_and_tree('tree')
740
self.build_tree(['tree/hello.txt'])
741
tree.add('hello.txt')
742
out, err = self.run_bzr("commit -m hello "
743
"--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
744
last_rev = tree.branch.repository.get_revision(tree.last_revision())
746
'Sat 2009-10-10 08:00:00 +0100',
747
osutils.format_date(last_rev.timestamp, last_rev.timezone))
749
def test_commit_time_bad_time(self):
750
tree = self.make_branch_and_tree('tree')
751
self.build_tree(['tree/hello.txt'])
752
tree.add('hello.txt')
753
out, err = self.run_bzr("commit -m hello "
754
"--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
755
self.assertStartsWith(
756
err, "brz: ERROR: Could not parse --commit-time:")
758
def test_commit_time_missing_tz(self):
759
tree = self.make_branch_and_tree('tree')
760
self.build_tree(['tree/hello.txt'])
761
tree.add('hello.txt')
762
out, err = self.run_bzr("commit -m hello "
763
"--commit-time='2009-10-10 08:00:00' tree/hello.txt", retcode=3)
764
self.assertStartsWith(
765
err, "brz: ERROR: Could not parse --commit-time:")
766
# Test that it is actually checking and does not simply crash with
767
# some other exception
768
self.assertContainsString(err, "missing a timezone offset")
770
def test_partial_commit_with_renames_in_tree(self):
771
# this test illustrates bug #140419
772
t = self.make_branch_and_tree('.')
773
self.build_tree(['dir/', 'dir/a', 'test'])
774
t.add(['dir/', 'dir/a', 'test'])
775
t.commit('initial commit')
776
# important part: file dir/a should change parent
777
# and should appear before old parent
778
# then during partial commit we have error
779
# parent_id {dir-XXX} not in inventory
780
t.rename_one('dir/a', 'a')
781
self.build_tree_contents([('test', b'changes in test')])
783
out, err = self.run_bzr('commit test -m "partial commit"')
784
self.assertEqual('', out)
785
self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
787
def test_commit_readonly_checkout(self):
788
# https://bugs.launchpad.net/bzr/+bug/129701
789
# "UnlockableTransport error trying to commit in checkout of readonly
791
self.make_branch('master')
792
master = ControlDir.open_from_transport(
793
self.get_readonly_transport('master')).open_branch()
794
master.create_checkout('checkout')
795
out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
797
self.assertContainsRe(err,
798
r'^brz: ERROR: Cannot lock.*readonly transport')
800
def setup_editor(self):
801
# Test that commit template hooks work
802
if sys.platform == "win32":
803
with open('fed.bat', 'w') as f:
804
f.write('@rem dummy fed')
805
self.overrideEnv('BRZ_EDITOR', "fed.bat")
807
with open('fed.sh', 'wb') as f:
808
f.write(b'#!/bin/sh\n')
809
os.chmod('fed.sh', 0o755)
810
self.overrideEnv('BRZ_EDITOR', "./fed.sh")
812
def setup_commit_with_template(self):
814
msgeditor.hooks.install_named_hook("commit_message_template",
815
lambda commit_obj, msg: "save me some typing\n", None)
816
tree = self.make_branch_and_tree('tree')
817
self.build_tree(['tree/hello.txt'])
818
tree.add('hello.txt')
821
def test_edit_empty_message(self):
822
tree = self.make_branch_and_tree('tree')
824
self.build_tree(['tree/hello.txt'])
825
tree.add('hello.txt')
826
out, err = self.run_bzr("commit tree/hello.txt", retcode=3,
828
self.assertContainsRe(err,
829
"brz: ERROR: Empty commit message specified")
831
def test_commit_hook_template_accepted(self):
832
tree = self.setup_commit_with_template()
833
out, err = self.run_bzr("commit tree/hello.txt", stdin="y\n")
834
last_rev = tree.branch.repository.get_revision(tree.last_revision())
835
self.assertEqual('save me some typing\n', last_rev.message)
837
def test_commit_hook_template_rejected(self):
838
tree = self.setup_commit_with_template()
839
expected = tree.last_revision()
840
out, err = self.run_bzr_error(["Empty commit message specified."
841
" Please specify a commit message with either"
842
" --message or --file or leave a blank message"
843
" with --message \"\"."],
844
"commit tree/hello.txt", stdin="n\n")
845
self.assertEqual(expected, tree.last_revision())
847
def test_set_commit_message(self):
848
msgeditor.hooks.install_named_hook("set_commit_message",
849
lambda commit_obj, msg: "save me some typing\n", None)
850
tree = self.make_branch_and_tree('tree')
851
self.build_tree(['tree/hello.txt'])
852
tree.add('hello.txt')
853
out, err = self.run_bzr("commit tree/hello.txt")
854
last_rev = tree.branch.repository.get_revision(tree.last_revision())
855
self.assertEqual('save me some typing\n', last_rev.message)
857
def test_commit_without_username(self):
858
"""Ensure commit error if username is not set.
860
self.run_bzr(['init', 'foo'])
861
with open('foo/foo.txt', 'w') as f:
863
self.run_bzr(['add'], working_dir='foo')
864
override_whoami(self)
866
['Unable to determine your name'],
867
['commit', '-m', 'initial'], working_dir='foo')
869
def test_commit_recursive_checkout(self):
870
"""Ensure that a commit to a recursive checkout fails cleanly.
872
self.run_bzr(['init', 'test_branch'])
873
self.run_bzr(['checkout', 'test_branch', 'test_checkout'])
875
self.run_bzr(['bind', '.'], working_dir='test_checkout')
876
with open('test_checkout/foo.txt', 'w') as f:
878
self.run_bzr(['add'], working_dir='test_checkout')
879
out, err = self.run_bzr_error(
880
['Branch.*test_checkout.*appears to be bound to itself'],
881
['commit', '-m', 'addedfoo'], working_dir='test_checkout')
883
def test_mv_dirs_non_ascii(self):
884
"""Move directory with non-ascii name and containing files.
886
Regression test for bug 185211.
888
tree = self.make_branch_and_tree('.')
889
self.build_tree([u'abc\xa7/', u'abc\xa7/foo'])
891
tree.add([u'abc\xa7/', u'abc\xa7/foo'])
892
tree.commit('checkin')
894
tree.rename_one(u'abc\xa7', 'abc')
896
self.run_bzr('ci -m "non-ascii mv"')
899
class TestSmartServerCommit(TestCaseWithTransport):
901
def test_commit_to_lightweight(self):
902
self.setup_smart_server_with_call_log()
903
t = self.make_branch_and_tree('from')
904
for count in range(9):
905
t.commit(message='commit %d' % count)
906
out, err = self.run_bzr(['checkout', '--lightweight', self.get_url('from'),
908
self.reset_smart_call_log()
909
self.build_tree(['target/afile'])
910
self.run_bzr(['add', 'target/afile'])
911
out, err = self.run_bzr(['commit', '-m', 'do something', 'target'])
912
# This figure represent the amount of work to perform this use case. It
913
# is entirely ok to reduce this number if a test fails due to rpc_count
914
# being too low. If rpc_count increases, more network roundtrips have
915
# become necessary for this use case. Please do not adjust this number
916
# upwards without agreement from bzr's network support maintainers.
917
self.assertLength(211, self.hpss_calls)
918
self.assertLength(2, self.hpss_connections)
919
self.expectFailure("commit still uses VFS calls",
920
self.assertThat, self.hpss_calls, ContainsNoVfsCalls)
added
removed
breezy/tests/blackbox/test_commit.py
