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 (
37
TestCaseWithTransport,
40
from bzrlib.tests.matchers import MatchesAncestry
43
# TODO: Test commit with some added, and added-but-missing files
45
class MustSignConfig(BranchConfig):
47
def signature_needed(self):
50
def gpg_signing_command(self):
54
class BranchWithHooks(BranchConfig):
56
def post_commit(self):
57
return "bzrlib.ahook bzrlib.ahook"
60
class CapturingReporter(NullCommitReporter):
61
"""This reporter captures the calls made to it for evaluation later."""
64
# a list of the calls this received
67
def snapshot_change(self, change, path):
68
self.calls.append(('change', change, path))
70
def deleted(self, file_id):
71
self.calls.append(('deleted', file_id))
73
def missing(self, path):
74
self.calls.append(('missing', path))
76
def renamed(self, change, old_path, new_path):
77
self.calls.append(('renamed', change, old_path, new_path))
83
class TestCommit(TestCaseWithTransport):
85
def test_simple_commit(self):
86
"""Commit and check two versions of a single file."""
87
wt = self.make_branch_and_tree('.')
89
file('hello', 'w').write('hello world')
91
wt.commit(message='add hello')
92
file_id = wt.path2id('hello')
94
file('hello', 'w').write('version 2')
95
wt.commit(message='commit 2')
97
eq = self.assertEquals
99
rh = b.revision_history()
100
rev = b.repository.get_revision(rh[0])
101
eq(rev.message, 'add hello')
103
tree1 = b.repository.revision_tree(rh[0])
105
text = tree1.get_file_text(file_id)
107
self.assertEqual('hello world', text)
109
tree2 = b.repository.revision_tree(rh[1])
111
text = tree2.get_file_text(file_id)
113
self.assertEqual('version 2', text)
115
def test_commit_lossy_native(self):
116
"""Attempt a lossy commit to a native branch."""
117
wt = self.make_branch_and_tree('.')
119
file('hello', 'w').write('hello world')
121
revid = wt.commit(message='add hello', rev_id='revid', lossy=True)
122
self.assertEquals('revid', revid)
124
def test_commit_lossy_foreign(self):
125
"""Attempt a lossy commit to a foreign branch."""
126
test_foreign.register_dummy_foreign_for_test(self)
127
wt = self.make_branch_and_tree('.',
128
format=test_foreign.DummyForeignVcsDirFormat())
130
file('hello', 'w').write('hello world')
132
revid = wt.commit(message='add hello', lossy=True,
133
timestamp=1302659388, timezone=0)
134
self.assertEquals('dummy-v1:1302659388.0-0-UNKNOWN', revid)
136
def test_commit_bound_lossy_foreign(self):
137
"""Attempt a lossy commit to a bzr branch bound to a foreign branch."""
138
test_foreign.register_dummy_foreign_for_test(self)
139
foreign_branch = self.make_branch('foreign',
140
format=test_foreign.DummyForeignVcsDirFormat())
141
wt = foreign_branch.create_checkout("local")
143
file('local/hello', 'w').write('hello world')
145
revid = wt.commit(message='add hello', lossy=True,
146
timestamp=1302659388, timezone=0)
147
self.assertEquals('dummy-v1:1302659388.0-0-0', revid)
148
self.assertEquals('dummy-v1:1302659388.0-0-0',
149
foreign_branch.last_revision())
150
self.assertEquals('dummy-v1:1302659388.0-0-0',
151
wt.branch.last_revision())
153
def test_missing_commit(self):
154
"""Test a commit with a missing file"""
155
wt = self.make_branch_and_tree('.')
157
file('hello', 'w').write('hello world')
158
wt.add(['hello'], ['hello-id'])
159
wt.commit(message='add hello')
162
wt.commit('removed hello', rev_id='rev2')
164
tree = b.repository.revision_tree('rev2')
165
self.assertFalse(tree.has_id('hello-id'))
167
def test_partial_commit_move(self):
168
"""Test a partial commit where a file was renamed but not committed.
170
https://bugs.launchpad.net/bzr/+bug/83039
172
If not handled properly, commit will try to snapshot
173
dialog.py with olive/ as a parent, while
174
olive/ has not been snapshotted yet.
176
wt = self.make_branch_and_tree('.')
178
self.build_tree(['annotate/', 'annotate/foo.py',
179
'olive/', 'olive/dialog.py'
181
wt.add(['annotate', 'olive', 'annotate/foo.py', 'olive/dialog.py'])
182
wt.commit(message='add files')
183
wt.rename_one("olive/dialog.py", "aaa")
184
self.build_tree_contents([('annotate/foo.py', 'modified\n')])
185
wt.commit('renamed hello', specific_files=["annotate"])
187
def test_pointless_commit(self):
188
"""Commit refuses unless there are changes or it's forced."""
189
wt = self.make_branch_and_tree('.')
191
file('hello', 'w').write('hello')
193
wt.commit(message='add hello')
194
self.assertEquals(b.revno(), 1)
195
self.assertRaises(PointlessCommit,
198
allow_pointless=False)
199
self.assertEquals(b.revno(), 1)
201
def test_commit_empty(self):
202
"""Commiting an empty tree works."""
203
wt = self.make_branch_and_tree('.')
205
wt.commit(message='empty tree', allow_pointless=True)
206
self.assertRaises(PointlessCommit,
208
message='empty tree',
209
allow_pointless=False)
210
wt.commit(message='empty tree', allow_pointless=True)
211
self.assertEquals(b.revno(), 2)
213
def test_selective_delete(self):
214
"""Selective commit in tree with deletions"""
215
wt = self.make_branch_and_tree('.')
217
file('hello', 'w').write('hello')
218
file('buongia', 'w').write('buongia')
219
wt.add(['hello', 'buongia'],
220
['hello-id', 'buongia-id'])
221
wt.commit(message='add files',
225
file('buongia', 'w').write('new text')
226
wt.commit(message='update text',
227
specific_files=['buongia'],
228
allow_pointless=False,
231
wt.commit(message='remove hello',
232
specific_files=['hello'],
233
allow_pointless=False,
236
eq = self.assertEquals
239
tree2 = b.repository.revision_tree('test@rev-2')
241
self.addCleanup(tree2.unlock)
242
self.assertTrue(tree2.has_filename('hello'))
243
self.assertEquals(tree2.get_file_text('hello-id'), 'hello')
244
self.assertEquals(tree2.get_file_text('buongia-id'), 'new text')
246
tree3 = b.repository.revision_tree('test@rev-3')
248
self.addCleanup(tree3.unlock)
249
self.assertFalse(tree3.has_filename('hello'))
250
self.assertEquals(tree3.get_file_text('buongia-id'), 'new text')
252
def test_commit_rename(self):
253
"""Test commit of a revision where a file is renamed."""
254
tree = self.make_branch_and_tree('.')
256
self.build_tree(['hello'], line_endings='binary')
257
tree.add(['hello'], ['hello-id'])
258
tree.commit(message='one', rev_id='test@rev-1', allow_pointless=False)
260
tree.rename_one('hello', 'fruity')
261
tree.commit(message='renamed', rev_id='test@rev-2', allow_pointless=False)
263
eq = self.assertEquals
264
tree1 = b.repository.revision_tree('test@rev-1')
266
self.addCleanup(tree1.unlock)
267
eq(tree1.id2path('hello-id'), 'hello')
268
eq(tree1.get_file_text('hello-id'), 'contents of hello\n')
269
self.assertFalse(tree1.has_filename('fruity'))
270
self.check_tree_shape(tree1, ['hello'])
271
eq(tree1.get_file_revision('hello-id'), 'test@rev-1')
273
tree2 = b.repository.revision_tree('test@rev-2')
275
self.addCleanup(tree2.unlock)
276
eq(tree2.id2path('hello-id'), 'fruity')
277
eq(tree2.get_file_text('hello-id'), 'contents of hello\n')
278
self.check_tree_shape(tree2, ['fruity'])
279
eq(tree2.get_file_revision('hello-id'), 'test@rev-2')
281
def test_reused_rev_id(self):
282
"""Test that a revision id cannot be reused in a branch"""
283
wt = self.make_branch_and_tree('.')
285
wt.commit('initial', rev_id='test@rev-1', allow_pointless=True)
286
self.assertRaises(Exception,
290
allow_pointless=True)
292
def test_commit_move(self):
293
"""Test commit of revisions with moved files and directories"""
294
eq = self.assertEquals
295
wt = self.make_branch_and_tree('.')
298
self.build_tree(['hello', 'a/', 'b/'])
299
wt.add(['hello', 'a', 'b'], ['hello-id', 'a-id', 'b-id'])
300
wt.commit('initial', rev_id=r1, allow_pointless=False)
301
wt.move(['hello'], 'a')
303
wt.commit('two', rev_id=r2, allow_pointless=False)
306
self.check_tree_shape(wt, ['a/', 'a/hello', 'b/'])
312
wt.commit('three', rev_id=r3, allow_pointless=False)
315
self.check_tree_shape(wt,
316
['a/', 'a/hello', 'a/b/'])
317
self.check_tree_shape(b.repository.revision_tree(r3),
318
['a/', 'a/hello', 'a/b/'])
322
wt.move(['a/hello'], 'a/b')
324
wt.commit('four', rev_id=r4, allow_pointless=False)
327
self.check_tree_shape(wt, ['a/', 'a/b/hello', 'a/b/'])
331
inv = b.repository.get_inventory(r4)
332
eq(inv['hello-id'].revision, r4)
333
eq(inv['a-id'].revision, r1)
334
eq(inv['b-id'].revision, r3)
336
def test_removed_commit(self):
337
"""Commit with a removed file"""
338
wt = self.make_branch_and_tree('.')
340
file('hello', 'w').write('hello world')
341
wt.add(['hello'], ['hello-id'])
342
wt.commit(message='add hello')
344
wt.commit('removed hello', rev_id='rev2')
346
tree = b.repository.revision_tree('rev2')
347
self.assertFalse(tree.has_id('hello-id'))
349
def test_committed_ancestry(self):
350
"""Test commit appends revisions to ancestry."""
351
wt = self.make_branch_and_tree('.')
355
file('hello', 'w').write((str(i) * 4) + '\n')
357
wt.add(['hello'], ['hello-id'])
358
rev_id = 'test@rev-%d' % (i+1)
359
rev_ids.append(rev_id)
360
wt.commit(message='rev %d' % (i+1),
362
eq = self.assertEquals
363
eq(b.revision_history(), rev_ids)
365
self.assertThat(rev_ids[:i+1],
366
MatchesAncestry(b.repository, rev_ids[i]))
368
def test_commit_new_subdir_child_selective(self):
369
wt = self.make_branch_and_tree('.')
371
self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
372
wt.add(['dir', 'dir/file1', 'dir/file2'],
373
['dirid', 'file1id', 'file2id'])
374
wt.commit('dir/file1', specific_files=['dir/file1'], rev_id='1')
375
inv = b.repository.get_inventory('1')
376
self.assertEqual('1', inv['dirid'].revision)
377
self.assertEqual('1', inv['file1id'].revision)
378
# FIXME: This should raise a KeyError I think, rbc20051006
379
self.assertRaises(BzrError, inv.__getitem__, 'file2id')
381
def test_strict_commit(self):
382
"""Try and commit with unknown files and strict = True, should fail."""
383
from bzrlib.errors import StrictCommitFailed
384
wt = self.make_branch_and_tree('.')
386
file('hello', 'w').write('hello world')
388
file('goodbye', 'w').write('goodbye cruel world!')
389
self.assertRaises(StrictCommitFailed, wt.commit,
390
message='add hello but not goodbye', strict=True)
392
def test_strict_commit_without_unknowns(self):
393
"""Try and commit with no unknown files and strict = True,
395
wt = self.make_branch_and_tree('.')
397
file('hello', 'w').write('hello world')
399
wt.commit(message='add hello', strict=True)
401
def test_nonstrict_commit(self):
402
"""Try and commit with unknown files and strict = False, should work."""
403
wt = self.make_branch_and_tree('.')
405
file('hello', 'w').write('hello world')
407
file('goodbye', 'w').write('goodbye cruel world!')
408
wt.commit(message='add hello but not goodbye', strict=False)
410
def test_nonstrict_commit_without_unknowns(self):
411
"""Try and commit with no unknown files and strict = False,
413
wt = self.make_branch_and_tree('.')
415
file('hello', 'w').write('hello world')
417
wt.commit(message='add hello', strict=False)
419
def test_signed_commit(self):
421
import bzrlib.commit as commit
422
oldstrategy = bzrlib.gpg.GPGStrategy
423
wt = self.make_branch_and_tree('.')
425
wt.commit("base", allow_pointless=True, rev_id='A')
426
self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
428
from bzrlib.testament import Testament
429
# monkey patch gpg signing mechanism
430
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
431
commit.Commit(config=MustSignConfig(branch)).commit(message="base",
432
allow_pointless=True,
436
return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
437
self.assertEqual(sign(Testament.from_revision(branch.repository,
438
'B').as_short_text()),
439
branch.repository.get_signature_text('B'))
441
bzrlib.gpg.GPGStrategy = oldstrategy
443
def test_commit_failed_signature(self):
445
import bzrlib.commit as commit
446
oldstrategy = bzrlib.gpg.GPGStrategy
447
wt = self.make_branch_and_tree('.')
449
wt.commit("base", allow_pointless=True, rev_id='A')
450
self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
452
# monkey patch gpg signing mechanism
453
bzrlib.gpg.GPGStrategy = bzrlib.gpg.DisabledGPGStrategy
454
config = MustSignConfig(branch)
455
self.assertRaises(SigningFailed,
456
commit.Commit(config=config).commit,
458
allow_pointless=True,
461
branch = Branch.open(self.get_url('.'))
462
self.assertEqual(branch.revision_history(), ['A'])
463
self.assertFalse(branch.repository.has_revision('B'))
465
bzrlib.gpg.GPGStrategy = oldstrategy
467
def test_commit_invokes_hooks(self):
468
import bzrlib.commit as commit
469
wt = self.make_branch_and_tree('.')
472
def called(branch, rev_id):
473
calls.append('called')
474
bzrlib.ahook = called
476
config = BranchWithHooks(branch)
477
commit.Commit(config=config).commit(
479
allow_pointless=True,
480
rev_id='A', working_tree = wt)
481
self.assertEqual(['called', 'called'], calls)
485
def test_commit_object_doesnt_set_nick(self):
486
# using the Commit object directly does not set the branch nick.
487
wt = self.make_branch_and_tree('.')
489
c.commit(working_tree=wt, message='empty tree', allow_pointless=True)
490
self.assertEquals(wt.branch.revno(), 1)
492
wt.branch.repository.get_revision(
493
wt.branch.last_revision()).properties)
495
def test_safe_master_lock(self):
497
master = BzrDirMetaFormat1().initialize('master')
498
master.create_repository()
499
master_branch = master.create_branch()
500
master.create_workingtree()
501
bound = master.sprout('bound')
502
wt = bound.open_workingtree()
503
wt.branch.set_bound_location(os.path.realpath('master'))
504
master_branch.lock_write()
506
self.assertRaises(LockContention, wt.commit, 'silly')
508
master_branch.unlock()
510
def test_commit_bound_merge(self):
511
# see bug #43959; commit of a merge in a bound branch fails to push
512
# the new commit into the master
513
master_branch = self.make_branch('master')
514
bound_tree = self.make_branch_and_tree('bound')
515
bound_tree.branch.bind(master_branch)
517
self.build_tree_contents([('bound/content_file', 'initial contents\n')])
518
bound_tree.add(['content_file'])
519
bound_tree.commit(message='woo!')
521
other_bzrdir = master_branch.bzrdir.sprout('other')
522
other_tree = other_bzrdir.open_workingtree()
524
# do a commit to the other branch changing the content file so
525
# that our commit after merging will have a merged revision in the
526
# content file history.
527
self.build_tree_contents([('other/content_file', 'change in other\n')])
528
other_tree.commit('change in other')
530
# do a merge into the bound branch from other, and then change the
531
# content file locally to force a new revision (rather than using the
532
# revision from other). This forces extra processing in commit.
533
bound_tree.merge_from_branch(other_tree.branch)
534
self.build_tree_contents([('bound/content_file', 'change in bound\n')])
536
# before #34959 was fixed, this failed with 'revision not present in
537
# weave' when trying to implicitly push from the bound branch to the master
538
bound_tree.commit(message='commit of merge in bound tree')
540
def test_commit_reporting_after_merge(self):
541
# when doing a commit of a merge, the reporter needs to still
542
# be called for each item that is added/removed/deleted.
543
this_tree = self.make_branch_and_tree('this')
544
# we need a bunch of files and dirs, to perform one action on each.
547
'this/dirtoreparent/',
550
'this/filetoreparent',
567
this_tree.commit('create_files')
568
other_dir = this_tree.bzrdir.sprout('other')
569
other_tree = other_dir.open_workingtree()
570
other_tree.lock_write()
571
# perform the needed actions on the files and dirs.
573
other_tree.rename_one('dirtorename', 'renameddir')
574
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
575
other_tree.rename_one('filetorename', 'renamedfile')
576
other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
577
other_tree.remove(['dirtoremove', 'filetoremove'])
578
self.build_tree_contents([
580
('other/filetomodify', 'new content'),
581
('other/newfile', 'new file content')])
582
other_tree.add('newfile')
583
other_tree.add('newdir/')
584
other_tree.commit('modify all sample files and dirs.')
587
this_tree.merge_from_branch(other_tree.branch)
588
reporter = CapturingReporter()
589
this_tree.commit('do the commit', reporter=reporter)
591
('change', 'modified', 'filetomodify'),
592
('change', 'added', 'newdir'),
593
('change', 'added', 'newfile'),
594
('renamed', 'renamed', 'dirtorename', 'renameddir'),
595
('renamed', 'renamed', 'filetorename', 'renamedfile'),
596
('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
597
('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
598
('deleted', 'dirtoremove'),
599
('deleted', 'filetoremove'),
601
result = set(reporter.calls)
602
missing = expected - result
603
new = result - expected
604
self.assertEqual((set(), set()), (missing, new))
606
def test_commit_removals_respects_filespec(self):
607
"""Commit respects the specified_files for removals."""
608
tree = self.make_branch_and_tree('.')
609
self.build_tree(['a', 'b'])
611
tree.commit('added a, b')
612
tree.remove(['a', 'b'])
613
tree.commit('removed a', specific_files='a')
614
basis = tree.basis_tree()
617
self.assertIs(None, basis.path2id('a'))
618
self.assertFalse(basis.path2id('b') is None)
622
def test_commit_saves_1ms_timestamp(self):
623
"""Passing in a timestamp is saved with 1ms resolution"""
624
tree = self.make_branch_and_tree('.')
625
self.build_tree(['a'])
627
tree.commit('added a', timestamp=1153248633.4186721, timezone=0,
630
rev = tree.branch.repository.get_revision('a1')
631
self.assertEqual(1153248633.419, rev.timestamp)
633
def test_commit_has_1ms_resolution(self):
634
"""Allowing commit to generate the timestamp also has 1ms resolution"""
635
tree = self.make_branch_and_tree('.')
636
self.build_tree(['a'])
638
tree.commit('added a', rev_id='a1')
640
rev = tree.branch.repository.get_revision('a1')
641
timestamp = rev.timestamp
642
timestamp_1ms = round(timestamp, 3)
643
self.assertEqual(timestamp_1ms, timestamp)
645
def assertBasisTreeKind(self, kind, tree, file_id):
646
basis = tree.basis_tree()
649
self.assertEqual(kind, basis.kind(file_id))
653
def test_commit_kind_changes(self):
654
self.requireFeature(SymlinkFeature)
655
tree = self.make_branch_and_tree('.')
656
os.symlink('target', 'name')
657
tree.add('name', 'a-file-id')
658
tree.commit('Added a symlink')
659
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
662
self.build_tree(['name'])
663
tree.commit('Changed symlink to file')
664
self.assertBasisTreeKind('file', tree, 'a-file-id')
667
os.symlink('target', 'name')
668
tree.commit('file to symlink')
669
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
673
tree.commit('symlink to directory')
674
self.assertBasisTreeKind('directory', tree, 'a-file-id')
677
os.symlink('target', 'name')
678
tree.commit('directory to symlink')
679
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
681
# prepare for directory <-> file tests
684
tree.commit('symlink to directory')
685
self.assertBasisTreeKind('directory', tree, 'a-file-id')
688
self.build_tree(['name'])
689
tree.commit('Changed directory to file')
690
self.assertBasisTreeKind('file', tree, 'a-file-id')
694
tree.commit('file to directory')
695
self.assertBasisTreeKind('directory', tree, 'a-file-id')
697
def test_commit_unversioned_specified(self):
698
"""Commit should raise if specified files isn't in basis or worktree"""
699
tree = self.make_branch_and_tree('.')
700
self.assertRaises(errors.PathsNotVersionedError, tree.commit,
701
'message', specific_files=['bogus'])
703
class Callback(object):
705
def __init__(self, message, testcase):
707
self.message = message
708
self.testcase = testcase
710
def __call__(self, commit_obj):
712
self.testcase.assertTrue(isinstance(commit_obj, Commit))
715
def test_commit_callback(self):
716
"""Commit should invoke a callback to get the message"""
718
tree = self.make_branch_and_tree('.')
722
self.assertTrue(isinstance(e, BzrError))
723
self.assertEqual('The message or message_callback keyword'
724
' parameter is required for commit().', str(e))
726
self.fail('exception not raised')
727
cb = self.Callback(u'commit 1', self)
728
tree.commit(message_callback=cb)
729
self.assertTrue(cb.called)
730
repository = tree.branch.repository
731
message = repository.get_revision(tree.last_revision()).message
732
self.assertEqual('commit 1', message)
734
def test_no_callback_pointless(self):
735
"""Callback should not be invoked for pointless commit"""
736
tree = self.make_branch_and_tree('.')
737
cb = self.Callback(u'commit 2', self)
738
self.assertRaises(PointlessCommit, tree.commit, message_callback=cb,
739
allow_pointless=False)
740
self.assertFalse(cb.called)
742
def test_no_callback_netfailure(self):
743
"""Callback should not be invoked if connectivity fails"""
744
tree = self.make_branch_and_tree('.')
745
cb = self.Callback(u'commit 2', self)
746
repository = tree.branch.repository
747
# simulate network failure
748
def raise_(self, arg, arg2, arg3=None, arg4=None):
749
raise errors.NoSuchFile('foo')
750
repository.add_inventory = raise_
751
repository.add_inventory_by_delta = raise_
752
self.assertRaises(errors.NoSuchFile, tree.commit, message_callback=cb)
753
self.assertFalse(cb.called)
755
def test_selected_file_merge_commit(self):
756
"""Ensure the correct error is raised"""
757
tree = self.make_branch_and_tree('foo')
758
# pending merge would turn into a left parent
759
tree.commit('commit 1')
760
tree.add_parent_tree_id('example')
761
self.build_tree(['foo/bar', 'foo/baz'])
762
tree.add(['bar', 'baz'])
763
err = self.assertRaises(errors.CannotCommitSelectedFileMerge,
764
tree.commit, 'commit 2', specific_files=['bar', 'baz'])
765
self.assertEqual(['bar', 'baz'], err.files)
766
self.assertEqual('Selected-file commit of merges is not supported'
767
' yet: files bar, baz', str(err))
769
def test_commit_ordering(self):
770
"""Test of corner-case commit ordering error"""
771
tree = self.make_branch_and_tree('.')
772
self.build_tree(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
773
tree.add(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
775
self.build_tree(['a/c/d/'])
777
tree.rename_one('a/z/x', 'a/c/d/x')
778
tree.commit('test', specific_files=['a/z/y'])
780
def test_commit_no_author(self):
781
"""The default kwarg author in MutableTree.commit should not add
782
the 'author' revision property.
784
tree = self.make_branch_and_tree('foo')
785
rev_id = tree.commit('commit 1')
786
rev = tree.branch.repository.get_revision(rev_id)
787
self.assertFalse('author' in rev.properties)
788
self.assertFalse('authors' in rev.properties)
790
def test_commit_author(self):
791
"""Passing a non-empty author kwarg to MutableTree.commit should add
792
the 'author' revision property.
794
tree = self.make_branch_and_tree('foo')
795
rev_id = self.callDeprecated(['The parameter author was '
796
'deprecated in version 1.13. Use authors instead'],
797
tree.commit, 'commit 1', author='John Doe <jdoe@example.com>')
798
rev = tree.branch.repository.get_revision(rev_id)
799
self.assertEqual('John Doe <jdoe@example.com>',
800
rev.properties['authors'])
801
self.assertFalse('author' in rev.properties)
803
def test_commit_empty_authors_list(self):
804
"""Passing an empty list to authors shouldn't add the property."""
805
tree = self.make_branch_and_tree('foo')
806
rev_id = tree.commit('commit 1', authors=[])
807
rev = tree.branch.repository.get_revision(rev_id)
808
self.assertFalse('author' in rev.properties)
809
self.assertFalse('authors' in rev.properties)
811
def test_multiple_authors(self):
812
tree = self.make_branch_and_tree('foo')
813
rev_id = tree.commit('commit 1',
814
authors=['John Doe <jdoe@example.com>',
815
'Jane Rey <jrey@example.com>'])
816
rev = tree.branch.repository.get_revision(rev_id)
817
self.assertEqual('John Doe <jdoe@example.com>\n'
818
'Jane Rey <jrey@example.com>', rev.properties['authors'])
819
self.assertFalse('author' in rev.properties)
821
def test_author_and_authors_incompatible(self):
822
tree = self.make_branch_and_tree('foo')
823
self.assertRaises(AssertionError, tree.commit, 'commit 1',
824
authors=['John Doe <jdoe@example.com>',
825
'Jane Rey <jrey@example.com>'],
826
author="Jack Me <jme@example.com>")
828
def test_author_with_newline_rejected(self):
829
tree = self.make_branch_and_tree('foo')
830
self.assertRaises(AssertionError, tree.commit, 'commit 1',
831
authors=['John\nDoe <jdoe@example.com>'])
833
def test_commit_with_checkout_and_branch_sharing_repo(self):
834
repo = self.make_repository('repo', shared=True)
835
# make_branch_and_tree ignores shared repos
836
branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
837
tree2 = branch.create_checkout('repo/tree2')
838
tree2.commit('message', rev_id='rev1')
839
self.assertTrue(tree2.branch.repository.has_revision('rev1'))
added
removed
bzrlib/tests/test_commit.py
