40
36
def test_05_empty_commit(self):
41
37
"""Commit of tree with no versioned files should fail"""
42
38
# If forced, it should succeed, but this is not tested here.
43
self.make_branch_and_tree('.')
44
40
self.build_tree(['hello.txt'])
45
out,err = self.run_bzr('commit -m empty', retcode=3)
41
out,err = self.run_bzr("commit", "-m", "empty", retcode=3)
46
42
self.assertEqual('', out)
47
self.assertContainsRe(err, 'bzr: ERROR: No changes to commit\.'
48
' Use --unchanged to commit anyhow.\n')
43
self.assertStartsWith(err, 'bzr: ERROR: no changes to commit.'
44
' use --unchanged to commit anyhow\n')
50
46
def test_commit_success(self):
51
47
"""Successful commit should not leave behind a bzr-commit-* file"""
52
self.make_branch_and_tree('.')
53
self.run_bzr('commit --unchanged -m message')
54
self.assertEqual('', self.run_bzr('unknowns')[0])
49
self.run_bzr("commit", "--unchanged", "-m", "message")
50
self.assertEqual('', self.capture('unknowns'))
56
52
# same for unicode messages
57
self.run_bzr(["commit", "--unchanged", "-m", u'foo\xb5'])
58
self.assertEqual('', self.run_bzr('unknowns')[0])
53
self.run_bzr("commit", "--unchanged", "-m", u'foo\xb5')
54
self.assertEqual('', self.capture('unknowns'))
60
56
def test_commit_with_path(self):
61
57
"""Commit tree with path of root specified"""
62
a_tree = self.make_branch_and_tree('a')
58
self.run_bzr('init', 'a')
63
59
self.build_tree(['a/a_file'])
65
self.run_bzr(['commit', '-m', 'first commit', 'a'])
60
self.run_bzr('add', 'a/a_file')
61
self.run_bzr('commit', '-m', 'first commit', 'a')
67
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
63
self.run_bzr('branch', 'a', 'b')
68
64
self.build_tree_contents([('b/a_file', 'changes in b')])
69
self.run_bzr(['commit', '-m', 'first commit in b', 'b'])
65
self.run_bzr('commit', '-m', 'first commit in b', 'b')
71
67
self.build_tree_contents([('a/a_file', 'new contents')])
72
self.run_bzr(['commit', '-m', 'change in a', 'a'])
68
self.run_bzr('commit', '-m', 'change in a', 'a')
74
b_tree.merge_from_branch(a_tree.branch)
75
self.assertEqual(len(b_tree.conflicts()), 1)
76
self.run_bzr('resolved b/a_file')
77
self.run_bzr(['commit', '-m', 'merge into b', 'b'])
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')
80
77
def test_10_verbose_commit(self):
81
78
"""Add one file and examine verbose commit output"""
82
tree = self.make_branch_and_tree('.')
83
80
self.build_tree(['hello.txt'])
85
out,err = self.run_bzr('commit -m added')
81
self.runbzr("add hello.txt")
82
out,err = self.run_bzr("commit", "-m", "added")
86
83
self.assertEqual('', out)
87
self.assertContainsRe(err, '^Committing to: .*\n'
89
'Committed revision 1.\n$',)
84
self.assertEqual('added hello.txt\n'
85
'Committed revision 1.\n',
91
88
def prepare_simple_history(self):
92
89
"""Prepare and return a working tree with one commit of one file"""
101
98
# Verbose commit of modified file should say so
102
99
wt = self.prepare_simple_history()
103
100
self.build_tree_contents([('hello.txt', 'new contents')])
104
out, err = self.run_bzr('commit -m modified')
101
out, err = self.run_bzr("commit", "-m", "modified")
105
102
self.assertEqual('', out)
106
self.assertContainsRe(err, '^Committing to: .*\n'
107
'modified hello\.txt\n'
108
'Committed revision 2\.\n$')
110
def test_warn_about_forgotten_commit_message(self):
111
"""Test that the lack of -m parameter is caught"""
112
wt = self.make_branch_and_tree('.')
113
self.build_tree(['one', 'two'])
115
out, err = self.run_bzr('commit -m one two')
116
self.assertContainsRe(err, "The commit message is a file name")
103
self.assertEqual('modified hello.txt\n'
104
'Committed revision 2.\n',
118
107
def test_verbose_commit_renamed(self):
119
108
# Verbose commit of renamed file should say so
120
109
wt = self.prepare_simple_history()
121
110
wt.rename_one('hello.txt', 'gutentag.txt')
122
out, err = self.run_bzr('commit -m renamed')
111
out, err = self.run_bzr("commit", "-m", "renamed")
123
112
self.assertEqual('', out)
124
self.assertContainsRe(err, '^Committing to: .*\n'
125
'renamed hello\.txt => gutentag\.txt\n'
126
'Committed revision 2\.$\n')
113
self.assertEqual('renamed hello.txt => gutentag.txt\n'
114
'Committed revision 2.\n',
128
117
def test_verbose_commit_moved(self):
129
118
# Verbose commit of file moved to new directory should say so
147
133
wt = BzrDir.create_standalone_workingtree('.')
148
134
self.build_tree(['hello.txt', 'extra.txt'])
149
135
wt.add(['hello.txt'])
150
out,err = self.run_bzr('commit -m added')
136
out,err = self.run_bzr("commit", "-m", "added")
151
137
self.assertEqual('', out)
152
self.assertContainsRe(err, '^Committing to: .*\n'
154
'Committed revision 1\.\n$')
138
self.assertEqual('added hello.txt\n'
139
'Committed revision 1.\n',
156
142
def test_verbose_commit_with_unchanged(self):
157
143
"""Unchanged files should not be listed by default in verbose output"""
158
tree = self.make_branch_and_tree('.')
159
145
self.build_tree(['hello.txt', 'unchanged.txt'])
160
tree.add('unchanged.txt')
161
self.run_bzr('commit -m unchanged unchanged.txt')
162
tree.add("hello.txt")
163
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")
164
150
self.assertEqual('', out)
165
self.assertContainsRe(err, '^Committing to: .*\n'
167
'Committed revision 2\.$\n')
169
def test_verbose_commit_includes_master_location(self):
170
"""Location of master is displayed when committing to bound branch"""
171
a_tree = self.make_branch_and_tree('a')
172
self.build_tree(['a/b'])
174
a_tree.commit(message='Initial message')
176
b_tree = a_tree.branch.create_checkout('b')
177
expected = "%s/" % (osutils.abspath('a'), )
178
out, err = self.run_bzr('commit -m blah --unchanged', working_dir='b')
179
self.assertEqual(err, 'Committing to: %s\n'
180
'Committed revision 2.\n' % expected)
182
def test_commit_sanitizes_CR_in_message(self):
183
# See bug #433779, basically Emacs likes to pass '\r\n' style line
184
# endings to 'bzr commit -m ""' which breaks because we don't allow
185
# '\r' in commit messages. (Mostly because of issues where XML style
186
# formats arbitrarily strip it out of the data while parsing.)
187
# To make life easier for users, we just always translate '\r\n' =>
188
# '\n'. And '\r' => '\n'.
189
a_tree = self.make_branch_and_tree('a')
190
self.build_tree(['a/b'])
192
self.run_bzr(['commit',
193
'-m', 'a string\r\n\r\nwith mixed\r\rendings\n'],
195
rev_id = a_tree.branch.last_revision()
196
rev = a_tree.branch.repository.get_revision(rev_id)
197
self.assertEqualDiff('a string\n\nwith mixed\n\nendings\n',
151
self.assertEqual('added hello.txt\n'
152
'Committed revision 2.\n',
200
155
def test_commit_merge_reports_all_modified_files(self):
201
156
# the commit command should show all the files that are shown by
248
202
other_tree.unlock()
249
203
this_tree.merge_from_branch(other_tree.branch)
251
out,err = self.run_bzr('commit -m added')
205
out,err = self.run_bzr("commit", "-m", "added")
252
207
self.assertEqual('', out)
253
self.assertEqual(set([
254
'Committing to: %s/' % osutils.getcwd(),
255
'modified filetomodify',
258
'renamed dirtorename => renameddir',
259
'renamed filetorename => renamedfile',
260
'renamed dirtoreparent => renameddir/reparenteddir',
261
'renamed filetoreparent => renameddir/reparentedfile',
262
'deleted dirtoremove',
263
'deleted filetoremove',
264
'Committed revision 2.',
266
]), 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',
268
221
def test_empty_commit_message(self):
269
tree = self.make_branch_and_tree('.')
270
self.build_tree_contents([('foo.c', 'int main() {}')])
272
self.run_bzr('commit -m ""', retcode=3)
274
def test_unsupported_encoding_commit_message(self):
275
if sys.platform == 'win32':
276
raise tests.TestNotApplicable('Win32 parses arguments directly'
277
' as Unicode, so we can\'t pass invalid non-ascii')
278
tree = self.make_branch_and_tree('.')
279
self.build_tree_contents([('foo.c', 'int main() {}')])
281
# LANG env variable has no effect on Windows
282
# but some characters anyway cannot be represented
283
# in default user encoding
284
char = probe_bad_non_ascii(osutils.get_user_encoding())
286
raise TestSkipped('Cannot find suitable non-ascii character'
287
'for user_encoding (%s)' % osutils.get_user_encoding())
288
out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
290
env_changes={'LANG': 'C'})
291
self.assertContainsRe(err, r'bzrlib.errors.BzrError: Parameter.*is '
292
'unsupported by the current encoding.')
223
file('foo.c', 'wt').write('int main() {}')
224
self.runbzr(['add', 'foo.c'])
225
self.runbzr(["commit", "-m", ""] , retcode=3)
294
227
def test_other_branch_commit(self):
295
228
# this branch is to ensure consistent behaviour, whether we're run
296
229
# inside a branch, or not.
297
outer_tree = self.make_branch_and_tree('.')
298
inner_tree = self.make_branch_and_tree('branch')
299
self.build_tree_contents([
300
('branch/foo.c', 'int main() {}'),
301
('branch/bar.c', 'int main() {}')])
302
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'])
303
241
# can't commit files in different trees; sane error
304
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
305
# can commit to branch - records foo.c only
306
self.run_bzr('commit -m newstuff branch/foo.c')
307
# can commit to branch - records bar.c
308
self.run_bzr('commit -m newstuff branch')
310
self.run_bzr_error(["No changes to commit"], '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)
312
247
def test_out_of_date_tree_commit(self):
313
248
# check we get an error code and a clear message committing with an out
314
249
# of date checkout
315
tree = self.make_branch_and_tree('branch')
250
self.make_branch_and_tree('branch')
316
251
# make a checkout
317
checkout = tree.branch.create_checkout('checkout', lightweight=True)
252
self.runbzr('checkout --lightweight branch checkout')
318
253
# commit to the original branch to make the checkout out of date
319
tree.commit('message branch', allow_pointless=True)
254
self.runbzr('commit --unchanged -m message branch')
320
255
# now commit to the checkout should emit
321
256
# ERROR: Out of date with the branch, 'bzr update' is suggested
322
output = self.run_bzr('commit --unchanged -m checkout_message '
257
output = self.runbzr('commit --unchanged -m checkout_message '
323
258
'checkout', retcode=3)
324
259
self.assertEqual(output,
326
"bzr: ERROR: Working tree is out of date, please "
327
"run 'bzr update'.\n"))
261
"bzr: ERROR: Working tree is out of date, please run "
329
264
def test_local_commit_unbound(self):
330
265
# a --local commit on an unbound branch is an error
331
266
self.make_branch_and_tree('.')
332
out, err = self.run_bzr('commit --local', retcode=3)
267
out, err = self.run_bzr('commit', '--local', retcode=3)
333
268
self.assertEqualDiff('', out)
334
269
self.assertEqualDiff('bzr: ERROR: Cannot perform local-only commits '
335
270
'on unbound branches.\n', err)
337
272
def test_commit_a_text_merge_in_a_checkout(self):
338
273
# checkouts perform multiple actions in a transaction across bond
339
274
# branches and their master, and have been observed to fail in the
340
# 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
341
276
# a merge done in a checkout (using the update command) failed to
342
277
# commit correctly.
343
trunk = self.make_branch_and_tree('trunk')
345
u1 = trunk.branch.create_checkout('u1')
346
self.build_tree_contents([('u1/hosts', 'initial contents\n')])
348
self.run_bzr('commit -m add-hosts u1')
350
u2 = trunk.branch.create_checkout('u2')
351
self.build_tree_contents([('u2/hosts', 'altered in u2\n')])
352
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')
354
289
# make an offline commits
355
self.build_tree_contents([('u1/hosts', 'first offline change in u1\n')])
356
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')
358
293
# now try to pull in online work from u2, and then commit our offline
359
294
# work as a merge
360
295
# retcode 1 as we expect a text conflict
361
self.run_bzr('update u1', retcode=1)
362
self.assertFileEqual('''\
364
first offline change in u1
371
self.run_bzr('resolved u1/hosts')
296
self.run_bzr('update', 'u1', retcode=1)
297
self.run_bzr('resolved', 'u1/hosts')
372
298
# add a text change here to represent resolving the merge conflicts in
373
299
# favour of a new version of the file not identical to either the u1
374
300
# version or the u2 version.
375
301
self.build_tree_contents([('u1/hosts', 'merge resolution\n')])
376
self.run_bzr('commit -m checkin-merge-of-the-offline-work-from-u1 u1')
378
def test_commit_exclude_excludes_modified_files(self):
379
"""Commit -x foo should ignore changes to foo."""
380
tree = self.make_branch_and_tree('.')
381
self.build_tree(['a', 'b', 'c'])
382
tree.smart_add(['.'])
383
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b'])
384
self.assertFalse('added b' in out)
385
self.assertFalse('added b' in err)
386
# If b was excluded it will still be 'added' in status.
387
out, err = self.run_bzr(['added'])
388
self.assertEqual('b\n', out)
389
self.assertEqual('', err)
391
def test_commit_exclude_twice_uses_both_rules(self):
392
"""Commit -x foo -x bar should ignore changes to foo and bar."""
393
tree = self.make_branch_and_tree('.')
394
self.build_tree(['a', 'b', 'c'])
395
tree.smart_add(['.'])
396
out, err = self.run_bzr(['commit', '-m', 'test', '-x', 'b', '-x', 'c'])
397
self.assertFalse('added b' in out)
398
self.assertFalse('added c' in out)
399
self.assertFalse('added b' in err)
400
self.assertFalse('added c' in err)
401
# If b was excluded it will still be 'added' in status.
402
out, err = self.run_bzr(['added'])
403
self.assertTrue('b\n' in out)
404
self.assertTrue('c\n' in out)
405
self.assertEqual('', err)
302
self.run_bzr('commit', '-m', 'checkin merge of the offline work from u1', 'u1')
407
304
def test_commit_respects_spec_for_removals(self):
408
305
"""Commit with a file spec should only commit removals that match"""
573
470
self.build_tree(['tree/hello.txt'])
574
471
tree.add('hello.txt')
575
472
self.run_bzr_error(
576
[r"Invalid bug orange. Must be in the form of 'tracker:id'\. "
577
r"See \"bzr help bugs\" for more information on this feature.\n"
473
[r"Invalid bug orange. Must be in the form of 'tag:id'\. "
578
474
r"Commit refused\."],
579
'commit -m add-b --fixes=orange',
475
'commit', '-m', 'add b', '--fixes=orange',
580
476
working_dir='tree')
582
def test_no_author(self):
583
"""If the author is not specified, the author property is not set."""
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 tree/hello.txt')
588
last_rev = tree.branch.repository.get_revision(tree.last_revision())
589
properties = last_rev.properties
590
self.assertFalse('author' in properties)
592
def test_author_sets_property(self):
593
"""commit --author='John Doe <jdoe@example.com>' sets the author
596
tree = self.make_branch_and_tree('tree')
597
self.build_tree(['tree/hello.txt'])
598
tree.add('hello.txt')
599
self.run_bzr(["commit", '-m', 'hello',
600
'--author', u'John D\xf6 <jdoe@example.com>',
602
last_rev = tree.branch.repository.get_revision(tree.last_revision())
603
properties = last_rev.properties
604
self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['authors'])
606
def test_author_no_email(self):
607
"""Author's name without an email address is allowed, too."""
608
tree = self.make_branch_and_tree('tree')
609
self.build_tree(['tree/hello.txt'])
610
tree.add('hello.txt')
611
out, err = self.run_bzr("commit -m hello --author='John Doe' "
613
last_rev = tree.branch.repository.get_revision(tree.last_revision())
614
properties = last_rev.properties
615
self.assertEqual('John Doe', properties['authors'])
617
def test_multiple_authors(self):
618
"""Multiple authors can be specyfied, and all are stored."""
619
tree = self.make_branch_and_tree('tree')
620
self.build_tree(['tree/hello.txt'])
621
tree.add('hello.txt')
622
out, err = self.run_bzr("commit -m hello --author='John Doe' "
623
"--author='Jane Rey' tree/hello.txt")
624
last_rev = tree.branch.repository.get_revision(tree.last_revision())
625
properties = last_rev.properties
626
self.assertEqual('John Doe\nJane Rey', properties['authors'])
628
def test_commit_time(self):
629
tree = self.make_branch_and_tree('tree')
630
self.build_tree(['tree/hello.txt'])
631
tree.add('hello.txt')
632
out, err = self.run_bzr("commit -m hello "
633
"--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
634
last_rev = tree.branch.repository.get_revision(tree.last_revision())
636
'Sat 2009-10-10 08:00:00 +0100',
637
osutils.format_date(last_rev.timestamp, last_rev.timezone))
639
def test_commit_time_bad_time(self):
640
tree = self.make_branch_and_tree('tree')
641
self.build_tree(['tree/hello.txt'])
642
tree.add('hello.txt')
643
out, err = self.run_bzr("commit -m hello "
644
"--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
645
self.assertStartsWith(
646
err, "bzr: ERROR: Could not parse --commit-time:")
648
def test_partial_commit_with_renames_in_tree(self):
649
# this test illustrates bug #140419
650
t = self.make_branch_and_tree('.')
651
self.build_tree(['dir/', 'dir/a', 'test'])
652
t.add(['dir/', 'dir/a', 'test'])
653
t.commit('initial commit')
654
# important part: file dir/a should change parent
655
# and should appear before old parent
656
# then during partial commit we have error
657
# parent_id {dir-XXX} not in inventory
658
t.rename_one('dir/a', 'a')
659
self.build_tree_contents([('test', 'changes in test')])
661
out, err = self.run_bzr('commit test -m "partial commit"')
662
self.assertEquals('', out)
663
self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
665
def test_commit_readonly_checkout(self):
666
# https://bugs.edge.launchpad.net/bzr/+bug/129701
667
# "UnlockableTransport error trying to commit in checkout of readonly
669
self.make_branch('master')
670
master = BzrDir.open_from_transport(
671
self.get_readonly_transport('master')).open_branch()
672
master.create_checkout('checkout')
673
out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
675
self.assertContainsRe(err,
676
r'^bzr: ERROR: Cannot lock.*readonly transport')
678
def test_commit_hook_template(self):
679
# Test that commit template hooks work
680
if sys.platform == "win32":
681
f = file('fed.bat', 'w')
682
f.write('@rem dummy fed')
684
osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
686
f = file('fed.sh', 'wb')
687
f.write('#!/bin/sh\n')
689
os.chmod('fed.sh', 0755)
690
osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
691
msgeditor.hooks.install_named_hook("commit_message_template",
692
lambda commit_obj, msg: "save me some typing\n", None)
693
tree = self.make_branch_and_tree('tree')
694
self.build_tree(['tree/hello.txt'])
695
tree.add('hello.txt')
696
out, err = self.run_bzr("commit tree/hello.txt")
697
last_rev = tree.branch.repository.get_revision(tree.last_revision())
698
self.assertEqual('save me some typing\n', last_rev.message)
added
removed
bzrlib/tests/blackbox/test_commit.py
