1
# Copyright (C) 2005-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
26
from ..branch import Branch
27
from ..bzr.bzrdir import BzrDirMetaFormat1
28
from ..commit import (
29
CannotCommitSelectedFileMerge,
35
from ..errors import (
41
TestCaseWithTransport,
44
from .features import (
47
from .matchers import MatchesAncestry
50
# TODO: Test commit with some added, and added-but-missing files
52
class MustSignConfig(config.MemoryStack):
55
super(MustSignConfig, self).__init__('''
56
create_signatures=always
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
with file('hello', 'w') as f: f.write('hello world')
91
rev1 = wt.commit(message='add hello')
92
file_id = wt.path2id('hello')
94
with file('hello', 'w') as f: f.write('version 2')
95
rev2 = wt.commit(message='commit 2')
99
rev = b.repository.get_revision(rev1)
100
eq(rev.message, 'add hello')
102
tree1 = b.repository.revision_tree(rev1)
104
text = tree1.get_file_text(file_id)
106
self.assertEqual('hello world', text)
108
tree2 = b.repository.revision_tree(rev2)
110
text = tree2.get_file_text(file_id)
112
self.assertEqual('version 2', text)
114
def test_commit_lossy_native(self):
115
"""Attempt a lossy commit to a native branch."""
116
wt = self.make_branch_and_tree('.')
118
with file('hello', 'w') as f: f.write('hello world')
120
revid = wt.commit(message='add hello', rev_id='revid', lossy=True)
121
self.assertEqual('revid', revid)
123
def test_commit_lossy_foreign(self):
124
"""Attempt a lossy commit to a foreign branch."""
125
test_foreign.register_dummy_foreign_for_test(self)
126
wt = self.make_branch_and_tree('.',
127
format=test_foreign.DummyForeignVcsDirFormat())
129
with file('hello', 'w') as f: f.write('hello world')
131
revid = wt.commit(message='add hello', lossy=True,
132
timestamp=1302659388, timezone=0)
133
self.assertEqual('dummy-v1:1302659388.0-0-UNKNOWN', revid)
135
def test_commit_bound_lossy_foreign(self):
136
"""Attempt a lossy commit to a bzr branch bound to a foreign branch."""
137
test_foreign.register_dummy_foreign_for_test(self)
138
foreign_branch = self.make_branch('foreign',
139
format=test_foreign.DummyForeignVcsDirFormat())
140
wt = foreign_branch.create_checkout("local")
142
with file('local/hello', 'w') as f: f.write('hello world')
144
revid = wt.commit(message='add hello', lossy=True,
145
timestamp=1302659388, timezone=0)
146
self.assertEqual('dummy-v1:1302659388.0-0-0', revid)
147
self.assertEqual('dummy-v1:1302659388.0-0-0',
148
foreign_branch.last_revision())
149
self.assertEqual('dummy-v1:1302659388.0-0-0',
150
wt.branch.last_revision())
152
def test_missing_commit(self):
153
"""Test a commit with a missing file"""
154
wt = self.make_branch_and_tree('.')
156
with file('hello', 'w') as f: f.write('hello world')
157
wt.add(['hello'], ['hello-id'])
158
wt.commit(message='add hello')
161
reporter = CapturingReporter()
162
wt.commit('removed hello', rev_id='rev2', reporter=reporter)
164
[('missing', u'hello'), ('deleted', u'hello')],
167
tree = b.repository.revision_tree('rev2')
168
self.assertFalse(tree.has_id('hello-id'))
170
def test_partial_commit_move(self):
171
"""Test a partial commit where a file was renamed but not committed.
173
https://bugs.launchpad.net/bzr/+bug/83039
175
If not handled properly, commit will try to snapshot
176
dialog.py with olive/ as a parent, while
177
olive/ has not been snapshotted yet.
179
wt = self.make_branch_and_tree('.')
181
self.build_tree(['annotate/', 'annotate/foo.py',
182
'olive/', 'olive/dialog.py'
184
wt.add(['annotate', 'olive', 'annotate/foo.py', 'olive/dialog.py'])
185
wt.commit(message='add files')
186
wt.rename_one("olive/dialog.py", "aaa")
187
self.build_tree_contents([('annotate/foo.py', 'modified\n')])
188
wt.commit('renamed hello', specific_files=["annotate"])
190
def test_pointless_commit(self):
191
"""Commit refuses unless there are changes or it's forced."""
192
wt = self.make_branch_and_tree('.')
194
with file('hello', 'w') as f: f.write('hello')
196
wt.commit(message='add hello')
197
self.assertEqual(b.revno(), 1)
198
self.assertRaises(PointlessCommit,
201
allow_pointless=False)
202
self.assertEqual(b.revno(), 1)
204
def test_commit_empty(self):
205
"""Commiting an empty tree works."""
206
wt = self.make_branch_and_tree('.')
208
wt.commit(message='empty tree', allow_pointless=True)
209
self.assertRaises(PointlessCommit,
211
message='empty tree',
212
allow_pointless=False)
213
wt.commit(message='empty tree', allow_pointless=True)
214
self.assertEqual(b.revno(), 2)
216
def test_selective_delete(self):
217
"""Selective commit in tree with deletions"""
218
wt = self.make_branch_and_tree('.')
220
with file('hello', 'w') as f: f.write('hello')
221
with file('buongia', 'w') as f: f.write('buongia')
222
wt.add(['hello', 'buongia'],
223
['hello-id', 'buongia-id'])
224
wt.commit(message='add files',
228
with file('buongia', 'w') as f: f.write('new text')
229
wt.commit(message='update text',
230
specific_files=['buongia'],
231
allow_pointless=False,
234
wt.commit(message='remove hello',
235
specific_files=['hello'],
236
allow_pointless=False,
239
eq = self.assertEqual
242
tree2 = b.repository.revision_tree('test@rev-2')
244
self.addCleanup(tree2.unlock)
245
self.assertTrue(tree2.has_filename('hello'))
246
self.assertEqual(tree2.get_file_text('hello-id'), 'hello')
247
self.assertEqual(tree2.get_file_text('buongia-id'), 'new text')
249
tree3 = b.repository.revision_tree('test@rev-3')
251
self.addCleanup(tree3.unlock)
252
self.assertFalse(tree3.has_filename('hello'))
253
self.assertEqual(tree3.get_file_text('buongia-id'), 'new text')
255
def test_commit_rename(self):
256
"""Test commit of a revision where a file is renamed."""
257
tree = self.make_branch_and_tree('.')
259
self.build_tree(['hello'], line_endings='binary')
260
tree.add(['hello'], ['hello-id'])
261
tree.commit(message='one', rev_id='test@rev-1', allow_pointless=False)
263
tree.rename_one('hello', 'fruity')
264
tree.commit(message='renamed', rev_id='test@rev-2', allow_pointless=False)
266
eq = self.assertEqual
267
tree1 = b.repository.revision_tree('test@rev-1')
269
self.addCleanup(tree1.unlock)
270
eq(tree1.id2path('hello-id'), 'hello')
271
eq(tree1.get_file_text('hello-id'), 'contents of hello\n')
272
self.assertFalse(tree1.has_filename('fruity'))
273
self.check_tree_shape(tree1, ['hello'])
274
eq(tree1.get_file_revision('hello-id'), 'test@rev-1')
276
tree2 = b.repository.revision_tree('test@rev-2')
278
self.addCleanup(tree2.unlock)
279
eq(tree2.id2path('hello-id'), 'fruity')
280
eq(tree2.get_file_text('hello-id'), 'contents of hello\n')
281
self.check_tree_shape(tree2, ['fruity'])
282
eq(tree2.get_file_revision('hello-id'), 'test@rev-2')
284
def test_reused_rev_id(self):
285
"""Test that a revision id cannot be reused in a branch"""
286
wt = self.make_branch_and_tree('.')
288
wt.commit('initial', rev_id='test@rev-1', allow_pointless=True)
289
self.assertRaises(Exception,
293
allow_pointless=True)
295
def test_commit_move(self):
296
"""Test commit of revisions with moved files and directories"""
297
eq = self.assertEqual
298
wt = self.make_branch_and_tree('.')
301
self.build_tree(['hello', 'a/', 'b/'])
302
wt.add(['hello', 'a', 'b'], ['hello-id', 'a-id', 'b-id'])
303
wt.commit('initial', rev_id=r1, allow_pointless=False)
304
wt.move(['hello'], 'a')
306
wt.commit('two', rev_id=r2, allow_pointless=False)
309
self.check_tree_shape(wt, ['a/', 'a/hello', 'b/'])
315
wt.commit('three', rev_id=r3, allow_pointless=False)
318
self.check_tree_shape(wt,
319
['a/', 'a/hello', 'a/b/'])
320
self.check_tree_shape(b.repository.revision_tree(r3),
321
['a/', 'a/hello', 'a/b/'])
325
wt.move(['a/hello'], 'a/b')
327
wt.commit('four', rev_id=r4, allow_pointless=False)
330
self.check_tree_shape(wt, ['a/', 'a/b/hello', 'a/b/'])
334
inv = b.repository.get_inventory(r4)
335
eq(inv['hello-id'].revision, r4)
336
eq(inv['a-id'].revision, r1)
337
eq(inv['b-id'].revision, r3)
339
def test_removed_commit(self):
340
"""Commit with a removed file"""
341
wt = self.make_branch_and_tree('.')
343
with file('hello', 'w') as f: f.write('hello world')
344
wt.add(['hello'], ['hello-id'])
345
wt.commit(message='add hello')
347
wt.commit('removed hello', rev_id='rev2')
349
tree = b.repository.revision_tree('rev2')
350
self.assertFalse(tree.has_id('hello-id'))
352
def test_committed_ancestry(self):
353
"""Test commit appends revisions to ancestry."""
354
wt = self.make_branch_and_tree('.')
358
with file('hello', 'w') as f: f.write((str(i) * 4) + '\n')
360
wt.add(['hello'], ['hello-id'])
361
rev_id = 'test@rev-%d' % (i+1)
362
rev_ids.append(rev_id)
363
wt.commit(message='rev %d' % (i+1),
366
self.assertThat(rev_ids[:i+1],
367
MatchesAncestry(b.repository, rev_ids[i]))
369
def test_commit_new_subdir_child_selective(self):
370
wt = self.make_branch_and_tree('.')
372
self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
373
wt.add(['dir', 'dir/file1', 'dir/file2'],
374
['dirid', 'file1id', 'file2id'])
375
wt.commit('dir/file1', specific_files=['dir/file1'], rev_id='1')
376
inv = b.repository.get_inventory('1')
377
self.assertEqual('1', inv['dirid'].revision)
378
self.assertEqual('1', inv['file1id'].revision)
379
# FIXME: This should raise a KeyError I think, rbc20051006
380
self.assertRaises(BzrError, inv.__getitem__, 'file2id')
382
def test_strict_commit(self):
383
"""Try and commit with unknown files and strict = True, should fail."""
384
from ..errors import StrictCommitFailed
385
wt = self.make_branch_and_tree('.')
387
with file('hello', 'w') as f: f.write('hello world')
389
with file('goodbye', 'w') as f: f.write('goodbye cruel world!')
390
self.assertRaises(StrictCommitFailed, wt.commit,
391
message='add hello but not goodbye', strict=True)
393
def test_strict_commit_without_unknowns(self):
394
"""Try and commit with no unknown files and strict = True,
396
wt = self.make_branch_and_tree('.')
398
with file('hello', 'w') as f: f.write('hello world')
400
wt.commit(message='add hello', strict=True)
402
def test_nonstrict_commit(self):
403
"""Try and commit with unknown files and strict = False, should work."""
404
wt = self.make_branch_and_tree('.')
406
with file('hello', 'w') as f: f.write('hello world')
408
with file('goodbye', 'w') as f: f.write('goodbye cruel world!')
409
wt.commit(message='add hello but not goodbye', strict=False)
411
def test_nonstrict_commit_without_unknowns(self):
412
"""Try and commit with no unknown files and strict = False,
414
wt = self.make_branch_and_tree('.')
416
with file('hello', 'w') as f: f.write('hello world')
418
wt.commit(message='add hello', strict=False)
420
def test_signed_commit(self):
422
import breezy.commit as commit
423
oldstrategy = breezy.gpg.GPGStrategy
424
wt = self.make_branch_and_tree('.')
426
wt.commit("base", allow_pointless=True, rev_id='A')
427
self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
429
from ..testament import Testament
430
# monkey patch gpg signing mechanism
431
breezy.gpg.GPGStrategy = breezy.gpg.LoopbackGPGStrategy
432
conf = config.MemoryStack('''
433
create_signatures=always
435
commit.Commit(config_stack=conf).commit(
436
message="base", allow_pointless=True, rev_id='B',
439
return breezy.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
breezy.gpg.GPGStrategy = oldstrategy
446
def test_commit_failed_signature(self):
448
import breezy.commit as commit
449
oldstrategy = breezy.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
breezy.gpg.GPGStrategy = breezy.gpg.DisabledGPGStrategy
457
conf = config.MemoryStack('''
458
create_signatures=always
460
self.assertRaises(breezy.gpg.SigningFailed,
461
commit.Commit(config_stack=conf).commit,
463
allow_pointless=True,
466
branch = Branch.open(self.get_url('.'))
467
self.assertEqual(branch.last_revision(), 'A')
468
self.assertFalse(branch.repository.has_revision('B'))
470
breezy.gpg.GPGStrategy = oldstrategy
472
def test_commit_invokes_hooks(self):
473
import breezy.commit as commit
474
wt = self.make_branch_and_tree('.')
477
def called(branch, rev_id):
478
calls.append('called')
479
breezy.ahook = called
481
conf = config.MemoryStack('post_commit=breezy.ahook breezy.ahook')
482
commit.Commit(config_stack=conf).commit(
483
message = "base", allow_pointless=True, rev_id='A',
485
self.assertEqual(['called', 'called'], calls)
489
def test_commit_object_doesnt_set_nick(self):
490
# using the Commit object directly does not set the branch nick.
491
wt = self.make_branch_and_tree('.')
493
c.commit(working_tree=wt, message='empty tree', allow_pointless=True)
494
self.assertEqual(wt.branch.revno(), 1)
496
wt.branch.repository.get_revision(
497
wt.branch.last_revision()).properties)
499
def test_safe_master_lock(self):
501
master = BzrDirMetaFormat1().initialize('master')
502
master.create_repository()
503
master_branch = master.create_branch()
504
master.create_workingtree()
505
bound = master.sprout('bound')
506
wt = bound.open_workingtree()
507
wt.branch.set_bound_location(os.path.realpath('master'))
508
master_branch.lock_write()
510
self.assertRaises(LockContention, wt.commit, 'silly')
512
master_branch.unlock()
514
def test_commit_bound_merge(self):
515
# see bug #43959; commit of a merge in a bound branch fails to push
516
# the new commit into the master
517
master_branch = self.make_branch('master')
518
bound_tree = self.make_branch_and_tree('bound')
519
bound_tree.branch.bind(master_branch)
521
self.build_tree_contents([('bound/content_file', 'initial contents\n')])
522
bound_tree.add(['content_file'])
523
bound_tree.commit(message='woo!')
525
other_bzrdir = master_branch.controldir.sprout('other')
526
other_tree = other_bzrdir.open_workingtree()
528
# do a commit to the other branch changing the content file so
529
# that our commit after merging will have a merged revision in the
530
# content file history.
531
self.build_tree_contents([('other/content_file', 'change in other\n')])
532
other_tree.commit('change in other')
534
# do a merge into the bound branch from other, and then change the
535
# content file locally to force a new revision (rather than using the
536
# revision from other). This forces extra processing in commit.
537
bound_tree.merge_from_branch(other_tree.branch)
538
self.build_tree_contents([('bound/content_file', 'change in bound\n')])
540
# before #34959 was fixed, this failed with 'revision not present in
541
# weave' when trying to implicitly push from the bound branch to the master
542
bound_tree.commit(message='commit of merge in bound tree')
544
def test_commit_reporting_after_merge(self):
545
# when doing a commit of a merge, the reporter needs to still
546
# be called for each item that is added/removed/deleted.
547
this_tree = self.make_branch_and_tree('this')
548
# we need a bunch of files and dirs, to perform one action on each.
551
'this/dirtoreparent/',
554
'this/filetoreparent',
571
this_tree.commit('create_files')
572
other_dir = this_tree.controldir.sprout('other')
573
other_tree = other_dir.open_workingtree()
574
other_tree.lock_write()
575
# perform the needed actions on the files and dirs.
577
other_tree.rename_one('dirtorename', 'renameddir')
578
other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
579
other_tree.rename_one('filetorename', 'renamedfile')
580
other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
581
other_tree.remove(['dirtoremove', 'filetoremove'])
582
self.build_tree_contents([
584
('other/filetomodify', 'new content'),
585
('other/newfile', 'new file content')])
586
other_tree.add('newfile')
587
other_tree.add('newdir/')
588
other_tree.commit('modify all sample files and dirs.')
591
this_tree.merge_from_branch(other_tree.branch)
592
reporter = CapturingReporter()
593
this_tree.commit('do the commit', reporter=reporter)
595
('change', 'modified', 'filetomodify'),
596
('change', 'added', 'newdir'),
597
('change', 'added', 'newfile'),
598
('renamed', 'renamed', 'dirtorename', 'renameddir'),
599
('renamed', 'renamed', 'filetorename', 'renamedfile'),
600
('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
601
('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
602
('deleted', 'dirtoremove'),
603
('deleted', 'filetoremove'),
605
result = set(reporter.calls)
606
missing = expected - result
607
new = result - expected
608
self.assertEqual((set(), set()), (missing, new))
610
def test_commit_removals_respects_filespec(self):
611
"""Commit respects the specified_files for removals."""
612
tree = self.make_branch_and_tree('.')
613
self.build_tree(['a', 'b'])
615
tree.commit('added a, b')
616
tree.remove(['a', 'b'])
617
tree.commit('removed a', specific_files='a')
618
basis = tree.basis_tree()
621
self.assertIs(None, basis.path2id('a'))
622
self.assertFalse(basis.path2id('b') is None)
626
def test_commit_saves_1ms_timestamp(self):
627
"""Passing in a timestamp is saved with 1ms resolution"""
628
tree = self.make_branch_and_tree('.')
629
self.build_tree(['a'])
631
tree.commit('added a', timestamp=1153248633.4186721, timezone=0,
634
rev = tree.branch.repository.get_revision('a1')
635
self.assertEqual(1153248633.419, rev.timestamp)
637
def test_commit_has_1ms_resolution(self):
638
"""Allowing commit to generate the timestamp also has 1ms resolution"""
639
tree = self.make_branch_and_tree('.')
640
self.build_tree(['a'])
642
tree.commit('added a', rev_id='a1')
644
rev = tree.branch.repository.get_revision('a1')
645
timestamp = rev.timestamp
646
timestamp_1ms = round(timestamp, 3)
647
self.assertEqual(timestamp_1ms, timestamp)
649
def assertBasisTreeKind(self, kind, tree, file_id):
650
basis = tree.basis_tree()
653
self.assertEqual(kind, basis.kind(file_id))
657
def test_commit_kind_changes(self):
658
self.requireFeature(SymlinkFeature)
659
tree = self.make_branch_and_tree('.')
660
os.symlink('target', 'name')
661
tree.add('name', 'a-file-id')
662
tree.commit('Added a symlink')
663
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
666
self.build_tree(['name'])
667
tree.commit('Changed symlink to file')
668
self.assertBasisTreeKind('file', tree, 'a-file-id')
671
os.symlink('target', 'name')
672
tree.commit('file to symlink')
673
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
677
tree.commit('symlink to directory')
678
self.assertBasisTreeKind('directory', tree, 'a-file-id')
681
os.symlink('target', 'name')
682
tree.commit('directory to symlink')
683
self.assertBasisTreeKind('symlink', tree, 'a-file-id')
685
# prepare for directory <-> file tests
688
tree.commit('symlink to directory')
689
self.assertBasisTreeKind('directory', tree, 'a-file-id')
692
self.build_tree(['name'])
693
tree.commit('Changed directory to file')
694
self.assertBasisTreeKind('file', tree, 'a-file-id')
698
tree.commit('file to directory')
699
self.assertBasisTreeKind('directory', tree, 'a-file-id')
701
def test_commit_unversioned_specified(self):
702
"""Commit should raise if specified files isn't in basis or worktree"""
703
tree = self.make_branch_and_tree('.')
704
self.assertRaises(errors.PathsNotVersionedError, tree.commit,
705
'message', specific_files=['bogus'])
707
class Callback(object):
709
def __init__(self, message, testcase):
711
self.message = message
712
self.testcase = testcase
714
def __call__(self, commit_obj):
716
self.testcase.assertTrue(isinstance(commit_obj, Commit))
719
def test_commit_callback(self):
720
"""Commit should invoke a callback to get the message"""
722
tree = self.make_branch_and_tree('.')
725
except Exception as e:
726
self.assertTrue(isinstance(e, BzrError))
727
self.assertEqual('The message or message_callback keyword'
728
' parameter is required for commit().', str(e))
730
self.fail('exception not raised')
731
cb = self.Callback(u'commit 1', self)
732
tree.commit(message_callback=cb)
733
self.assertTrue(cb.called)
734
repository = tree.branch.repository
735
message = repository.get_revision(tree.last_revision()).message
736
self.assertEqual('commit 1', message)
738
def test_no_callback_pointless(self):
739
"""Callback should not be invoked for pointless commit"""
740
tree = self.make_branch_and_tree('.')
741
cb = self.Callback(u'commit 2', self)
742
self.assertRaises(PointlessCommit, tree.commit, message_callback=cb,
743
allow_pointless=False)
744
self.assertFalse(cb.called)
746
def test_no_callback_netfailure(self):
747
"""Callback should not be invoked if connectivity fails"""
748
tree = self.make_branch_and_tree('.')
749
cb = self.Callback(u'commit 2', self)
750
repository = tree.branch.repository
751
# simulate network failure
752
def raise_(self, arg, arg2, arg3=None, arg4=None):
753
raise errors.NoSuchFile('foo')
754
repository.add_inventory = raise_
755
repository.add_inventory_by_delta = raise_
756
self.assertRaises(errors.NoSuchFile, tree.commit, message_callback=cb)
757
self.assertFalse(cb.called)
759
def test_selected_file_merge_commit(self):
760
"""Ensure the correct error is raised"""
761
tree = self.make_branch_and_tree('foo')
762
# pending merge would turn into a left parent
763
tree.commit('commit 1')
764
tree.add_parent_tree_id('example')
765
self.build_tree(['foo/bar', 'foo/baz'])
766
tree.add(['bar', 'baz'])
767
err = self.assertRaises(CannotCommitSelectedFileMerge,
768
tree.commit, 'commit 2', specific_files=['bar', 'baz'])
769
self.assertEqual(['bar', 'baz'], err.files)
770
self.assertEqual('Selected-file commit of merges is not supported'
771
' yet: files bar, baz', str(err))
773
def test_commit_ordering(self):
774
"""Test of corner-case commit ordering error"""
775
tree = self.make_branch_and_tree('.')
776
self.build_tree(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
777
tree.add(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
779
self.build_tree(['a/c/d/'])
781
tree.rename_one('a/z/x', 'a/c/d/x')
782
tree.commit('test', specific_files=['a/z/y'])
784
def test_commit_no_author(self):
785
"""The default kwarg author in MutableTree.commit should not add
786
the 'author' revision property.
788
tree = self.make_branch_and_tree('foo')
789
rev_id = tree.commit('commit 1')
790
rev = tree.branch.repository.get_revision(rev_id)
791
self.assertFalse('author' in rev.properties)
792
self.assertFalse('authors' in rev.properties)
794
def test_commit_author(self):
795
"""Passing a non-empty authors kwarg to MutableTree.commit should add
796
the 'author' revision property.
798
tree = self.make_branch_and_tree('foo')
799
rev_id = tree.commit(
801
authors=['John Doe <jdoe@example.com>'])
802
rev = tree.branch.repository.get_revision(rev_id)
803
self.assertEqual('John Doe <jdoe@example.com>',
804
rev.properties['authors'])
805
self.assertFalse('author' in rev.properties)
807
def test_commit_empty_authors_list(self):
808
"""Passing an empty list to authors shouldn't add the property."""
809
tree = self.make_branch_and_tree('foo')
810
rev_id = tree.commit('commit 1', authors=[])
811
rev = tree.branch.repository.get_revision(rev_id)
812
self.assertFalse('author' in rev.properties)
813
self.assertFalse('authors' in rev.properties)
815
def test_multiple_authors(self):
816
tree = self.make_branch_and_tree('foo')
817
rev_id = tree.commit('commit 1',
818
authors=['John Doe <jdoe@example.com>',
819
'Jane Rey <jrey@example.com>'])
820
rev = tree.branch.repository.get_revision(rev_id)
821
self.assertEqual('John Doe <jdoe@example.com>\n'
822
'Jane Rey <jrey@example.com>', rev.properties['authors'])
823
self.assertFalse('author' in rev.properties)
825
def test_author_with_newline_rejected(self):
826
tree = self.make_branch_and_tree('foo')
827
self.assertRaises(AssertionError, tree.commit, 'commit 1',
828
authors=['John\nDoe <jdoe@example.com>'])
830
def test_commit_with_checkout_and_branch_sharing_repo(self):
831
repo = self.make_repository('repo', shared=True)
832
# make_branch_and_tree ignores shared repos
833
branch = controldir.ControlDir.create_branch_convenience('repo/branch')
834
tree2 = branch.create_checkout('repo/tree2')
835
tree2.commit('message', rev_id='rev1')
836
self.assertTrue(tree2.branch.repository.has_revision('rev1'))
839
class FilterExcludedTests(TestCase):
841
def test_add_file_not_excluded(self):
843
('fid', (None, 'newpath'),
844
0, (False, False), ('pid', 'pid'), ('newpath', 'newpath'),
845
('file', 'file'), (True, True))]
846
self.assertEqual(changes, list(filter_excluded(changes, ['otherpath'])))
848
def test_add_file_excluded(self):
850
('fid', (None, 'newpath'),
851
0, (False, False), ('pid', 'pid'), ('newpath', 'newpath'),
852
('file', 'file'), (True, True))]
853
self.assertEqual([], list(filter_excluded(changes, ['newpath'])))
855
def test_delete_file_excluded(self):
857
('fid', ('somepath', None),
858
0, (False, None), ('pid', None), ('newpath', None),
859
('file', None), (True, None))]
860
self.assertEqual([], list(filter_excluded(changes, ['somepath'])))
862
def test_move_from_or_to_excluded(self):
864
('fid', ('oldpath', 'newpath'),
865
0, (False, False), ('pid', 'pid'), ('oldpath', 'newpath'),
866
('file', 'file'), (True, True))]
867
self.assertEqual([], list(filter_excluded(changes, ['oldpath'])))
868
self.assertEqual([], list(filter_excluded(changes, ['newpath'])))
added
removed
breezy/tests/test_commit.py
