← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

  • Committer: Robert Collins
  • Date: 2006-09-25 00:03:15 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: robertc@robertcollins.net-20060925000315-d096352885e1b2ec
(Robert Collins) bzr 0.11rc1 has branch, bump bzr.dev version to 0.12

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 by Canonical Ltd
2
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
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
import os
19
19
 
20
20
import bzrlib
21
 
from bzrlib import (
22
 
    bzrdir,
23
 
    errors,
24
 
    lockdir,
25
 
    osutils,
26
 
    tests,
27
 
    )
 
21
from bzrlib import errors
 
22
from bzrlib.tests import TestCaseWithTransport
28
23
from bzrlib.branch import Branch
29
24
from bzrlib.bzrdir import BzrDir, BzrDirMetaFormat1
 
25
from bzrlib.workingtree import WorkingTree
30
26
from bzrlib.commit import Commit, NullCommitReporter
31
27
from bzrlib.config import BranchConfig
32
 
from bzrlib.errors import (PointlessCommit, BzrError, SigningFailed,
 
28
from bzrlib.errors import (PointlessCommit, BzrError, SigningFailed, 
33
29
                           LockContention)
34
 
from bzrlib.tests import SymlinkFeature, TestCaseWithTransport
35
 
from bzrlib.workingtree import WorkingTree
36
30
 
37
31
 
38
32
# TODO: Test commit with some added, and added-but-missing files
71
65
    def renamed(self, change, old_path, new_path):
72
66
        self.calls.append(('renamed', change, old_path, new_path))
73
67
 
74
 
    def is_verbose(self):
75
 
        return True
76
 
 
77
68
 
78
69
class TestCommit(TestCaseWithTransport):
79
70
 
96
87
        eq(rev.message, 'add hello')
97
88
 
98
89
        tree1 = b.repository.revision_tree(rh[0])
99
 
        tree1.lock_read()
100
90
        text = tree1.get_file_text(file_id)
101
 
        tree1.unlock()
102
 
        self.assertEqual('hello world', text)
 
91
        eq(text, 'hello world')
103
92
 
104
93
        tree2 = b.repository.revision_tree(rh[1])
105
 
        tree2.lock_read()
106
 
        text = tree2.get_file_text(file_id)
107
 
        tree2.unlock()
108
 
        self.assertEqual('version 2', text)
 
94
        eq(tree2.get_file_text(file_id), 'version 2')
109
95
 
110
 
    def test_missing_commit(self):
111
 
        """Test a commit with a missing file"""
 
96
    def test_delete_commit(self):
 
97
        """Test a commit with a deleted file"""
112
98
        wt = self.make_branch_and_tree('.')
113
99
        b = wt.branch
114
100
        file('hello', 'w').write('hello world')
121
107
        tree = b.repository.revision_tree('rev2')
122
108
        self.assertFalse(tree.has_id('hello-id'))
123
109
 
124
 
    def test_partial_commit_move(self):
125
 
        """Test a partial commit where a file was renamed but not committed.
126
 
 
127
 
        https://bugs.launchpad.net/bzr/+bug/83039
128
 
 
129
 
        If not handled properly, commit will try to snapshot
130
 
        dialog.py with olive/ as a parent, while
131
 
        olive/ has not been snapshotted yet.
132
 
        """
133
 
        wt = self.make_branch_and_tree('.')
134
 
        b = wt.branch
135
 
        self.build_tree(['annotate/', 'annotate/foo.py',
136
 
                         'olive/', 'olive/dialog.py'
137
 
                        ])
138
 
        wt.add(['annotate', 'olive', 'annotate/foo.py', 'olive/dialog.py'])
139
 
        wt.commit(message='add files')
140
 
        wt.rename_one("olive/dialog.py", "aaa")
141
 
        self.build_tree_contents([('annotate/foo.py', 'modified\n')])
142
 
        wt.commit('renamed hello', specific_files=["annotate"])
143
 
 
144
110
    def test_pointless_commit(self):
145
111
        """Commit refuses unless there are changes or it's forced."""
146
112
        wt = self.make_branch_and_tree('.')
154
120
                          message='fails',
155
121
                          allow_pointless=False)
156
122
        self.assertEquals(b.revno(), 1)
157
 
 
 
123
        
158
124
    def test_commit_empty(self):
159
125
        """Commiting an empty tree works."""
160
126
        wt = self.make_branch_and_tree('.')
177
143
              ['hello-id', 'buongia-id'])
178
144
        wt.commit(message='add files',
179
145
                 rev_id='test@rev-1')
180
 
 
 
146
        
181
147
        os.remove('hello')
182
148
        file('buongia', 'w').write('new text')
183
149
        wt.commit(message='update text',
194
160
        eq(b.revno(), 3)
195
161
 
196
162
        tree2 = b.repository.revision_tree('test@rev-2')
197
 
        tree2.lock_read()
198
 
        self.addCleanup(tree2.unlock)
199
163
        self.assertTrue(tree2.has_filename('hello'))
200
164
        self.assertEquals(tree2.get_file_text('hello-id'), 'hello')
201
165
        self.assertEquals(tree2.get_file_text('buongia-id'), 'new text')
202
 
 
 
166
        
203
167
        tree3 = b.repository.revision_tree('test@rev-3')
204
 
        tree3.lock_read()
205
 
        self.addCleanup(tree3.unlock)
206
168
        self.assertFalse(tree3.has_filename('hello'))
207
169
        self.assertEquals(tree3.get_file_text('buongia-id'), 'new text')
208
170
 
219
181
 
220
182
        eq = self.assertEquals
221
183
        tree1 = b.repository.revision_tree('test@rev-1')
222
 
        tree1.lock_read()
223
 
        self.addCleanup(tree1.unlock)
224
184
        eq(tree1.id2path('hello-id'), 'hello')
225
185
        eq(tree1.get_file_text('hello-id'), 'contents of hello\n')
226
186
        self.assertFalse(tree1.has_filename('fruity'))
229
189
        eq(ie.revision, 'test@rev-1')
230
190
 
231
191
        tree2 = b.repository.revision_tree('test@rev-2')
232
 
        tree2.lock_read()
233
 
        self.addCleanup(tree2.unlock)
234
192
        eq(tree2.id2path('hello-id'), 'fruity')
235
193
        eq(tree2.get_file_text('hello-id'), 'contents of hello\n')
236
194
        self.check_inventory_shape(tree2.inventory, ['fruity'])
260
218
        wt.move(['hello'], 'a')
261
219
        r2 = 'test@rev-2'
262
220
        wt.commit('two', rev_id=r2, allow_pointless=False)
263
 
        wt.lock_read()
264
 
        try:
265
 
            self.check_inventory_shape(wt.read_working_inventory(),
266
 
                                       ['a/', 'a/hello', 'b/'])
267
 
        finally:
268
 
            wt.unlock()
 
221
        self.check_inventory_shape(wt.read_working_inventory(),
 
222
                                   ['a', 'a/hello', 'b'])
269
223
 
270
224
        wt.move(['b'], 'a')
271
225
        r3 = 'test@rev-3'
272
226
        wt.commit('three', rev_id=r3, allow_pointless=False)
273
 
        wt.lock_read()
274
 
        try:
275
 
            self.check_inventory_shape(wt.read_working_inventory(),
276
 
                                       ['a/', 'a/hello', 'a/b/'])
277
 
            self.check_inventory_shape(b.repository.get_inventory(r3),
278
 
                                       ['a/', 'a/hello', 'a/b/'])
279
 
        finally:
280
 
            wt.unlock()
 
227
        self.check_inventory_shape(wt.read_working_inventory(),
 
228
                                   ['a', 'a/hello', 'a/b'])
 
229
        self.check_inventory_shape(b.repository.get_revision_inventory(r3),
 
230
                                   ['a', 'a/hello', 'a/b'])
281
231
 
282
232
        wt.move(['a/hello'], 'a/b')
283
233
        r4 = 'test@rev-4'
284
234
        wt.commit('four', rev_id=r4, allow_pointless=False)
285
 
        wt.lock_read()
286
 
        try:
287
 
            self.check_inventory_shape(wt.read_working_inventory(),
288
 
                                       ['a/', 'a/b/hello', 'a/b/'])
289
 
        finally:
290
 
            wt.unlock()
 
235
        self.check_inventory_shape(wt.read_working_inventory(),
 
236
                                   ['a', 'a/b/hello', 'a/b'])
291
237
 
292
 
        inv = b.repository.get_inventory(r4)
 
238
        inv = b.repository.get_revision_inventory(r4)
293
239
        eq(inv['hello-id'].revision, r4)
294
240
        eq(inv['a-id'].revision, r1)
295
241
        eq(inv['b-id'].revision, r3)
296
 
 
 
242
        
297
243
    def test_removed_commit(self):
298
244
        """Commit with a removed file"""
299
245
        wt = self.make_branch_and_tree('.')
394
340
                                                      allow_pointless=True,
395
341
                                                      rev_id='B',
396
342
                                                      working_tree=wt)
397
 
            def sign(text):
398
 
                return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
399
 
            self.assertEqual(sign(Testament.from_revision(branch.repository,
400
 
                             'B').as_short_text()),
 
343
            self.assertEqual(Testament.from_revision(branch.repository,
 
344
                             'B').as_short_text(),
401
345
                             branch.repository.get_signature_text('B'))
402
346
        finally:
403
347
            bzrlib.gpg.GPGStrategy = oldstrategy
484
428
        other_bzrdir = master_branch.bzrdir.sprout('other')
485
429
        other_tree = other_bzrdir.open_workingtree()
486
430
 
487
 
        # do a commit to the other branch changing the content file so
 
431
        # do a commit to the the other branch changing the content file so
488
432
        # that our commit after merging will have a merged revision in the
489
433
        # content file history.
490
434
        self.build_tree_contents([('other/content_file', 'change in other\n')])
501
445
        bound_tree.commit(message='commit of merge in bound tree')
502
446
 
503
447
    def test_commit_reporting_after_merge(self):
504
 
        # when doing a commit of a merge, the reporter needs to still
 
448
        # when doing a commit of a merge, the reporter needs to still 
505
449
        # be called for each item that is added/removed/deleted.
506
450
        this_tree = self.make_branch_and_tree('this')
507
451
        # we need a bunch of files and dirs, to perform one action on each.
550
494
        this_tree.merge_from_branch(other_tree.branch)
551
495
        reporter = CapturingReporter()
552
496
        this_tree.commit('do the commit', reporter=reporter)
553
 
        expected = set([
 
497
        self.assertEqual([
 
498
            ('change', 'unchanged', ''),
 
499
            ('change', 'unchanged', 'dirtoleave'),
 
500
            ('change', 'unchanged', 'filetoleave'),
554
501
            ('change', 'modified', 'filetomodify'),
555
502
            ('change', 'added', 'newdir'),
556
503
            ('change', 'added', 'newfile'),
557
504
            ('renamed', 'renamed', 'dirtorename', 'renameddir'),
558
 
            ('renamed', 'renamed', 'filetorename', 'renamedfile'),
559
505
            ('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
560
506
            ('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
 
507
            ('renamed', 'renamed', 'filetorename', 'renamedfile'),
561
508
            ('deleted', 'dirtoremove'),
562
509
            ('deleted', 'filetoremove'),
563
 
            ])
564
 
        result = set(reporter.calls)
565
 
        missing = expected - result
566
 
        new = result - expected
567
 
        self.assertEqual((set(), set()), (missing, new))
 
510
            ],
 
511
            reporter.calls)
568
512
 
569
513
    def test_commit_removals_respects_filespec(self):
570
514
        """Commit respects the specified_files for removals."""
574
518
        tree.commit('added a, b')
575
519
        tree.remove(['a', 'b'])
576
520
        tree.commit('removed a', specific_files='a')
577
 
        basis = tree.basis_tree()
578
 
        tree.lock_read()
579
 
        try:
580
 
            self.assertIs(None, basis.path2id('a'))
581
 
            self.assertFalse(basis.path2id('b') is None)
582
 
        finally:
583
 
            tree.unlock()
 
521
        basis = tree.basis_tree().inventory
 
522
        self.assertIs(None, basis.path2id('a'))
 
523
        self.assertFalse(basis.path2id('b') is None)
584
524
 
585
525
    def test_commit_saves_1ms_timestamp(self):
586
526
        """Passing in a timestamp is saved with 1ms resolution"""
605
545
        timestamp_1ms = round(timestamp, 3)
606
546
        self.assertEqual(timestamp_1ms, timestamp)
607
547
 
608
 
    def assertBasisTreeKind(self, kind, tree, file_id):
609
 
        basis = tree.basis_tree()
610
 
        basis.lock_read()
611
 
        try:
612
 
            self.assertEqual(kind, basis.kind(file_id))
613
 
        finally:
614
 
            basis.unlock()
615
 
 
616
 
    def test_commit_kind_changes(self):
617
 
        self.requireFeature(SymlinkFeature)
618
 
        tree = self.make_branch_and_tree('.')
619
 
        os.symlink('target', 'name')
620
 
        tree.add('name', 'a-file-id')
621
 
        tree.commit('Added a symlink')
622
 
        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
623
 
 
624
 
        os.unlink('name')
625
 
        self.build_tree(['name'])
626
 
        tree.commit('Changed symlink to file')
627
 
        self.assertBasisTreeKind('file', tree, 'a-file-id')
628
 
 
629
 
        os.unlink('name')
630
 
        os.symlink('target', 'name')
631
 
        tree.commit('file to symlink')
632
 
        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
633
 
 
634
 
        os.unlink('name')
635
 
        os.mkdir('name')
636
 
        tree.commit('symlink to directory')
637
 
        self.assertBasisTreeKind('directory', tree, 'a-file-id')
638
 
 
639
 
        os.rmdir('name')
640
 
        os.symlink('target', 'name')
641
 
        tree.commit('directory to symlink')
642
 
        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
643
 
 
644
 
        # prepare for directory <-> file tests
645
 
        os.unlink('name')
646
 
        os.mkdir('name')
647
 
        tree.commit('symlink to directory')
648
 
        self.assertBasisTreeKind('directory', tree, 'a-file-id')
649
 
 
650
 
        os.rmdir('name')
651
 
        self.build_tree(['name'])
652
 
        tree.commit('Changed directory to file')
653
 
        self.assertBasisTreeKind('file', tree, 'a-file-id')
654
 
 
655
 
        os.unlink('name')
656
 
        os.mkdir('name')
657
 
        tree.commit('file to directory')
658
 
        self.assertBasisTreeKind('directory', tree, 'a-file-id')
659
 
 
660
548
    def test_commit_unversioned_specified(self):
661
549
        """Commit should raise if specified files isn't in basis or worktree"""
662
550
        tree = self.make_branch_and_tree('.')
663
 
        self.assertRaises(errors.PathsNotVersionedError, tree.commit,
 
551
        self.assertRaises(errors.PathsNotVersionedError, tree.commit, 
664
552
                          'message', specific_files=['bogus'])
665
 
 
666
 
    class Callback(object):
667
 
 
668
 
        def __init__(self, message, testcase):
669
 
            self.called = False
670
 
            self.message = message
671
 
            self.testcase = testcase
672
 
 
673
 
        def __call__(self, commit_obj):
674
 
            self.called = True
675
 
            self.testcase.assertTrue(isinstance(commit_obj, Commit))
676
 
            return self.message
677
 
 
678
 
    def test_commit_callback(self):
679
 
        """Commit should invoke a callback to get the message"""
680
 
 
681
 
        tree = self.make_branch_and_tree('.')
682
 
        try:
683
 
            tree.commit()
684
 
        except Exception, e:
685
 
            self.assertTrue(isinstance(e, BzrError))
686
 
            self.assertEqual('The message or message_callback keyword'
687
 
                             ' parameter is required for commit().', str(e))
688
 
        else:
689
 
            self.fail('exception not raised')
690
 
        cb = self.Callback(u'commit 1', self)
691
 
        tree.commit(message_callback=cb)
692
 
        self.assertTrue(cb.called)
693
 
        repository = tree.branch.repository
694
 
        message = repository.get_revision(tree.last_revision()).message
695
 
        self.assertEqual('commit 1', message)
696
 
 
697
 
    def test_no_callback_pointless(self):
698
 
        """Callback should not be invoked for pointless commit"""
699
 
        tree = self.make_branch_and_tree('.')
700
 
        cb = self.Callback(u'commit 2', self)
701
 
        self.assertRaises(PointlessCommit, tree.commit, message_callback=cb,
702
 
                          allow_pointless=False)
703
 
        self.assertFalse(cb.called)
704
 
 
705
 
    def test_no_callback_netfailure(self):
706
 
        """Callback should not be invoked if connectivity fails"""
707
 
        tree = self.make_branch_and_tree('.')
708
 
        cb = self.Callback(u'commit 2', self)
709
 
        repository = tree.branch.repository
710
 
        # simulate network failure
711
 
        def raise_(self, arg, arg2, arg3=None, arg4=None):
712
 
            raise errors.NoSuchFile('foo')
713
 
        repository.add_inventory = raise_
714
 
        repository.add_inventory_by_delta = raise_
715
 
        self.assertRaises(errors.NoSuchFile, tree.commit, message_callback=cb)
716
 
        self.assertFalse(cb.called)
717
 
 
718
 
    def test_selected_file_merge_commit(self):
719
 
        """Ensure the correct error is raised"""
720
 
        tree = self.make_branch_and_tree('foo')
721
 
        # pending merge would turn into a left parent
722
 
        tree.commit('commit 1')
723
 
        tree.add_parent_tree_id('example')
724
 
        self.build_tree(['foo/bar', 'foo/baz'])
725
 
        tree.add(['bar', 'baz'])
726
 
        err = self.assertRaises(errors.CannotCommitSelectedFileMerge,
727
 
            tree.commit, 'commit 2', specific_files=['bar', 'baz'])
728
 
        self.assertEqual(['bar', 'baz'], err.files)
729
 
        self.assertEqual('Selected-file commit of merges is not supported'
730
 
                         ' yet: files bar, baz', str(err))
731
 
 
732
 
    def test_commit_ordering(self):
733
 
        """Test of corner-case commit ordering error"""
734
 
        tree = self.make_branch_and_tree('.')
735
 
        self.build_tree(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
736
 
        tree.add(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
737
 
        tree.commit('setup')
738
 
        self.build_tree(['a/c/d/'])
739
 
        tree.add('a/c/d')
740
 
        tree.rename_one('a/z/x', 'a/c/d/x')
741
 
        tree.commit('test', specific_files=['a/z/y'])
742
 
 
743
 
    def test_commit_no_author(self):
744
 
        """The default kwarg author in MutableTree.commit should not add
745
 
        the 'author' revision property.
746
 
        """
747
 
        tree = self.make_branch_and_tree('foo')
748
 
        rev_id = tree.commit('commit 1')
749
 
        rev = tree.branch.repository.get_revision(rev_id)
750
 
        self.assertFalse('author' in rev.properties)
751
 
        self.assertFalse('authors' in rev.properties)
752
 
 
753
 
    def test_commit_author(self):
754
 
        """Passing a non-empty author kwarg to MutableTree.commit should add
755
 
        the 'author' revision property.
756
 
        """
757
 
        tree = self.make_branch_and_tree('foo')
758
 
        rev_id = self.callDeprecated(['The parameter author was '
759
 
                'deprecated in version 1.13. Use authors instead'],
760
 
                tree.commit, 'commit 1', author='John Doe <jdoe@example.com>')
761
 
        rev = tree.branch.repository.get_revision(rev_id)
762
 
        self.assertEqual('John Doe <jdoe@example.com>',
763
 
                         rev.properties['authors'])
764
 
        self.assertFalse('author' in rev.properties)
765
 
 
766
 
    def test_commit_empty_authors_list(self):
767
 
        """Passing an empty list to authors shouldn't add the property."""
768
 
        tree = self.make_branch_and_tree('foo')
769
 
        rev_id = tree.commit('commit 1', authors=[])
770
 
        rev = tree.branch.repository.get_revision(rev_id)
771
 
        self.assertFalse('author' in rev.properties)
772
 
        self.assertFalse('authors' in rev.properties)
773
 
 
774
 
    def test_multiple_authors(self):
775
 
        tree = self.make_branch_and_tree('foo')
776
 
        rev_id = tree.commit('commit 1',
777
 
                authors=['John Doe <jdoe@example.com>',
778
 
                         'Jane Rey <jrey@example.com>'])
779
 
        rev = tree.branch.repository.get_revision(rev_id)
780
 
        self.assertEqual('John Doe <jdoe@example.com>\n'
781
 
                'Jane Rey <jrey@example.com>', rev.properties['authors'])
782
 
        self.assertFalse('author' in rev.properties)
783
 
 
784
 
    def test_author_and_authors_incompatible(self):
785
 
        tree = self.make_branch_and_tree('foo')
786
 
        self.assertRaises(AssertionError, tree.commit, 'commit 1',
787
 
                authors=['John Doe <jdoe@example.com>',
788
 
                         'Jane Rey <jrey@example.com>'],
789
 
                author="Jack Me <jme@example.com>")
790
 
 
791
 
    def test_author_with_newline_rejected(self):
792
 
        tree = self.make_branch_and_tree('foo')
793
 
        self.assertRaises(AssertionError, tree.commit, 'commit 1',
794
 
                authors=['John\nDoe <jdoe@example.com>'])
795
 
 
796
 
    def test_commit_with_checkout_and_branch_sharing_repo(self):
797
 
        repo = self.make_repository('repo', shared=True)
798
 
        # make_branch_and_tree ignores shared repos
799
 
        branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
800
 
        tree2 = branch.create_checkout('repo/tree2')
801
 
        tree2.commit('message', rev_id='rev1')
802
 
        self.assertTrue(tree2.branch.repository.has_revision('rev1'))