39
36
def test_05_empty_commit(self):
40
37
"""Commit of tree with no versioned files should fail"""
41
38
# If forced, it should succeed, but this is not tested here.
42
self.make_branch_and_tree('.')
43
40
self.build_tree(['hello.txt'])
44
41
out,err = self.run_bzr('commit -m empty', retcode=3)
45
42
self.assertEqual('', out)
46
self.assertContainsRe(err, 'bzr: ERROR: no changes to commit\.'
43
self.assertStartsWith(err, 'bzr: ERROR: no changes to commit.'
47
44
' use --unchanged to commit anyhow\n')
49
46
def test_commit_success(self):
50
47
"""Successful commit should not leave behind a bzr-commit-* file"""
51
self.make_branch_and_tree('.')
52
49
self.run_bzr('commit --unchanged -m message')
53
50
self.assertEqual('', self.run_bzr('unknowns')[0])
59
56
def test_commit_with_path(self):
60
57
"""Commit tree with path of root specified"""
61
a_tree = self.make_branch_and_tree('a')
58
self.run_bzr('init a')
62
59
self.build_tree(['a/a_file'])
60
self.run_bzr('add a/a_file')
64
61
self.run_bzr(['commit', '-m', 'first commit', 'a'])
66
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
63
self.run_bzr('branch a b')
67
64
self.build_tree_contents([('b/a_file', 'changes in b')])
68
65
self.run_bzr(['commit', '-m', 'first commit in b', 'b'])
70
67
self.build_tree_contents([('a/a_file', 'new contents')])
71
68
self.run_bzr(['commit', '-m', 'change in a', 'a'])
73
b_tree.merge_from_branch(a_tree.branch)
74
self.assertEqual(len(b_tree.conflicts()), 1)
71
self.run_bzr('merge ../a', retcode=1) # will conflict
75
73
self.run_bzr('resolved b/a_file')
76
74
self.run_bzr(['commit', '-m', 'merge into b', 'b'])
79
77
def test_10_verbose_commit(self):
80
78
"""Add one file and examine verbose commit output"""
81
tree = self.make_branch_and_tree('.')
82
80
self.build_tree(['hello.txt'])
81
self.run_bzr("add hello.txt")
84
82
out,err = self.run_bzr('commit -m added')
85
83
self.assertEqual('', out)
86
self.assertContainsRe(err, '^Committing to: .*\n'
88
'Committed revision 1.\n$',)
84
self.assertEqual('added hello.txt\n'
85
'Committed revision 1.\n',
90
88
def prepare_simple_history(self):
91
89
"""Prepare and return a working tree with one commit of one file"""
102
100
self.build_tree_contents([('hello.txt', 'new contents')])
103
101
out, err = self.run_bzr('commit -m modified')
104
102
self.assertEqual('', out)
105
self.assertContainsRe(err, '^Committing to: .*\n'
106
'modified hello\.txt\n'
107
'Committed revision 2\.\n$')
103
self.assertEqual('modified hello.txt\n'
104
'Committed revision 2.\n',
109
107
def test_verbose_commit_renamed(self):
110
108
# Verbose commit of renamed file should say so
112
110
wt.rename_one('hello.txt', 'gutentag.txt')
113
111
out, err = self.run_bzr('commit -m renamed')
114
112
self.assertEqual('', out)
115
self.assertContainsRe(err, '^Committing to: .*\n'
116
'renamed hello\.txt => gutentag\.txt\n'
117
'Committed revision 2\.$\n')
113
self.assertEqual('renamed hello.txt => gutentag.txt\n'
114
'Committed revision 2.\n',
119
117
def test_verbose_commit_moved(self):
120
118
# Verbose commit of file moved to new directory should say so
124
122
wt.rename_one('hello.txt', 'subdir/hello.txt')
125
123
out, err = self.run_bzr('commit -m renamed')
126
124
self.assertEqual('', out)
127
self.assertContainsRe(err, '^Committing to: .*\n'
129
'renamed hello\.txt => subdir/hello\.txt\n'
130
'Committed revision 2\.\n$')
125
self.assertEqualDiff('added subdir\n'
126
'renamed hello.txt => subdir/hello.txt\n'
127
'Committed revision 2.\n',
132
130
def test_verbose_commit_with_unknown(self):
133
131
"""Unknown files should not be listed by default in verbose output"""
137
135
wt.add(['hello.txt'])
138
136
out,err = self.run_bzr('commit -m added')
139
137
self.assertEqual('', out)
140
self.assertContainsRe(err, '^Committing to: .*\n'
142
'Committed revision 1\.\n$')
138
self.assertEqual('added hello.txt\n'
139
'Committed revision 1.\n',
144
142
def test_verbose_commit_with_unchanged(self):
145
143
"""Unchanged files should not be listed by default in verbose output"""
146
tree = self.make_branch_and_tree('.')
147
145
self.build_tree(['hello.txt', 'unchanged.txt'])
148
tree.add('unchanged.txt')
146
self.run_bzr('add unchanged.txt')
149
147
self.run_bzr('commit -m unchanged unchanged.txt')
150
tree.add("hello.txt")
148
self.run_bzr("add hello.txt")
151
149
out,err = self.run_bzr('commit -m added')
152
150
self.assertEqual('', out)
153
self.assertContainsRe(err, '^Committing to: .*\n'
155
'Committed revision 2\.$\n')
157
def test_verbose_commit_includes_master_location(self):
158
"""Location of master is displayed when committing to bound branch"""
159
a_tree = self.make_branch_and_tree('a')
160
self.build_tree(['a/b'])
162
a_tree.commit(message='Initial message')
164
b_tree = a_tree.branch.create_checkout('b')
165
expected = "%s/" % (osutils.abspath('a'), )
166
out, err = self.run_bzr('commit -m blah --unchanged', working_dir='b')
167
self.assertEqual(err, 'Committing to: %s\n'
168
'Committed revision 2.\n' % expected)
151
self.assertEqual('added hello.txt\n'
152
'Committed revision 2.\n',
170
155
def test_commit_merge_reports_all_modified_files(self):
171
156
# the commit command should show all the files that are shown by
204
189
other_tree.rename_one('dirtorename', 'renameddir')
205
190
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
206
191
other_tree.rename_one('filetorename', 'renamedfile')
207
other_tree.rename_one('filetoreparent',
208
'renameddir/reparentedfile')
192
other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
209
193
other_tree.remove(['dirtoremove', 'filetoremove'])
210
194
self.build_tree_contents([
212
196
('other/filetomodify', 'new content'),
213
197
('other/newfile', 'new file content')])
214
198
other_tree.add('newfile')
219
203
this_tree.merge_from_branch(other_tree.branch)
221
205
out,err = self.run_bzr('commit -m added')
222
207
self.assertEqual('', out)
223
expected = '%s/' % (osutils.getcwd(), )
224
208
self.assertEqualDiff(
225
'Committing to: %s\n'
226
209
'modified filetomodify\n'
228
211
'added newfile\n'
229
212
'renamed dirtorename => renameddir\n'
230
'renamed filetorename => renamedfile\n'
231
213
'renamed dirtoreparent => renameddir/reparenteddir\n'
232
214
'renamed filetoreparent => renameddir/reparentedfile\n'
215
'renamed filetorename => renamedfile\n'
233
216
'deleted dirtoremove\n'
234
217
'deleted filetoremove\n'
235
'Committed revision 2.\n' % (expected, ),
218
'Committed revision 2.\n',
238
221
def test_empty_commit_message(self):
239
tree = self.make_branch_and_tree('.')
240
self.build_tree_contents([('foo.c', 'int main() {}')])
223
file('foo.c', 'wt').write('int main() {}')
224
self.run_bzr('add foo.c')
242
225
self.run_bzr('commit -m ""', retcode=3)
244
def test_unsupported_encoding_commit_message(self):
245
tree = self.make_branch_and_tree('.')
246
self.build_tree_contents([('foo.c', 'int main() {}')])
248
# LANG env variable has no effect on Windows
249
# but some characters anyway cannot be represented
250
# in default user encoding
251
char = probe_bad_non_ascii(bzrlib.user_encoding)
253
raise TestSkipped('Cannot find suitable non-ascii character'
254
'for user_encoding (%s)' % bzrlib.user_encoding)
255
out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
257
env_changes={'LANG': 'C'})
258
self.assertContainsRe(err, r'bzrlib.errors.BzrError: Parameter.*is '
259
'unsupported by the current encoding.')
261
227
def test_other_branch_commit(self):
262
228
# this branch is to ensure consistent behaviour, whether we're run
263
229
# inside a branch, or not.
264
outer_tree = self.make_branch_and_tree('.')
265
inner_tree = self.make_branch_and_tree('branch')
266
self.build_tree_contents([
267
('branch/foo.c', 'int main() {}'),
268
('branch/bar.c', 'int main() {}')])
269
inner_tree.add('foo.c')
270
inner_tree.add('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.run_bzr('add branch/foo.c')
240
self.run_bzr('add branch')
271
241
# can't commit files in different trees; sane error
272
242
self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
273
243
self.run_bzr('commit -m newstuff branch/foo.c')
277
247
def test_out_of_date_tree_commit(self):
278
248
# check we get an error code and a clear message committing with an out
279
249
# of date checkout
280
tree = self.make_branch_and_tree('branch')
250
self.make_branch_and_tree('branch')
281
251
# make a checkout
282
checkout = tree.branch.create_checkout('checkout', lightweight=True)
252
self.run_bzr('checkout --lightweight branch checkout')
283
253
# commit to the original branch to make the checkout out of date
284
tree.commit('message branch', allow_pointless=True)
254
self.run_bzr('commit --unchanged -m message branch')
285
255
# now commit to the checkout should emit
286
256
# ERROR: Out of date with the branch, 'bzr update' is suggested
287
257
output = self.run_bzr('commit --unchanged -m checkout_message '
288
258
'checkout', retcode=3)
289
259
self.assertEqual(output,
291
"bzr: ERROR: Working tree is out of date, please "
292
"run 'bzr update'.\n"))
261
"bzr: ERROR: Working tree is out of date, please run "
294
264
def test_local_commit_unbound(self):
295
265
# a --local commit on an unbound branch is an error
305
275
# past. This is a user story reported to fail in bug #43959 where
306
276
# a merge done in a checkout (using the update command) failed to
307
277
# commit correctly.
308
trunk = self.make_branch_and_tree('trunk')
278
self.run_bzr('init trunk')
310
u1 = trunk.branch.create_checkout('u1')
280
self.run_bzr('checkout trunk u1')
311
281
self.build_tree_contents([('u1/hosts', 'initial contents')])
282
self.run_bzr('add u1/hosts')
313
283
self.run_bzr('commit -m add-hosts u1')
315
u2 = trunk.branch.create_checkout('u2')
285
self.run_bzr('checkout trunk u2')
316
286
self.build_tree_contents([('u2/hosts', 'altered in u2')])
317
287
self.run_bzr('commit -m checkin-from-u2 u2')
397
367
output, err = self.run_bzr(
398
368
'commit -m hello --fixes=lp:23452 tree/hello.txt')
399
369
self.assertEqual('', output)
400
self.assertContainsRe(err, 'Committing to: .*\n'
402
'Committed revision 1\.\n')
370
self.assertEqual('added hello.txt\nCommitted revision 1.\n', err)
404
372
def test_no_bugs_no_properties(self):
405
373
"""If no bugs are fixed, the bugs property is not set.
502
470
r"Commit refused\."],
503
471
'commit -m add-b --fixes=orange',
504
472
working_dir='tree')
506
def test_no_author(self):
507
"""If the author is not specified, the author property is not set."""
508
tree = self.make_branch_and_tree('tree')
509
self.build_tree(['tree/hello.txt'])
510
tree.add('hello.txt')
511
self.run_bzr( 'commit -m hello tree/hello.txt')
512
last_rev = tree.branch.repository.get_revision(tree.last_revision())
513
properties = last_rev.properties
514
self.assertFalse('author' in properties)
516
def test_author_sets_property(self):
517
"""commit --author='John Doe <jdoe@example.com>' sets the author
520
tree = self.make_branch_and_tree('tree')
521
self.build_tree(['tree/hello.txt'])
522
tree.add('hello.txt')
523
self.run_bzr(["commit", '-m', 'hello',
524
'--author', u'John D\xf6 <jdoe@example.com>',
526
last_rev = tree.branch.repository.get_revision(tree.last_revision())
527
properties = last_rev.properties
528
self.assertEqual(u'John D\xf6 <jdoe@example.com>', properties['author'])
530
def test_author_no_email(self):
531
"""Author's name without an email address is allowed, too."""
532
tree = self.make_branch_and_tree('tree')
533
self.build_tree(['tree/hello.txt'])
534
tree.add('hello.txt')
535
out, err = self.run_bzr("commit -m hello --author='John Doe' "
537
last_rev = tree.branch.repository.get_revision(tree.last_revision())
538
properties = last_rev.properties
539
self.assertEqual('John Doe', properties['author'])
541
def test_partial_commit_with_renames_in_tree(self):
542
# this test illustrates bug #140419
543
t = self.make_branch_and_tree('.')
544
self.build_tree(['dir/', 'dir/a', 'test'])
545
t.add(['dir/', 'dir/a', 'test'])
546
t.commit('initial commit')
547
# important part: file dir/a should change parent
548
# and should appear before old parent
549
# then during partial commit we have error
550
# parent_id {dir-XXX} not in inventory
551
t.rename_one('dir/a', 'a')
552
self.build_tree_contents([('test', 'changes in test')])
554
out, err = self.run_bzr('commit test -m "partial commit"')
555
self.assertEquals('', out)
556
self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
558
def test_commit_readonly_checkout(self):
559
# https://bugs.edge.launchpad.net/bzr/+bug/129701
560
# "UnlockableTransport error trying to commit in checkout of readonly
562
self.make_branch('master')
563
master = BzrDir.open_from_transport(
564
self.get_readonly_transport('master')).open_branch()
565
master.create_checkout('checkout')
566
out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
568
self.assertContainsRe(err,
569
r'^bzr: ERROR: Cannot lock.*readonly transport')
added
removed
bzrlib/tests/blackbox/test_commit.py
