/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: 2008-01-16 05:39:13 UTC
  • mfrom: (1551.19.27 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20080116053913-ny7sihxkms5v6d7j
Merge now uses the submit_branch by default (abentley)

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, 2006 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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
    lockdir,
 
25
    osutils,
 
26
    tests,
 
27
    )
22
28
from bzrlib.branch import Branch
23
29
from bzrlib.bzrdir import BzrDir, BzrDirMetaFormat1
24
 
from bzrlib.workingtree import WorkingTree
25
 
from bzrlib.commit import Commit
 
30
from bzrlib.commit import Commit, NullCommitReporter
26
31
from bzrlib.config import BranchConfig
27
32
from bzrlib.errors import (PointlessCommit, BzrError, SigningFailed, 
28
33
                           LockContention)
 
34
from bzrlib.tests import SymlinkFeature, TestCaseWithTransport
 
35
from bzrlib.workingtree import WorkingTree
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')
 
105
        tree2.lock_read()
 
106
        text = tree2.get_file_text(file_id)
 
107
        tree2.unlock()
 
108
        self.assertEqual('version 2', text)
74
109
 
75
110
    def test_delete_commit(self):
76
111
        """Test a commit with a deleted file"""
139
174
        eq(b.revno(), 3)
140
175
 
141
176
        tree2 = b.repository.revision_tree('test@rev-2')
 
177
        tree2.lock_read()
 
178
        self.addCleanup(tree2.unlock)
142
179
        self.assertTrue(tree2.has_filename('hello'))
143
180
        self.assertEquals(tree2.get_file_text('hello-id'), 'hello')
144
181
        self.assertEquals(tree2.get_file_text('buongia-id'), 'new text')
145
182
        
146
183
        tree3 = b.repository.revision_tree('test@rev-3')
 
184
        tree3.lock_read()
 
185
        self.addCleanup(tree3.unlock)
147
186
        self.assertFalse(tree3.has_filename('hello'))
148
187
        self.assertEquals(tree3.get_file_text('buongia-id'), 'new text')
149
188
 
160
199
 
161
200
        eq = self.assertEquals
162
201
        tree1 = b.repository.revision_tree('test@rev-1')
 
202
        tree1.lock_read()
 
203
        self.addCleanup(tree1.unlock)
163
204
        eq(tree1.id2path('hello-id'), 'hello')
164
205
        eq(tree1.get_file_text('hello-id'), 'contents of hello\n')
165
206
        self.assertFalse(tree1.has_filename('fruity'))
168
209
        eq(ie.revision, 'test@rev-1')
169
210
 
170
211
        tree2 = b.repository.revision_tree('test@rev-2')
 
212
        tree2.lock_read()
 
213
        self.addCleanup(tree2.unlock)
171
214
        eq(tree2.id2path('hello-id'), 'fruity')
172
215
        eq(tree2.get_file_text('hello-id'), 'contents of hello\n')
173
216
        self.check_inventory_shape(tree2.inventory, ['fruity'])
197
240
        wt.move(['hello'], 'a')
198
241
        r2 = 'test@rev-2'
199
242
        wt.commit('two', rev_id=r2, allow_pointless=False)
200
 
        self.check_inventory_shape(wt.read_working_inventory(),
201
 
                                   ['a', 'a/hello', 'b'])
 
243
        wt.lock_read()
 
244
        try:
 
245
            self.check_inventory_shape(wt.read_working_inventory(),
 
246
                                       ['a/', 'a/hello', 'b/'])
 
247
        finally:
 
248
            wt.unlock()
202
249
 
203
250
        wt.move(['b'], 'a')
204
251
        r3 = 'test@rev-3'
205
252
        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'])
 
253
        wt.lock_read()
 
254
        try:
 
255
            self.check_inventory_shape(wt.read_working_inventory(),
 
256
                                       ['a/', 'a/hello', 'a/b/'])
 
257
            self.check_inventory_shape(b.repository.get_revision_inventory(r3),
 
258
                                       ['a/', 'a/hello', 'a/b/'])
 
259
        finally:
 
260
            wt.unlock()
210
261
 
211
262
        wt.move(['a/hello'], 'a/b')
212
263
        r4 = 'test@rev-4'
213
264
        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'])
 
265
        wt.lock_read()
 
266
        try:
 
267
            self.check_inventory_shape(wt.read_working_inventory(),
 
268
                                       ['a/', 'a/b/hello', 'a/b/'])
 
269
        finally:
 
270
            wt.unlock()
216
271
 
217
272
        inv = b.repository.get_revision_inventory(r4)
218
273
        eq(inv['hello-id'].revision, r4)
219
274
        eq(inv['a-id'].revision, r1)
220
275
        eq(inv['b-id'].revision, r3)
221
 
        
 
276
 
222
277
    def test_removed_commit(self):
223
278
        """Commit with a removed file"""
224
279
        wt = self.make_branch_and_tree('.')
319
374
                                                      allow_pointless=True,
320
375
                                                      rev_id='B',
321
376
                                                      working_tree=wt)
322
 
            self.assertEqual(Testament.from_revision(branch.repository,
323
 
                             'B').as_short_text(),
 
377
            def sign(text):
 
378
                return bzrlib.gpg.LoopbackGPGStrategy(None).sign(text)
 
379
            self.assertEqual(sign(Testament.from_revision(branch.repository,
 
380
                             'B').as_short_text()),
324
381
                             branch.repository.get_signature_text('B'))
325
382
        finally:
326
383
            bzrlib.gpg.GPGStrategy = oldstrategy
387
444
        bound = master.sprout('bound')
388
445
        wt = bound.open_workingtree()
389
446
        wt.branch.set_bound_location(os.path.realpath('master'))
 
447
 
 
448
        orig_default = lockdir._DEFAULT_TIMEOUT_SECONDS
390
449
        master_branch.lock_write()
391
450
        try:
 
451
            lockdir._DEFAULT_TIMEOUT_SECONDS = 1
392
452
            self.assertRaises(LockContention, wt.commit, 'silly')
393
453
        finally:
 
454
            lockdir._DEFAULT_TIMEOUT_SECONDS = orig_default
394
455
            master_branch.unlock()
 
456
 
 
457
    def test_commit_bound_merge(self):
 
458
        # see bug #43959; commit of a merge in a bound branch fails to push
 
459
        # the new commit into the master
 
460
        master_branch = self.make_branch('master')
 
461
        bound_tree = self.make_branch_and_tree('bound')
 
462
        bound_tree.branch.bind(master_branch)
 
463
 
 
464
        self.build_tree_contents([('bound/content_file', 'initial contents\n')])
 
465
        bound_tree.add(['content_file'])
 
466
        bound_tree.commit(message='woo!')
 
467
 
 
468
        other_bzrdir = master_branch.bzrdir.sprout('other')
 
469
        other_tree = other_bzrdir.open_workingtree()
 
470
 
 
471
        # do a commit to the the other branch changing the content file so
 
472
        # that our commit after merging will have a merged revision in the
 
473
        # content file history.
 
474
        self.build_tree_contents([('other/content_file', 'change in other\n')])
 
475
        other_tree.commit('change in other')
 
476
 
 
477
        # do a merge into the bound branch from other, and then change the
 
478
        # content file locally to force a new revision (rather than using the
 
479
        # revision from other). This forces extra processing in commit.
 
480
        bound_tree.merge_from_branch(other_tree.branch)
 
481
        self.build_tree_contents([('bound/content_file', 'change in bound\n')])
 
482
 
 
483
        # before #34959 was fixed, this failed with 'revision not present in
 
484
        # weave' when trying to implicitly push from the bound branch to the master
 
485
        bound_tree.commit(message='commit of merge in bound tree')
 
486
 
 
487
    def test_commit_reporting_after_merge(self):
 
488
        # when doing a commit of a merge, the reporter needs to still 
 
489
        # be called for each item that is added/removed/deleted.
 
490
        this_tree = self.make_branch_and_tree('this')
 
491
        # we need a bunch of files and dirs, to perform one action on each.
 
492
        self.build_tree([
 
493
            'this/dirtorename/',
 
494
            'this/dirtoreparent/',
 
495
            'this/dirtoleave/',
 
496
            'this/dirtoremove/',
 
497
            'this/filetoreparent',
 
498
            'this/filetorename',
 
499
            'this/filetomodify',
 
500
            'this/filetoremove',
 
501
            'this/filetoleave']
 
502
            )
 
503
        this_tree.add([
 
504
            'dirtorename',
 
505
            'dirtoreparent',
 
506
            'dirtoleave',
 
507
            'dirtoremove',
 
508
            'filetoreparent',
 
509
            'filetorename',
 
510
            'filetomodify',
 
511
            'filetoremove',
 
512
            'filetoleave']
 
513
            )
 
514
        this_tree.commit('create_files')
 
515
        other_dir = this_tree.bzrdir.sprout('other')
 
516
        other_tree = other_dir.open_workingtree()
 
517
        other_tree.lock_write()
 
518
        # perform the needed actions on the files and dirs.
 
519
        try:
 
520
            other_tree.rename_one('dirtorename', 'renameddir')
 
521
            other_tree.rename_one('dirtoreparent', 'renameddir/reparenteddir')
 
522
            other_tree.rename_one('filetorename', 'renamedfile')
 
523
            other_tree.rename_one('filetoreparent', 'renameddir/reparentedfile')
 
524
            other_tree.remove(['dirtoremove', 'filetoremove'])
 
525
            self.build_tree_contents([
 
526
                ('other/newdir/', ),
 
527
                ('other/filetomodify', 'new content'),
 
528
                ('other/newfile', 'new file content')])
 
529
            other_tree.add('newfile')
 
530
            other_tree.add('newdir/')
 
531
            other_tree.commit('modify all sample files and dirs.')
 
532
        finally:
 
533
            other_tree.unlock()
 
534
        this_tree.merge_from_branch(other_tree.branch)
 
535
        reporter = CapturingReporter()
 
536
        this_tree.commit('do the commit', reporter=reporter)
 
537
        self.assertEqual([
 
538
            ('change', 'unchanged', ''),
 
539
            ('change', 'unchanged', 'dirtoleave'),
 
540
            ('change', 'unchanged', 'filetoleave'),
 
541
            ('change', 'modified', 'filetomodify'),
 
542
            ('change', 'added', 'newdir'),
 
543
            ('change', 'added', 'newfile'),
 
544
            ('renamed', 'renamed', 'dirtorename', 'renameddir'),
 
545
            ('renamed', 'renamed', 'filetorename', 'renamedfile'),
 
546
            ('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
 
547
            ('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
 
548
            ('deleted', 'dirtoremove'),
 
549
            ('deleted', 'filetoremove'),
 
550
            ],
 
551
            reporter.calls)
 
552
 
 
553
    def test_commit_removals_respects_filespec(self):
 
554
        """Commit respects the specified_files for removals."""
 
555
        tree = self.make_branch_and_tree('.')
 
556
        self.build_tree(['a', 'b'])
 
557
        tree.add(['a', 'b'])
 
558
        tree.commit('added a, b')
 
559
        tree.remove(['a', 'b'])
 
560
        tree.commit('removed a', specific_files='a')
 
561
        basis = tree.basis_tree()
 
562
        tree.lock_read()
 
563
        try:
 
564
            self.assertIs(None, basis.path2id('a'))
 
565
            self.assertFalse(basis.path2id('b') is None)
 
566
        finally:
 
567
            tree.unlock()
 
568
 
 
569
    def test_commit_saves_1ms_timestamp(self):
 
570
        """Passing in a timestamp is saved with 1ms resolution"""
 
571
        tree = self.make_branch_and_tree('.')
 
572
        self.build_tree(['a'])
 
573
        tree.add('a')
 
574
        tree.commit('added a', timestamp=1153248633.4186721, timezone=0,
 
575
                    rev_id='a1')
 
576
 
 
577
        rev = tree.branch.repository.get_revision('a1')
 
578
        self.assertEqual(1153248633.419, rev.timestamp)
 
579
 
 
580
    def test_commit_has_1ms_resolution(self):
 
581
        """Allowing commit to generate the timestamp also has 1ms resolution"""
 
582
        tree = self.make_branch_and_tree('.')
 
583
        self.build_tree(['a'])
 
584
        tree.add('a')
 
585
        tree.commit('added a', rev_id='a1')
 
586
 
 
587
        rev = tree.branch.repository.get_revision('a1')
 
588
        timestamp = rev.timestamp
 
589
        timestamp_1ms = round(timestamp, 3)
 
590
        self.assertEqual(timestamp_1ms, timestamp)
 
591
 
 
592
    def assertBasisTreeKind(self, kind, tree, file_id):
 
593
        basis = tree.basis_tree()
 
594
        basis.lock_read()
 
595
        try:
 
596
            self.assertEqual(kind, basis.kind(file_id))
 
597
        finally:
 
598
            basis.unlock()
 
599
 
 
600
    def test_commit_kind_changes(self):
 
601
        self.requireFeature(SymlinkFeature)
 
602
        tree = self.make_branch_and_tree('.')
 
603
        os.symlink('target', 'name')
 
604
        tree.add('name', 'a-file-id')
 
605
        tree.commit('Added a symlink')
 
606
        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
 
607
 
 
608
        os.unlink('name')
 
609
        self.build_tree(['name'])
 
610
        tree.commit('Changed symlink to file')
 
611
        self.assertBasisTreeKind('file', tree, 'a-file-id')
 
612
 
 
613
        os.unlink('name')
 
614
        os.symlink('target', 'name')
 
615
        tree.commit('file to symlink')
 
616
        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
 
617
 
 
618
        os.unlink('name')
 
619
        os.mkdir('name')
 
620
        tree.commit('symlink to directory')
 
621
        self.assertBasisTreeKind('directory', tree, 'a-file-id')
 
622
 
 
623
        os.rmdir('name')
 
624
        os.symlink('target', 'name')
 
625
        tree.commit('directory to symlink')
 
626
        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
 
627
 
 
628
        # prepare for directory <-> file tests
 
629
        os.unlink('name')
 
630
        os.mkdir('name')
 
631
        tree.commit('symlink to directory')
 
632
        self.assertBasisTreeKind('directory', tree, 'a-file-id')
 
633
 
 
634
        os.rmdir('name')
 
635
        self.build_tree(['name'])
 
636
        tree.commit('Changed directory to file')
 
637
        self.assertBasisTreeKind('file', tree, 'a-file-id')
 
638
 
 
639
        os.unlink('name')
 
640
        os.mkdir('name')
 
641
        tree.commit('file to directory')
 
642
        self.assertBasisTreeKind('directory', tree, 'a-file-id')
 
643
 
 
644
    def test_commit_unversioned_specified(self):
 
645
        """Commit should raise if specified files isn't in basis or worktree"""
 
646
        tree = self.make_branch_and_tree('.')
 
647
        self.assertRaises(errors.PathsNotVersionedError, tree.commit, 
 
648
                          'message', specific_files=['bogus'])
 
649
 
 
650
    class Callback(object):
 
651
        
 
652
        def __init__(self, message, testcase):
 
653
            self.called = False
 
654
            self.message = message
 
655
            self.testcase = testcase
 
656
 
 
657
        def __call__(self, commit_obj):
 
658
            self.called = True
 
659
            self.testcase.assertTrue(isinstance(commit_obj, Commit))
 
660
            return self.message
 
661
 
 
662
    def test_commit_callback(self):
 
663
        """Commit should invoke a callback to get the message"""
 
664
 
 
665
        tree = self.make_branch_and_tree('.')
 
666
        try:
 
667
            tree.commit()
 
668
        except Exception, e:
 
669
            self.assertTrue(isinstance(e, BzrError))
 
670
            self.assertEqual('The message or message_callback keyword'
 
671
                             ' parameter is required for commit().', str(e))
 
672
        else:
 
673
            self.fail('exception not raised')
 
674
        cb = self.Callback(u'commit 1', self)
 
675
        tree.commit(message_callback=cb)
 
676
        self.assertTrue(cb.called)
 
677
        repository = tree.branch.repository
 
678
        message = repository.get_revision(tree.last_revision()).message
 
679
        self.assertEqual('commit 1', message)
 
680
 
 
681
    def test_no_callback_pointless(self):
 
682
        """Callback should not be invoked for pointless commit"""
 
683
        tree = self.make_branch_and_tree('.')
 
684
        cb = self.Callback(u'commit 2', self)
 
685
        self.assertRaises(PointlessCommit, tree.commit, message_callback=cb, 
 
686
                          allow_pointless=False)
 
687
        self.assertFalse(cb.called)
 
688
 
 
689
    def test_no_callback_netfailure(self):
 
690
        """Callback should not be invoked if connectivity fails"""
 
691
        tree = self.make_branch_and_tree('.')
 
692
        cb = self.Callback(u'commit 2', self)
 
693
        repository = tree.branch.repository
 
694
        # simulate network failure
 
695
        def raise_(self, arg, arg2):
 
696
            raise errors.NoSuchFile('foo')
 
697
        repository.add_inventory = raise_
 
698
        self.assertRaises(errors.NoSuchFile, tree.commit, message_callback=cb)
 
699
        self.assertFalse(cb.called)
 
700
 
 
701
    def test_selected_file_merge_commit(self):
 
702
        """Ensure the correct error is raised"""
 
703
        tree = self.make_branch_and_tree('foo')
 
704
        # pending merge would turn into a left parent
 
705
        tree.commit('commit 1')
 
706
        tree.add_parent_tree_id('example')
 
707
        self.build_tree(['foo/bar', 'foo/baz'])
 
708
        tree.add(['bar', 'baz'])
 
709
        err = self.assertRaises(errors.CannotCommitSelectedFileMerge,
 
710
            tree.commit, 'commit 2', specific_files=['bar', 'baz'])
 
711
        self.assertEqual(['bar', 'baz'], err.files)
 
712
        self.assertEqual('Selected-file commit of merges is not supported'
 
713
                         ' yet: files bar, baz', str(err))
 
714
 
 
715
    def test_commit_ordering(self):
 
716
        """Test of corner-case commit ordering error"""
 
717
        tree = self.make_branch_and_tree('.')
 
718
        self.build_tree(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
 
719
        tree.add(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
 
720
        tree.commit('setup')
 
721
        self.build_tree(['a/c/d/'])
 
722
        tree.add('a/c/d')
 
723
        tree.rename_one('a/z/x', 'a/c/d/x')
 
724
        tree.commit('test', specific_files=['a/z/y'])
 
725
 
 
726
    def test_commit_no_author(self):
 
727
        """The default kwarg author in MutableTree.commit should not add
 
728
        the 'author' revision property.
 
729
        """
 
730
        tree = self.make_branch_and_tree('foo')
 
731
        rev_id = tree.commit('commit 1')
 
732
        rev = tree.branch.repository.get_revision(rev_id)
 
733
        self.assertFalse('author' in rev.properties)
 
734
 
 
735
    def test_commit_author(self):
 
736
        """Passing a non-empty author kwarg to MutableTree.commit should add
 
737
        the 'author' revision property.
 
738
        """
 
739
        tree = self.make_branch_and_tree('foo')
 
740
        rev_id = tree.commit('commit 1', author='John Doe <jdoe@example.com>')
 
741
        rev = tree.branch.repository.get_revision(rev_id)
 
742
        self.assertEqual('John Doe <jdoe@example.com>',
 
743
                         rev.properties['author'])
 
744
 
 
745
    def test_commit_with_checkout_and_branch_sharing_repo(self):
 
746
        repo = self.make_repository('repo', shared=True)
 
747
        # make_branch_and_tree ignores shared repos
 
748
        branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
 
749
        tree2 = branch.create_checkout('repo/tree2')
 
750
        tree2.commit('message', rev_id='rev1')
 
751
        self.assertTrue(tree2.branch.repository.has_revision('rev1'))