1
# Copyright (C) 2005-2011 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
25
from bzrlib.branch import Branch
26
from bzrlib.bzrdir import BzrDirMetaFormat1
27
from bzrlib.commit import Commit, NullCommitReporter
28
from bzrlib.config import BranchConfig
29
from bzrlib.errors import (
35
from bzrlib.tests import (
36
TestCaseWithTransport,
39
from bzrlib.tests.features import (
42
from bzrlib.tests.matchers import MatchesAncestry
45
# TODO: Test commit with some added, and added-but-missing files
47
class MustSignConfig(BranchConfig):
49
def signature_needed(self):
52
def gpg_signing_command(self):
56
class BranchWithHooks(BranchConfig):
58
def post_commit(self):
59
return "bzrlib.ahook bzrlib.ahook"
62
class CapturingReporter(NullCommitReporter):
63
"""This reporter captures the calls made to it for evaluation later."""
66
# a list of the calls this received
69
def snapshot_change(self, change, path):
70
self.calls.append(('change', change, path))
72
def deleted(self, file_id):
73
self.calls.append(('deleted', file_id))
75
def missing(self, path):
76
self.calls.append(('missing', path))
78
def renamed(self, change, old_path, new_path):
79
self.calls.append(('renamed', change, old_path, new_path))
85
class TestCommit(TestCaseWithTransport):
87
def test_simple_commit(self):
88
"""Commit and check two versions of a single file."""
89
wt = self.make_branch_and_tree('.')
91
file('hello', 'w').write('hello world')
93
rev1 = wt.commit(message='add hello')
94
file_id = wt.path2id('hello')
96
file('hello', 'w').write('version 2')
97
rev2 = wt.commit(message='commit 2')
99
eq = self.assertEquals
101
rev = b.repository.get_revision(rev1)
102
eq(rev.message, 'add hello')
104
tree1 = b.repository.revision_tree(rev1)
106
text = tree1.get_file_text(file_id)
108
self.assertEqual('hello world', text)
110
tree2 = b.repository.revision_tree(rev2)
112
text = tree2.get_file_text(file_id)
114
self.assertEqual('version 2', text)
116
def test_commit_lossy_native(self):
117
"""Attempt a lossy commit to a native branch."""
118
wt = self.make_branch_and_tree('.')
120
file('hello', 'w').write('hello world')
122
revid = wt.commit(message='add hello', rev_id='revid', lossy=True)
123
self.assertEquals('revid', revid)
125
def test_commit_lossy_foreign(self):
126
"""Attempt a lossy commit to a foreign branch."""
127
test_foreign.register_dummy_foreign_for_test(self)
128
wt = self.make_branch_and_tree('.',
129
format=test_foreign.DummyForeignVcsDirFormat())
131
file('hello', 'w').write('hello world')
133
revid = wt.commit(message='add hello', lossy=True,
134
timestamp=1302659388, timezone=0)
135
self.assertEquals('dummy-v1:1302659388.0-0-UNKNOWN', revid)
137
def test_commit_bound_lossy_foreign(self):
138
"""Attempt a lossy commit to a bzr branch bound to a foreign branch."""
139
test_foreign.register_dummy_foreign_for_test(self)
140
foreign_branch = self.make_branch('foreign',
141
format=test_foreign.DummyForeignVcsDirFormat())
142
wt = foreign_branch.create_checkout("local")
144
file('local/hello', 'w').write('hello world')
146
revid = wt.commit(message='add hello', lossy=True,
147
timestamp=1302659388, timezone=0)
148
self.assertEquals('dummy-v1:1302659388.0-0-0', revid)
149
self.assertEquals('dummy-v1:1302659388.0-0-0',
150
foreign_branch.last_revision())
151
self.assertEquals('dummy-v1:1302659388.0-0-0',
152
wt.branch.last_revision())
154
def test_missing_commit(self):
155
"""Test a commit with a missing file"""
156
wt = self.make_branch_and_tree('.')
158
file('hello', 'w').write('hello world')
159
wt.add(['hello'], ['hello-id'])
160
wt.commit(message='add hello')
163
reporter = CapturingReporter()
164
wt.commit('removed hello', rev_id='rev2', reporter=reporter)
166
[('missing', u'hello'), ('deleted', u'hello')],
169
tree = b.repository.revision_tree('rev2')
170
self.assertFalse(tree.has_id('hello-id'))
172
def test_partial_commit_move(self):
173
"""Test a partial commit where a file was renamed but not committed.
175
https://bugs.launchpad.net/bzr/+bug/83039
177
If not handled properly, commit will try to snapshot
178
dialog.py with olive/ as a parent, while
179
olive/ has not been snapshotted yet.
181
wt = self.make_branch_and_tree('.')
183
self.build_tree(['annotate/', 'annotate/foo.py',
184
'olive/', 'olive/dialog.py'
186
wt.add(['annotate', 'olive', 'annotate/foo.py', 'olive/dialog.py'])
187
wt.commit(message='add files')
188
wt.rename_one("olive/dialog.py", "aaa")
189
self.build_tree_contents([('annotate/foo.py', 'modified\n')])
190
wt.commit('renamed hello', specific_files=["annotate"])
192
def test_pointless_commit(self):
193
"""Commit refuses unless there are changes or it's forced."""
194
wt = self.make_branch_and_tree('.')
196
file('hello', 'w').write('hello')
198
wt.commit(message='add hello')
199
self.assertEquals(b.revno(), 1)
200
self.assertRaises(PointlessCommit,
203
allow_pointless=False)
204
self.assertEquals(b.revno(), 1)
206
def test_commit_empty(self):
207
"""Commiting an empty tree works."""
208
wt = self.make_branch_and_tree('.')
210
wt.commit(message='empty tree', allow_pointless=True)
211
self.assertRaises(PointlessCommit,
213
message='empty tree',
214
allow_pointless=False)
215
wt.commit(message='empty tree', allow_pointless=True)
216
self.assertEquals(b.revno(), 2)
218
def test_selective_delete(self):
219
"""Selective commit in tree with deletions"""
220
wt = self.make_branch_and_tree('.')
222
file('hello', 'w').write('hello')
223
file('buongia', 'w').write('buongia')
224
wt.add(['hello', 'buongia'],
225
['hello-id', 'buongia-id'])
226
wt.commit(message='add files',
230
file('buongia', 'w').write('new text')
231
wt.commit(message='update text',
232
specific_files=['buongia'],
233
allow_pointless=False,
236
wt.commit(message='remove hello',
237
specific_files=['hello'],
238
allow_pointless=False,
241
eq = self.assertEquals
244
tree2 = b.repository.revision_tree('test@rev-2')
246
self.addCleanup(tree2.unlock)
247
self.assertTrue(tree2.has_filename('hello'))
248
self.assertEquals(tree2.get_file_text('hello-id'), 'hello')
249
self.assertEquals(tree2.get_file_text('buongia-id'), 'new text')
251
tree3 = b.repository.revision_tree('test@rev-3')
253
self.addCleanup(tree3.unlock)
254
self.assertFalse(tree3.has_filename('hello'))
255
self.assertEquals(tree3.get_file_text('buongia-id'), 'new text')
257
def test_commit_rename(self):
258
"""Test commit of a revision where a file is renamed."""
259
tree = self.make_branch_and_tree('.')
261
self.build_tree(['hello'], line_endings='binary')
262
tree.add(['hello'], ['hello-id'])
263
tree.commit(message='one', rev_id='test@rev-1', allow_pointless=False)
265
tree.rename_one('hello', 'fruity')
266
tree.commit(message='renamed', rev_id='test@rev-2', allow_pointless=False)
268
eq = self.assertEquals
269
tree1 = b.repository.revision_tree('test@rev-1')
271
self.addCleanup(tree1.unlock)
272
eq(tree1.id2path('hello-id'), 'hello')
273
eq(tree1.get_file_text('hello-id'), 'contents of hello\n')
274
self.assertFalse(tree1.has_filename('fruity'))
275
self.check_tree_shape(tree1, ['hello'])
276
eq(tree1.get_file_revision('hello-id'), 'test@rev-1')
278
tree2 = b.repository.revision_tree('test@rev-2')
280
self.addCleanup(tree2.unlock)
281
eq(tree2.id2path('hello-id'), 'fruity')
282
eq(tree2.get_file_text('hello-id'), 'contents of hello\n')
283
self.check_tree_shape(tree2, ['fruity'])
284
eq(tree2.get_file_revision('hello-id'), 'test@rev-2')
286
def test_reused_rev_id(self):
287
"""Test that a revision id cannot be reused in a branch"""
288
wt = self.make_branch_and_tree('.')
290
wt.commit('initial', rev_id='test@rev-1', allow_pointless=True)
291
self.assertRaises(Exception,
295
allow_pointless=True)
297
def test_commit_move(self):
298
"""Test commit of revisions with moved files and directories"""
299
eq = self.assertEquals
300
wt = self.make_branch_and_tree('.')
303
self.build_tree(['hello', 'a/', 'b/'])
304
wt.add(['hello', 'a', 'b'], ['hello-id', 'a-id', 'b-id'])
305
wt.commit('initial', rev_id=r1, allow_pointless=False)
306
wt.move(['hello'], 'a')
308
wt.commit('two', rev_id=r2, allow_pointless=False)
311
self.check_tree_shape(wt, ['a/', 'a/hello', 'b/'])
317
wt.commit('three', rev_id=r3, allow_pointless=False)
320
self.check_tree_shape(wt,
321
['a/', 'a/hello', 'a/b/'])
322
self.check_tree_shape(b.repository.revision_tree(r3),
323
['a/', 'a/hello', 'a/b/'])
327
wt.move(['a/hello'], 'a/b')
329
wt.commit('four', rev_id=r4, allow_pointless=False)
332
self.check_tree_shape(wt, ['a/', 'a/b/hello', 'a/b/'])
336
inv = b.repository.get_inventory(r4)
337
eq(inv['hello-id'].revision, r4)
338
eq(inv['a-id'].revision, r1)
339
eq(inv['b-id'].revision, r3)
341
def test_removed_commit(self):
342
"""Commit with a removed file"""
343
wt = self.make_branch_and_tree('.')
345
file('hello', 'w').write('hello world')
346
wt.add(['hello'], ['hello-id'])
347
wt.commit(message='add hello')
349
wt.commit('removed hello', rev_id='rev2')
351
tree = b.repository.revision_tree('rev2')
352
self.assertFalse(tree.has_id('hello-id'))
354
def test_committed_ancestry(self):
355
"""Test commit appends revisions to ancestry."""
356
wt = self.make_branch_and_tree('.')
360
file('hello', 'w').write((str(i) * 4) + '\n')
362
wt.add(['hello'], ['hello-id'])
363
rev_id = 'test@rev-%d' % (i+1)
364
rev_ids.append(rev_id)
365
wt.commit(message='rev %d' % (i+1),
368
self.assertThat(rev_ids[:i+1],
369
MatchesAncestry(b.repository, rev_ids[i]))
371
def test_commit_new_subdir_child_selective(self):
372
wt = self.make_branch_and_tree('.')
374
self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
375
wt.add(['dir', 'dir/file1', 'dir/file2'],
376
['dirid', 'file1id', 'file2id'])
377
wt.commit('dir/file1', specific_files=['dir/file1'], rev_id='1')
378
inv = b.repository.get_inventory('1')
379
self.assertEqual('1', inv['dirid'].revision)
380
self.assertEqual('1', inv['file1id'].revision)
381
# FIXME: This should raise a KeyError I think, rbc20051006
382
self.assertRaises(BzrError, inv.__getitem__, 'file2id')
384
def test_strict_commit(self):
385
"""Try and commit with unknown files and strict = True, should fail."""
386
from bzrlib.errors import StrictCommitFailed
387
wt = self.make_branch_and_tree('.')
389
file('hello', 'w').write('hello world')
391
file('goodbye', 'w').write('goodbye cruel world!')
392
self.assertRaises(StrictCommitFailed, wt.commit,
393
message='add hello but not goodbye', strict=True)
395
def test_strict_commit_without_unknowns(self):
396
"""Try and commit with no unknown files and strict = True,
398
wt = self.make_branch_and_tree('.')
400
file('hello', 'w').write('hello world')
402
wt.commit(message='add hello', strict=True)
404
def test_nonstrict_commit(self):
405
"""Try and commit with unknown files and strict = False, should work."""
406
wt = self.make_branch_and_tree('.')
408
file('hello', 'w').write('hello world')
410
file('goodbye', 'w').write('goodbye cruel world!')
411
wt.commit(message='add hello but not goodbye', strict=False)
413
def test_nonstrict_commit_without_unknowns(self):
414
"""Try and commit with no unknown files and strict = False,
416
wt = self.make_branch_and_tree('.')
418
file('hello', 'w').write('hello world')
420
wt.commit(message='add hello', strict=False)
422
def test_signed_commit(self):
424
import bzrlib.commit as commit
425
oldstrategy = bzrlib.gpg.GPGStrategy
426
wt = self.make_branch_and_tree('.')
428
wt.commit("base", allow_pointless=True, rev_id='A')
429
self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
431
from bzrlib.testament import Testament
432
# monkey patch gpg signing mechanism
433
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
434
commit.Commit(config=MustSignConfig(branch)).commit(message="base",
435
allow_pointless=True,
439
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
440
self.assertEqual(sign(Testament.from_revision(branch.repository,
441
'B').as_short_text()),
442
branch.repository.get_signature_text('B'))
444
bzrlib.gpg.GPGStrategy = oldstrategy
446
def test_commit_failed_signature(self):
448
import bzrlib.commit as commit
449
oldstrategy = bzrlib.gpg.GPGStrategy
450
wt = self.make_branch_and_tree('.')
452
wt.commit("base", allow_pointless=True, rev_id='A')
453
self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
455
# monkey patch gpg signing mechanism
456
bzrlib.gpg.GPGStrategy = bzrlib.gpg.DisabledGPGStrategy
457
config = MustSignConfig(branch)
458
self.assertRaises(SigningFailed,
459
commit.Commit(config=config).commit,
461
allow_pointless=True,
464
branch = Branch.open(self.get_url('.'))
465
self.assertEqual(branch.last_revision(), 'A')
466
self.assertFalse(branch.repository.has_revision('B'))
468
bzrlib.gpg.GPGStrategy = oldstrategy
470
def test_commit_invokes_hooks(self):
471
import bzrlib.commit as commit
472
wt = self.make_branch_and_tree('.')
475
def called(branch, rev_id):
476
calls.append('called')
477
bzrlib.ahook = called
479
config = BranchWithHooks(branch)
480
commit.Commit(config=config).commit(
482
allow_pointless=True,
483
rev_id='A', working_tree = wt)
484
self.assertEqual(['called', 'called'], calls)
488
def test_commit_object_doesnt_set_nick(self):
489
# using the Commit object directly does not set the branch nick.
490
wt = self.make_branch_and_tree('.')
492
c.commit(working_tree=wt, message='empty tree', allow_pointless=True)
493
self.assertEquals(wt.branch.revno(), 1)
495
wt.branch.repository.get_revision(
496
wt.branch.last_revision()).properties)
498
def test_safe_master_lock(self):
500
master = BzrDirMetaFormat1().initialize('master')
501
master.create_repository()
502
master_branch = master.create_branch()
503
master.create_workingtree()
504
bound = master.sprout('bound')
505
wt = bound.open_workingtree()
506
wt.branch.set_bound_location(os.path.realpath('master'))
507
master_branch.lock_write()
509
self.assertRaises(LockContention, wt.commit, 'silly')
511
master_branch.unlock()
513
def test_commit_bound_merge(self):
514
# see bug #43959; commit of a merge in a bound branch fails to push
515
# the new commit into the master
516
master_branch = self.make_branch('master')
517
bound_tree = self.make_branch_and_tree('bound')
518
bound_tree.branch.bind(master_branch)
520
self.build_tree_contents([('bound/content_file', 'initial contents\n')])
521
bound_tree.add(['content_file'])
522
bound_tree.commit(message='woo!')
524
other_bzrdir = master_branch.bzrdir.sprout('other')
525
other_tree = other_bzrdir.open_workingtree()
527
# do a commit to the other branch changing the content file so
528
# that our commit after merging will have a merged revision in the
529
# content file history.
530
self.build_tree_contents([('other/content_file', 'change in other\n')])
531
other_tree.commit('change in other')
533
# do a merge into the bound branch from other, and then change the
534
# content file locally to force a new revision (rather than using the
535
# revision from other). This forces extra processing in commit.
536
bound_tree.merge_from_branch(other_tree.branch)
537
self.build_tree_contents([('bound/content_file', 'change in bound\n')])
539
# before #34959 was fixed, this failed with 'revision not present in
540
# weave' when trying to implicitly push from the bound branch to the master
541
bound_tree.commit(message='commit of merge in bound tree')
543
def test_commit_reporting_after_merge(self):
544
# when doing a commit of a merge, the reporter needs to still
545
# be called for each item that is added/removed/deleted.
546
this_tree = self.make_branch_and_tree('this')
547
# we need a bunch of files and dirs, to perform one action on each.
550
'this/dirtoreparent/',
553
'this/filetoreparent',
570
this_tree.commit('create_files')
571
other_dir = this_tree.bzrdir.sprout('other')
572
other_tree = other_dir.open_workingtree()
573
other_tree.lock_write()
574
# perform the needed actions on the files and dirs.
576
other_tree.rename_one('dirtorename', 'renameddir')
577
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
578
other_tree.rename_one('filetorename', 'renamedfile')
579
other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
580
other_tree.remove(['dirtoremove', 'filetoremove'])
581
self.build_tree_contents([
583
('other/filetomodify', 'new content'),
584
('other/newfile', 'new file content')])
585
other_tree.add('newfile')
586
other_tree.add('newdir/')
587
other_tree.commit('modify all sample files and dirs.')
590
this_tree.merge_from_branch(other_tree.branch)
591
reporter = CapturingReporter()
592
this_tree.commit('do the commit', reporter=reporter)
594
('change', 'modified', 'filetomodify'),
595
('change', 'added', 'newdir'),
596
('change', 'added', 'newfile'),
597
('renamed', 'renamed', 'dirtorename', 'renameddir'),
598
('renamed', 'renamed', 'filetorename', 'renamedfile'),
599
('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
600
('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
601
('deleted', 'dirtoremove'),
602
('deleted', 'filetoremove'),
604
result = set(reporter.calls)
605
missing = expected - result
606
new = result - expected
607
self.assertEqual((set(), set()), (missing, new))
609
def test_commit_removals_respects_filespec(self):
610
"""Commit respects the specified_files for removals."""
611
tree = self.make_branch_and_tree('.')
612
self.build_tree(['a', 'b'])
614
tree.commit('added a, b')
615
tree.remove(['a', 'b'])
616
tree.commit('removed a', specific_files='a')
617
basis = tree.basis_tree()
620
self.assertIs(None, basis.path2id('a'))
621
self.assertFalse(basis.path2id('b') is None)
625
def test_commit_saves_1ms_timestamp(self):
626
"""Passing in a timestamp is saved with 1ms resolution"""
627
tree = self.make_branch_and_tree('.')
628
self.build_tree(['a'])
630
tree.commit('added a', timestamp=1153248633.4186721, timezone=0,
633
rev = tree.branch.repository.get_revision('a1')
634
self.assertEqual(1153248633.419, rev.timestamp)
636
def test_commit_has_1ms_resolution(self):
637
"""Allowing commit to generate the timestamp also has 1ms resolution"""
638
tree = self.make_branch_and_tree('.')
639
self.build_tree(['a'])
641
tree.commit('added a', rev_id='a1')
643
rev = tree.branch.repository.get_revision('a1')
644
timestamp = rev.timestamp
645
timestamp_1ms = round(timestamp, 3)
646
self.assertEqual(timestamp_1ms, timestamp)
648
def assertBasisTreeKind(self, kind, tree, file_id):
649
basis = tree.basis_tree()
652
self.assertEqual(kind, basis.kind(file_id))
656
def test_commit_kind_changes(self):
657
self.requireFeature(SymlinkFeature)
658
tree = self.make_branch_and_tree('.')
659
os.symlink('target', 'name')
660
tree.add('name', 'a-file-id')
661
tree.commit('Added a symlink')
662
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
665
self.build_tree(['name'])
666
tree.commit('Changed symlink to file')
667
self.assertBasisTreeKind('file', tree, 'a-file-id')
670
os.symlink('target', 'name')
671
tree.commit('file to symlink')
672
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
676
tree.commit('symlink to directory')
677
self.assertBasisTreeKind('directory', tree, 'a-file-id')
680
os.symlink('target', 'name')
681
tree.commit('directory to symlink')
682
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
684
# prepare for directory <-> file tests
687
tree.commit('symlink to directory')
688
self.assertBasisTreeKind('directory', tree, 'a-file-id')
691
self.build_tree(['name'])
692
tree.commit('Changed directory to file')
693
self.assertBasisTreeKind('file', tree, 'a-file-id')
697
tree.commit('file to directory')
698
self.assertBasisTreeKind('directory', tree, 'a-file-id')
700
def test_commit_unversioned_specified(self):
701
"""Commit should raise if specified files isn't in basis or worktree"""
702
tree = self.make_branch_and_tree('.')
703
self.assertRaises(errors.PathsNotVersionedError, tree.commit,
704
'message', specific_files=['bogus'])
706
class Callback(object):
708
def __init__(self, message, testcase):
710
self.message = message
711
self.testcase = testcase
713
def __call__(self, commit_obj):
715
self.testcase.assertTrue(isinstance(commit_obj, Commit))
718
def test_commit_callback(self):
719
"""Commit should invoke a callback to get the message"""
721
tree = self.make_branch_and_tree('.')
725
self.assertTrue(isinstance(e, BzrError))
726
self.assertEqual('The message or message_callback keyword'
727
' parameter is required for commit().', str(e))
729
self.fail('exception not raised')
730
cb = self.Callback(u'commit 1', self)
731
tree.commit(message_callback=cb)
732
self.assertTrue(cb.called)
733
repository = tree.branch.repository
734
message = repository.get_revision(tree.last_revision()).message
735
self.assertEqual('commit 1', message)
737
def test_no_callback_pointless(self):
738
"""Callback should not be invoked for pointless commit"""
739
tree = self.make_branch_and_tree('.')
740
cb = self.Callback(u'commit 2', self)
741
self.assertRaises(PointlessCommit, tree.commit, message_callback=cb,
742
allow_pointless=False)
743
self.assertFalse(cb.called)
745
def test_no_callback_netfailure(self):
746
"""Callback should not be invoked if connectivity fails"""
747
tree = self.make_branch_and_tree('.')
748
cb = self.Callback(u'commit 2', self)
749
repository = tree.branch.repository
750
# simulate network failure
751
def raise_(self, arg, arg2, arg3=None, arg4=None):
752
raise errors.NoSuchFile('foo')
753
repository.add_inventory = raise_
754
repository.add_inventory_by_delta = raise_
755
self.assertRaises(errors.NoSuchFile, tree.commit, message_callback=cb)
756
self.assertFalse(cb.called)
758
def test_selected_file_merge_commit(self):
759
"""Ensure the correct error is raised"""
760
tree = self.make_branch_and_tree('foo')
761
# pending merge would turn into a left parent
762
tree.commit('commit 1')
763
tree.add_parent_tree_id('example')
764
self.build_tree(['foo/bar', 'foo/baz'])
765
tree.add(['bar', 'baz'])
766
err = self.assertRaises(errors.CannotCommitSelectedFileMerge,
767
tree.commit, 'commit 2', specific_files=['bar', 'baz'])
768
self.assertEqual(['bar', 'baz'], err.files)
769
self.assertEqual('Selected-file commit of merges is not supported'
770
' yet: files bar, baz', str(err))
772
def test_commit_ordering(self):
773
"""Test of corner-case commit ordering error"""
774
tree = self.make_branch_and_tree('.')
775
self.build_tree(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
776
tree.add(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
778
self.build_tree(['a/c/d/'])
780
tree.rename_one('a/z/x', 'a/c/d/x')
781
tree.commit('test', specific_files=['a/z/y'])
783
def test_commit_no_author(self):
784
"""The default kwarg author in MutableTree.commit should not add
785
the 'author' revision property.
787
tree = self.make_branch_and_tree('foo')
788
rev_id = tree.commit('commit 1')
789
rev = tree.branch.repository.get_revision(rev_id)
790
self.assertFalse('author' in rev.properties)
791
self.assertFalse('authors' in rev.properties)
793
def test_commit_author(self):
794
"""Passing a non-empty author kwarg to MutableTree.commit should add
795
the 'author' revision property.
797
tree = self.make_branch_and_tree('foo')
798
rev_id = self.callDeprecated(['The parameter author was '
799
'deprecated in version 1.13. Use authors instead'],
800
tree.commit, 'commit 1', author='John Doe <jdoe@example.com>')
801
rev = tree.branch.repository.get_revision(rev_id)
802
self.assertEqual('John Doe <jdoe@example.com>',
803
rev.properties['authors'])
804
self.assertFalse('author' in rev.properties)
806
def test_commit_empty_authors_list(self):
807
"""Passing an empty list to authors shouldn't add the property."""
808
tree = self.make_branch_and_tree('foo')
809
rev_id = tree.commit('commit 1', authors=[])
810
rev = tree.branch.repository.get_revision(rev_id)
811
self.assertFalse('author' in rev.properties)
812
self.assertFalse('authors' in rev.properties)
814
def test_multiple_authors(self):
815
tree = self.make_branch_and_tree('foo')
816
rev_id = tree.commit('commit 1',
817
authors=['John Doe <jdoe@example.com>',
818
'Jane Rey <jrey@example.com>'])
819
rev = tree.branch.repository.get_revision(rev_id)
820
self.assertEqual('John Doe <jdoe@example.com>\n'
821
'Jane Rey <jrey@example.com>', rev.properties['authors'])
822
self.assertFalse('author' in rev.properties)
824
def test_author_and_authors_incompatible(self):
825
tree = self.make_branch_and_tree('foo')
826
self.assertRaises(AssertionError, tree.commit, 'commit 1',
827
authors=['John Doe <jdoe@example.com>',
828
'Jane Rey <jrey@example.com>'],
829
author="Jack Me <jme@example.com>")
831
def test_author_with_newline_rejected(self):
832
tree = self.make_branch_and_tree('foo')
833
self.assertRaises(AssertionError, tree.commit, 'commit 1',
834
authors=['John\nDoe <jdoe@example.com>'])
836
def test_commit_with_checkout_and_branch_sharing_repo(self):
837
repo = self.make_repository('repo', shared=True)
838
# make_branch_and_tree ignores shared repos
839
branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
840
tree2 = branch.create_checkout('repo/tree2')
841
tree2.commit('message', rev_id='rev1')
842
self.assertTrue(tree2.branch.repository.has_revision('rev1'))
added
removed
bzrlib/tests/test_commit.py
