/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-19 04:37:48 UTC
  • mfrom: (5741.3.8 506265-command-deprecation)
  • Revision ID: pqm@pqm.ubuntu.com-20110419043748-qq4lsmc50cckqzp7
(mbp) Deprecate 'bzr clone' and 'bzr get' (bug 506265) (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
 
 
1
# Copyright (C) 2005-2011 Canonical Ltd
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
import os
19
19
 
20
20
import bzrlib
21
 
from bzrlib.tests import TestCaseWithTransport
 
21
from bzrlib import (
 
22
    bzrdir,
 
23
    errors,
 
24
    )
22
25
from bzrlib.branch import Branch
23
 
from bzrlib.bzrdir import BzrDir, BzrDirMetaFormat1
24
 
from bzrlib.workingtree import WorkingTree
25
 
from bzrlib.commit import Commit
 
26
from bzrlib.bzrdir import BzrDirMetaFormat1
 
27
from bzrlib.commit import Commit, NullCommitReporter
26
28
from bzrlib.config import BranchConfig
27
 
from bzrlib.errors import (PointlessCommit, BzrError, SigningFailed, 
 
29
from bzrlib.errors import (PointlessCommit, BzrError, SigningFailed,
28
30
                           LockContention)
 
31
from bzrlib.tests import (
 
32
    SymlinkFeature,
 
33
    TestCaseWithTransport,
 
34
    test_foreign,
 
35
    )
29
36
 
30
37
 
31
38
# TODO: Test commit with some added, and added-but-missing files
45
52
        return "bzrlib.ahook bzrlib.ahook"
46
53
 
47
54
 
 
55
class CapturingReporter(NullCommitReporter):
 
56
    """This reporter captures the calls made to it for evaluation later."""
 
57
 
 
58
    def __init__(self):
 
59
        # a list of the calls this received
 
60
        self.calls = []
 
61
 
 
62
    def snapshot_change(self, change, path):
 
63
        self.calls.append(('change', change, path))
 
64
 
 
65
    def deleted(self, file_id):
 
66
        self.calls.append(('deleted', file_id))
 
67
 
 
68
    def missing(self, path):
 
69
        self.calls.append(('missing', path))
 
70
 
 
71
    def renamed(self, change, old_path, new_path):
 
72
        self.calls.append(('renamed', change, old_path, new_path))
 
73
 
 
74
    def is_verbose(self):
 
75
        return True
 
76
 
 
77
 
48
78
class TestCommit(TestCaseWithTransport):
49
79
 
50
80
    def test_simple_commit(self):
66
96
        eq(rev.message, 'add hello')
67
97
 
68
98
        tree1 = b.repository.revision_tree(rh[0])
 
99
        tree1.lock_read()
69
100
        text = tree1.get_file_text(file_id)
70
 
        eq(text, 'hello world')
 
101
        tree1.unlock()
 
102
        self.assertEqual('hello world', text)
71
103
 
72
104
        tree2 = b.repository.revision_tree(rh[1])
73
 
        eq(tree2.get_file_text(file_id), 'version 2')
74
 
 
75
 
    def test_delete_commit(self):
76
 
        """Test a commit with a deleted file"""
 
105
        tree2.lock_read()
 
106
        text = tree2.get_file_text(file_id)
 
107
        tree2.unlock()
 
108
        self.assertEqual('version 2', text)
 
109
 
 
110
    def test_commit_lossy_native(self):
 
111
        """Attempt a lossy commit to a native branch."""
 
112
        wt = self.make_branch_and_tree('.')
 
113
        b = wt.branch
 
114
        file('hello', 'w').write('hello world')
 
115
        wt.add('hello')
 
116
        revid = wt.commit(message='add hello', rev_id='revid', lossy=True)
 
117
        self.assertEquals('revid', revid)
 
118
 
 
119
    def test_commit_lossy_foreign(self):
 
120
        """Attempt a lossy commit to a foreign branch."""
 
121
        test_foreign.register_dummy_foreign_for_test(self)
 
122
        wt = self.make_branch_and_tree('.',
 
123
            format=test_foreign.DummyForeignVcsDirFormat())
 
124
        b = wt.branch
 
125
        file('hello', 'w').write('hello world')
 
126
        wt.add('hello')
 
127
        revid = wt.commit(message='add hello', lossy=True,
 
128
            timestamp=1302659388, timezone=0)
 
129
        self.assertEquals('dummy-v1:1302659388.0-0-UNKNOWN', revid)
 
130
 
 
131
    def test_commit_bound_lossy_foreign(self):
 
132
        """Attempt a lossy commit to a bzr branch bound to a foreign branch."""
 
133
        test_foreign.register_dummy_foreign_for_test(self)
 
134
        foreign_branch = self.make_branch('foreign',
 
135
            format=test_foreign.DummyForeignVcsDirFormat())
 
136
        wt = foreign_branch.create_checkout("local")
 
137
        b = wt.branch
 
138
        file('local/hello', 'w').write('hello world')
 
139
        wt.add('hello')
 
140
        revid = wt.commit(message='add hello', lossy=True,
 
141
            timestamp=1302659388, timezone=0)
 
142
        self.assertEquals('dummy-v1:1302659388.0-0-0', revid)
 
143
        self.assertEquals('dummy-v1:1302659388.0-0-0',
 
144
            foreign_branch.last_revision())
 
145
        self.assertEquals('dummy-v1:1302659388.0-0-0',
 
146
            wt.branch.last_revision())
 
147
 
 
148
    def test_missing_commit(self):
 
149
        """Test a commit with a missing file"""
77
150
        wt = self.make_branch_and_tree('.')
78
151
        b = wt.branch
79
152
        file('hello', 'w').write('hello world')
86
159
        tree = b.repository.revision_tree('rev2')
87
160
        self.assertFalse(tree.has_id('hello-id'))
88
161
 
 
162
    def test_partial_commit_move(self):
 
163
        """Test a partial commit where a file was renamed but not committed.
 
164
 
 
165
        https://bugs.launchpad.net/bzr/+bug/83039
 
166
 
 
167
        If not handled properly, commit will try to snapshot
 
168
        dialog.py with olive/ as a parent, while
 
169
        olive/ has not been snapshotted yet.
 
170
        """
 
171
        wt = self.make_branch_and_tree('.')
 
172
        b = wt.branch
 
173
        self.build_tree(['annotate/', 'annotate/foo.py',
 
174
                         'olive/', 'olive/dialog.py'
 
175
                        ])
 
176
        wt.add(['annotate', 'olive', 'annotate/foo.py', 'olive/dialog.py'])
 
177
        wt.commit(message='add files')
 
178
        wt.rename_one("olive/dialog.py", "aaa")
 
179
        self.build_tree_contents([('annotate/foo.py', 'modified\n')])
 
180
        wt.commit('renamed hello', specific_files=["annotate"])
 
181
 
89
182
    def test_pointless_commit(self):
90
183
        """Commit refuses unless there are changes or it's forced."""
91
184
        wt = self.make_branch_and_tree('.')
99
192
                          message='fails',
100
193
                          allow_pointless=False)
101
194
        self.assertEquals(b.revno(), 1)
102
 
        
 
195
 
103
196
    def test_commit_empty(self):
104
197
        """Commiting an empty tree works."""
105
198
        wt = self.make_branch_and_tree('.')
122
215
              ['hello-id', 'buongia-id'])
123
216
        wt.commit(message='add files',
124
217
                 rev_id='test@rev-1')
125
 
        
 
218
 
126
219
        os.remove('hello')
127
220
        file('buongia', 'w').write('new text')
128
221
        wt.commit(message='update text',
139
232
        eq(b.revno(), 3)
140
233
 
141
234
        tree2 = b.repository.revision_tree('test@rev-2')
 
235
        tree2.lock_read()
 
236
        self.addCleanup(tree2.unlock)
142
237
        self.assertTrue(tree2.has_filename('hello'))
143
238
        self.assertEquals(tree2.get_file_text('hello-id'), 'hello')
144
239
        self.assertEquals(tree2.get_file_text('buongia-id'), 'new text')
145
 
        
 
240
 
146
241
        tree3 = b.repository.revision_tree('test@rev-3')
 
242
        tree3.lock_read()
 
243
        self.addCleanup(tree3.unlock)
147
244
        self.assertFalse(tree3.has_filename('hello'))
148
245
        self.assertEquals(tree3.get_file_text('buongia-id'), 'new text')
149
246
 
160
257
 
161
258
        eq = self.assertEquals
162
259
        tree1 = b.repository.revision_tree('test@rev-1')
 
260
        tree1.lock_read()
 
261
        self.addCleanup(tree1.unlock)
163
262
        eq(tree1.id2path('hello-id'), 'hello')
164
263
        eq(tree1.get_file_text('hello-id'), 'contents of hello\n')
165
264
        self.assertFalse(tree1.has_filename('fruity'))
168
267
        eq(ie.revision, 'test@rev-1')
169
268
 
170
269
        tree2 = b.repository.revision_tree('test@rev-2')
 
270
        tree2.lock_read()
 
271
        self.addCleanup(tree2.unlock)
171
272
        eq(tree2.id2path('hello-id'), 'fruity')
172
273
        eq(tree2.get_file_text('hello-id'), 'contents of hello\n')
173
274
        self.check_inventory_shape(tree2.inventory, ['fruity'])
197
298
        wt.move(['hello'], 'a')
198
299
        r2 = 'test@rev-2'
199
300
        wt.commit('two', rev_id=r2, allow_pointless=False)
200
 
        self.check_inventory_shape(wt.read_working_inventory(),
201
 
                                   ['a', 'a/hello', 'b'])
 
301
        wt.lock_read()
 
302
        try:
 
303
            self.check_inventory_shape(wt.read_working_inventory(),
 
304
                                       ['a/', 'a/hello', 'b/'])
 
305
        finally:
 
306
            wt.unlock()
202
307
 
203
308
        wt.move(['b'], 'a')
204
309
        r3 = 'test@rev-3'
205
310
        wt.commit('three', rev_id=r3, allow_pointless=False)
206
 
        self.check_inventory_shape(wt.read_working_inventory(),
207
 
                                   ['a', 'a/hello', 'a/b'])
208
 
        self.check_inventory_shape(b.repository.get_revision_inventory(r3),
209
 
                                   ['a', 'a/hello', 'a/b'])
 
311
        wt.lock_read()
 
312
        try:
 
313
            self.check_inventory_shape(wt.read_working_inventory(),
 
314
                                       ['a/', 'a/hello', 'a/b/'])
 
315
            self.check_inventory_shape(b.repository.get_inventory(r3),
 
316
                                       ['a/', 'a/hello', 'a/b/'])
 
317
        finally:
 
318
            wt.unlock()
210
319
 
211
320
        wt.move(['a/hello'], 'a/b')
212
321
        r4 = 'test@rev-4'
213
322
        wt.commit('four', rev_id=r4, allow_pointless=False)
214
 
        self.check_inventory_shape(wt.read_working_inventory(),
215
 
                                   ['a', 'a/b/hello', 'a/b'])
 
323
        wt.lock_read()
 
324
        try:
 
325
            self.check_inventory_shape(wt.read_working_inventory(),
 
326
                                       ['a/', 'a/b/hello', 'a/b/'])
 
327
        finally:
 
328
            wt.unlock()
216
329
 
217
 
        inv = b.repository.get_revision_inventory(r4)
 
330
        inv = b.repository.get_inventory(r4)
218
331
        eq(inv['hello-id'].revision, r4)
219
332
        eq(inv['a-id'].revision, r1)
220
333
        eq(inv['b-id'].revision, r3)
221
 
        
 
334
 
222
335
    def test_removed_commit(self):
223
336
        """Commit with a removed file"""
224
337
        wt = self.make_branch_and_tree('.')
278
391
    def test_strict_commit_without_unknowns(self):
279
392
        """Try and commit with no unknown files and strict = True,
280
393
        should work."""
281
 
        from bzrlib.errors import StrictCommitFailed
282
394
        wt = self.make_branch_and_tree('.')
283
395
        b = wt.branch
284
396
        file('hello', 'w').write('hello world')
310
422
        wt = self.make_branch_and_tree('.')
311
423
        branch = wt.branch
312
424
        wt.commit("base", allow_pointless=True, rev_id='A')
313
 
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
 
425
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
314
426
        try:
315
427
            from bzrlib.testament import Testament
316
428
            # monkey patch gpg signing mechanism
319
431
                                                      allow_pointless=True,
320
432
                                                      rev_id='B',
321
433
                                                      working_tree=wt)
322
 
            self.assertEqual(Testament.from_revision(branch.repository,
323
 
                             'B').as_short_text(),
 
434
            def sign(text):
 
435
                return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
 
436
            self.assertEqual(sign(Testament.from_revision(branch.repository,
 
437
                             'B').as_short_text()),
324
438
                             branch.repository.get_signature_text('B'))
325
439
        finally:
326
440
            bzrlib.gpg.GPGStrategy = oldstrategy
332
446
        wt = self.make_branch_and_tree('.')
333
447
        branch = wt.branch
334
448
        wt.commit("base", allow_pointless=True, rev_id='A')
335
 
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
 
449
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
336
450
        try:
337
 
            from bzrlib.testament import Testament
338
451
            # monkey patch gpg signing mechanism
339
452
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.DisabledGPGStrategy
340
453
            config = MustSignConfig(branch)
346
459
                              working_tree=wt)
347
460
            branch = Branch.open(self.get_url('.'))
348
461
            self.assertEqual(branch.revision_history(), ['A'])
349
 
            self.failIf(branch.repository.has_revision('B'))
 
462
            self.assertFalse(branch.repository.has_revision('B'))
350
463
        finally:
351
464
            bzrlib.gpg.GPGStrategy = oldstrategy
352
465
 
392
505
            self.assertRaises(LockContention, wt.commit, 'silly')
393
506
        finally:
394
507
            master_branch.unlock()
 
508
 
 
509
    def test_commit_bound_merge(self):
 
510
        # see bug #43959; commit of a merge in a bound branch fails to push
 
511
        # the new commit into the master
 
512
        master_branch = self.make_branch('master')
 
513
        bound_tree = self.make_branch_and_tree('bound')
 
514
        bound_tree.branch.bind(master_branch)
 
515
 
 
516
        self.build_tree_contents([('bound/content_file', 'initial contents\n')])
 
517
        bound_tree.add(['content_file'])
 
518
        bound_tree.commit(message='woo!')
 
519
 
 
520
        other_bzrdir = master_branch.bzrdir.sprout('other')
 
521
        other_tree = other_bzrdir.open_workingtree()
 
522
 
 
523
        # do a commit to the other branch changing the content file so
 
524
        # that our commit after merging will have a merged revision in the
 
525
        # content file history.
 
526
        self.build_tree_contents([('other/content_file', 'change in other\n')])
 
527
        other_tree.commit('change in other')
 
528
 
 
529
        # do a merge into the bound branch from other, and then change the
 
530
        # content file locally to force a new revision (rather than using the
 
531
        # revision from other). This forces extra processing in commit.
 
532
        bound_tree.merge_from_branch(other_tree.branch)
 
533
        self.build_tree_contents([('bound/content_file', 'change in bound\n')])
 
534
 
 
535
        # before #34959 was fixed, this failed with 'revision not present in
 
536
        # weave' when trying to implicitly push from the bound branch to the master
 
537
        bound_tree.commit(message='commit of merge in bound tree')
 
538
 
 
539
    def test_commit_reporting_after_merge(self):
 
540
        # when doing a commit of a merge, the reporter needs to still
 
541
        # be called for each item that is added/removed/deleted.
 
542
        this_tree = self.make_branch_and_tree('this')
 
543
        # we need a bunch of files and dirs, to perform one action on each.
 
544
        self.build_tree([
 
545
            'this/dirtorename/',
 
546
            'this/dirtoreparent/',
 
547
            'this/dirtoleave/',
 
548
            'this/dirtoremove/',
 
549
            'this/filetoreparent',
 
550
            'this/filetorename',
 
551
            'this/filetomodify',
 
552
            'this/filetoremove',
 
553
            'this/filetoleave']
 
554
            )
 
555
        this_tree.add([
 
556
            'dirtorename',
 
557
            'dirtoreparent',
 
558
            'dirtoleave',
 
559
            'dirtoremove',
 
560
            'filetoreparent',
 
561
            'filetorename',
 
562
            'filetomodify',
 
563
            'filetoremove',
 
564
            'filetoleave']
 
565
            )
 
566
        this_tree.commit('create_files')
 
567
        other_dir = this_tree.bzrdir.sprout('other')
 
568
        other_tree = other_dir.open_workingtree()
 
569
        other_tree.lock_write()
 
570
        # perform the needed actions on the files and dirs.
 
571
        try:
 
572
            other_tree.rename_one('dirtorename', 'renameddir')
 
573
            other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
 
574
            other_tree.rename_one('filetorename', 'renamedfile')
 
575
            other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
 
576
            other_tree.remove(['dirtoremove', 'filetoremove'])
 
577
            self.build_tree_contents([
 
578
                ('other/newdir/', ),
 
579
                ('other/filetomodify', 'new content'),
 
580
                ('other/newfile', 'new file content')])
 
581
            other_tree.add('newfile')
 
582
            other_tree.add('newdir/')
 
583
            other_tree.commit('modify all sample files and dirs.')
 
584
        finally:
 
585
            other_tree.unlock()
 
586
        this_tree.merge_from_branch(other_tree.branch)
 
587
        reporter = CapturingReporter()
 
588
        this_tree.commit('do the commit', reporter=reporter)
 
589
        expected = set([
 
590
            ('change', 'modified', 'filetomodify'),
 
591
            ('change', 'added', 'newdir'),
 
592
            ('change', 'added', 'newfile'),
 
593
            ('renamed', 'renamed', 'dirtorename', 'renameddir'),
 
594
            ('renamed', 'renamed', 'filetorename', 'renamedfile'),
 
595
            ('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
 
596
            ('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
 
597
            ('deleted', 'dirtoremove'),
 
598
            ('deleted', 'filetoremove'),
 
599
            ])
 
600
        result = set(reporter.calls)
 
601
        missing = expected - result
 
602
        new = result - expected
 
603
        self.assertEqual((set(), set()), (missing, new))
 
604
 
 
605
    def test_commit_removals_respects_filespec(self):
 
606
        """Commit respects the specified_files for removals."""
 
607
        tree = self.make_branch_and_tree('.')
 
608
        self.build_tree(['a', 'b'])
 
609
        tree.add(['a', 'b'])
 
610
        tree.commit('added a, b')
 
611
        tree.remove(['a', 'b'])
 
612
        tree.commit('removed a', specific_files='a')
 
613
        basis = tree.basis_tree()
 
614
        tree.lock_read()
 
615
        try:
 
616
            self.assertIs(None, basis.path2id('a'))
 
617
            self.assertFalse(basis.path2id('b') is None)
 
618
        finally:
 
619
            tree.unlock()
 
620
 
 
621
    def test_commit_saves_1ms_timestamp(self):
 
622
        """Passing in a timestamp is saved with 1ms resolution"""
 
623
        tree = self.make_branch_and_tree('.')
 
624
        self.build_tree(['a'])
 
625
        tree.add('a')
 
626
        tree.commit('added a', timestamp=1153248633.4186721, timezone=0,
 
627
                    rev_id='a1')
 
628
 
 
629
        rev = tree.branch.repository.get_revision('a1')
 
630
        self.assertEqual(1153248633.419, rev.timestamp)
 
631
 
 
632
    def test_commit_has_1ms_resolution(self):
 
633
        """Allowing commit to generate the timestamp also has 1ms resolution"""
 
634
        tree = self.make_branch_and_tree('.')
 
635
        self.build_tree(['a'])
 
636
        tree.add('a')
 
637
        tree.commit('added a', rev_id='a1')
 
638
 
 
639
        rev = tree.branch.repository.get_revision('a1')
 
640
        timestamp = rev.timestamp
 
641
        timestamp_1ms = round(timestamp, 3)
 
642
        self.assertEqual(timestamp_1ms, timestamp)
 
643
 
 
644
    def assertBasisTreeKind(self, kind, tree, file_id):
 
645
        basis = tree.basis_tree()
 
646
        basis.lock_read()
 
647
        try:
 
648
            self.assertEqual(kind, basis.kind(file_id))
 
649
        finally:
 
650
            basis.unlock()
 
651
 
 
652
    def test_commit_kind_changes(self):
 
653
        self.requireFeature(SymlinkFeature)
 
654
        tree = self.make_branch_and_tree('.')
 
655
        os.symlink('target', 'name')
 
656
        tree.add('name', 'a-file-id')
 
657
        tree.commit('Added a symlink')
 
658
        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
 
659
 
 
660
        os.unlink('name')
 
661
        self.build_tree(['name'])
 
662
        tree.commit('Changed symlink to file')
 
663
        self.assertBasisTreeKind('file', tree, 'a-file-id')
 
664
 
 
665
        os.unlink('name')
 
666
        os.symlink('target', 'name')
 
667
        tree.commit('file to symlink')
 
668
        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
 
669
 
 
670
        os.unlink('name')
 
671
        os.mkdir('name')
 
672
        tree.commit('symlink to directory')
 
673
        self.assertBasisTreeKind('directory', tree, 'a-file-id')
 
674
 
 
675
        os.rmdir('name')
 
676
        os.symlink('target', 'name')
 
677
        tree.commit('directory to symlink')
 
678
        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
 
679
 
 
680
        # prepare for directory <-> file tests
 
681
        os.unlink('name')
 
682
        os.mkdir('name')
 
683
        tree.commit('symlink to directory')
 
684
        self.assertBasisTreeKind('directory', tree, 'a-file-id')
 
685
 
 
686
        os.rmdir('name')
 
687
        self.build_tree(['name'])
 
688
        tree.commit('Changed directory to file')
 
689
        self.assertBasisTreeKind('file', tree, 'a-file-id')
 
690
 
 
691
        os.unlink('name')
 
692
        os.mkdir('name')
 
693
        tree.commit('file to directory')
 
694
        self.assertBasisTreeKind('directory', tree, 'a-file-id')
 
695
 
 
696
    def test_commit_unversioned_specified(self):
 
697
        """Commit should raise if specified files isn't in basis or worktree"""
 
698
        tree = self.make_branch_and_tree('.')
 
699
        self.assertRaises(errors.PathsNotVersionedError, tree.commit,
 
700
                          'message', specific_files=['bogus'])
 
701
 
 
702
    class Callback(object):
 
703
 
 
704
        def __init__(self, message, testcase):
 
705
            self.called = False
 
706
            self.message = message
 
707
            self.testcase = testcase
 
708
 
 
709
        def __call__(self, commit_obj):
 
710
            self.called = True
 
711
            self.testcase.assertTrue(isinstance(commit_obj, Commit))
 
712
            return self.message
 
713
 
 
714
    def test_commit_callback(self):
 
715
        """Commit should invoke a callback to get the message"""
 
716
 
 
717
        tree = self.make_branch_and_tree('.')
 
718
        try:
 
719
            tree.commit()
 
720
        except Exception, e:
 
721
            self.assertTrue(isinstance(e, BzrError))
 
722
            self.assertEqual('The message or message_callback keyword'
 
723
                             ' parameter is required for commit().', str(e))
 
724
        else:
 
725
            self.fail('exception not raised')
 
726
        cb = self.Callback(u'commit 1', self)
 
727
        tree.commit(message_callback=cb)
 
728
        self.assertTrue(cb.called)
 
729
        repository = tree.branch.repository
 
730
        message = repository.get_revision(tree.last_revision()).message
 
731
        self.assertEqual('commit 1', message)
 
732
 
 
733
    def test_no_callback_pointless(self):
 
734
        """Callback should not be invoked for pointless commit"""
 
735
        tree = self.make_branch_and_tree('.')
 
736
        cb = self.Callback(u'commit 2', self)
 
737
        self.assertRaises(PointlessCommit, tree.commit, message_callback=cb,
 
738
                          allow_pointless=False)
 
739
        self.assertFalse(cb.called)
 
740
 
 
741
    def test_no_callback_netfailure(self):
 
742
        """Callback should not be invoked if connectivity fails"""
 
743
        tree = self.make_branch_and_tree('.')
 
744
        cb = self.Callback(u'commit 2', self)
 
745
        repository = tree.branch.repository
 
746
        # simulate network failure
 
747
        def raise_(self, arg, arg2, arg3=None, arg4=None):
 
748
            raise errors.NoSuchFile('foo')
 
749
        repository.add_inventory = raise_
 
750
        repository.add_inventory_by_delta = raise_
 
751
        self.assertRaises(errors.NoSuchFile, tree.commit, message_callback=cb)
 
752
        self.assertFalse(cb.called)
 
753
 
 
754
    def test_selected_file_merge_commit(self):
 
755
        """Ensure the correct error is raised"""
 
756
        tree = self.make_branch_and_tree('foo')
 
757
        # pending merge would turn into a left parent
 
758
        tree.commit('commit 1')
 
759
        tree.add_parent_tree_id('example')
 
760
        self.build_tree(['foo/bar', 'foo/baz'])
 
761
        tree.add(['bar', 'baz'])
 
762
        err = self.assertRaises(errors.CannotCommitSelectedFileMerge,
 
763
            tree.commit, 'commit 2', specific_files=['bar', 'baz'])
 
764
        self.assertEqual(['bar', 'baz'], err.files)
 
765
        self.assertEqual('Selected-file commit of merges is not supported'
 
766
                         ' yet: files bar, baz', str(err))
 
767
 
 
768
    def test_commit_ordering(self):
 
769
        """Test of corner-case commit ordering error"""
 
770
        tree = self.make_branch_and_tree('.')
 
771
        self.build_tree(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
 
772
        tree.add(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
 
773
        tree.commit('setup')
 
774
        self.build_tree(['a/c/d/'])
 
775
        tree.add('a/c/d')
 
776
        tree.rename_one('a/z/x', 'a/c/d/x')
 
777
        tree.commit('test', specific_files=['a/z/y'])
 
778
 
 
779
    def test_commit_no_author(self):
 
780
        """The default kwarg author in MutableTree.commit should not add
 
781
        the 'author' revision property.
 
782
        """
 
783
        tree = self.make_branch_and_tree('foo')
 
784
        rev_id = tree.commit('commit 1')
 
785
        rev = tree.branch.repository.get_revision(rev_id)
 
786
        self.assertFalse('author' in rev.properties)
 
787
        self.assertFalse('authors' in rev.properties)
 
788
 
 
789
    def test_commit_author(self):
 
790
        """Passing a non-empty author kwarg to MutableTree.commit should add
 
791
        the 'author' revision property.
 
792
        """
 
793
        tree = self.make_branch_and_tree('foo')
 
794
        rev_id = self.callDeprecated(['The parameter author was '
 
795
                'deprecated in version 1.13. Use authors instead'],
 
796
                tree.commit, 'commit 1', author='John Doe <jdoe@example.com>')
 
797
        rev = tree.branch.repository.get_revision(rev_id)
 
798
        self.assertEqual('John Doe <jdoe@example.com>',
 
799
                         rev.properties['authors'])
 
800
        self.assertFalse('author' in rev.properties)
 
801
 
 
802
    def test_commit_empty_authors_list(self):
 
803
        """Passing an empty list to authors shouldn't add the property."""
 
804
        tree = self.make_branch_and_tree('foo')
 
805
        rev_id = tree.commit('commit 1', authors=[])
 
806
        rev = tree.branch.repository.get_revision(rev_id)
 
807
        self.assertFalse('author' in rev.properties)
 
808
        self.assertFalse('authors' in rev.properties)
 
809
 
 
810
    def test_multiple_authors(self):
 
811
        tree = self.make_branch_and_tree('foo')
 
812
        rev_id = tree.commit('commit 1',
 
813
                authors=['John Doe <jdoe@example.com>',
 
814
                         'Jane Rey <jrey@example.com>'])
 
815
        rev = tree.branch.repository.get_revision(rev_id)
 
816
        self.assertEqual('John Doe <jdoe@example.com>\n'
 
817
                'Jane Rey <jrey@example.com>', rev.properties['authors'])
 
818
        self.assertFalse('author' in rev.properties)
 
819
 
 
820
    def test_author_and_authors_incompatible(self):
 
821
        tree = self.make_branch_and_tree('foo')
 
822
        self.assertRaises(AssertionError, tree.commit, 'commit 1',
 
823
                authors=['John Doe <jdoe@example.com>',
 
824
                         'Jane Rey <jrey@example.com>'],
 
825
                author="Jack Me <jme@example.com>")
 
826
 
 
827
    def test_author_with_newline_rejected(self):
 
828
        tree = self.make_branch_and_tree('foo')
 
829
        self.assertRaises(AssertionError, tree.commit, 'commit 1',
 
830
                authors=['John\nDoe <jdoe@example.com>'])
 
831
 
 
832
    def test_commit_with_checkout_and_branch_sharing_repo(self):
 
833
        repo = self.make_repository('repo', shared=True)
 
834
        # make_branch_and_tree ignores shared repos
 
835
        branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
 
836
        tree2 = branch.create_checkout('repo/tree2')
 
837
        tree2.commit('message', rev_id='rev1')
 
838
        self.assertTrue(tree2.branch.repository.has_revision('rev1'))