← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_versioning.py

  • Committer: Martin Pool
  • Date: 2007-03-22 05:27:08 UTC
  • mto: (2323.5.2 0.15)
  • mto: This revision was merged to the branch mainline in revision 2390.
  • Revision ID: mbp@sourcefrog.net-20070322052708-t4g4iv46n2dcjjaa
(broken) Give a message when opening old workingtree formats suggesting upgrade

This breaks some blackbox tests of old formats that don't expect to see this
message.

Add WorkingTree._after_opening callback

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2005 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
"""Tests of simple versioning operations"""
22
22
 
23
23
import os
24
24
 
 
25
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
25
26
from bzrlib.branch import Branch
 
27
from bzrlib.trace import mutter
26
28
from bzrlib.osutils import pathjoin
27
 
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
28
 
from bzrlib.trace import mutter
29
29
from bzrlib.workingtree import WorkingTree
30
30
 
31
31
 
32
 
class TestMkdir(TestCaseWithTransport):
33
 
 
34
 
    def test_mkdir_fails_cleanly(self):
35
 
        """'mkdir' fails cleanly when no working tree is available.
36
 
        https://bugs.launchpad.net/bzr/+bug/138600
37
 
        """
38
 
        # Since there is a safety working tree above us, we create a bare repo
39
 
        # here locally.
40
 
        shared_repo = self.make_repository('.')
41
 
        self.run_bzr(['mkdir', 'abc'], retcode=3)
42
 
        self.assertPathDoesNotExist('abc')
43
 
 
44
 
    def test_mkdir(self):
 
32
class TestVersioning(TestCaseInTempDir):
 
33
    
 
34
    def test_mkdir(self): 
45
35
        """Basic 'bzr mkdir' operation"""
46
36
 
47
 
        self.make_branch_and_tree('.')
48
 
        self.run_bzr(['mkdir', 'foo'])
49
 
        self.assertTrue(os.path.isdir('foo'))
 
37
        self.run_bzr('init')
 
38
        self.run_bzr('mkdir', 'foo')
 
39
        self.assert_(os.path.isdir('foo'))
50
40
 
51
 
        self.run_bzr(['mkdir', 'foo'], retcode=3)
 
41
        self.run_bzr('mkdir', 'foo', retcode=3)
52
42
 
53
43
        wt = WorkingTree.open('.')
54
 
 
 
44
        
55
45
        delta = wt.changes_from(wt.basis_tree())
56
46
 
57
47
        self.log('delta.added = %r' % delta.added)
58
48
 
59
 
        self.assertEqual(len(delta.added), 1)
60
 
        self.assertEqual(delta.added[0][0], 'foo')
61
 
        self.assertFalse(delta.modified)
 
49
        self.assertEquals(len(delta.added), 1)
 
50
        self.assertEquals(delta.added[0][0], 'foo')
 
51
        self.failIf(delta.modified)
62
52
 
63
53
    def test_mkdir_in_subdir(self):
64
54
        """'bzr mkdir' operation in subdirectory"""
65
55
 
66
 
        self.make_branch_and_tree('.')
67
 
        self.run_bzr(['mkdir', 'dir'])
68
 
        self.assertTrue(os.path.isdir('dir'))
 
56
        self.run_bzr('init')
 
57
        self.run_bzr('mkdir', 'dir')
 
58
        self.assert_(os.path.isdir('dir'))
69
59
 
 
60
        os.chdir('dir')
70
61
        self.log('Run mkdir in subdir')
71
 
        self.run_bzr(['mkdir', 'subdir'], working_dir='dir')
72
 
        self.assertTrue(os.path.isdir('dir/subdir'))
 
62
        self.run_bzr('mkdir', 'subdir')
 
63
        self.assert_(os.path.isdir('subdir'))
 
64
        os.chdir('..')
73
65
 
74
66
        wt = WorkingTree.open('.')
75
 
 
 
67
        
76
68
        delta = wt.changes_from(wt.basis_tree())
77
69
 
78
70
        self.log('delta.added = %r' % delta.added)
79
71
 
80
 
        self.assertEqual(len(delta.added), 2)
81
 
        self.assertEqual(delta.added[0][0], 'dir')
82
 
        self.assertEqual(delta.added[1][0], pathjoin('dir','subdir'))
83
 
        self.assertFalse(delta.modified)
 
72
        self.assertEquals(len(delta.added), 2)
 
73
        self.assertEquals(delta.added[0][0], 'dir')
 
74
        self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
 
75
        self.failIf(delta.modified)
84
76
 
85
77
    def test_mkdir_w_nested_trees(self):
86
78
        """'bzr mkdir' with nested trees"""
87
79
 
88
 
        self.make_branch_and_tree('.')
89
 
        self.make_branch_and_tree('a')
90
 
        self.make_branch_and_tree('a/b')
 
80
        self.run_bzr('init')
 
81
        os.mkdir('a')
 
82
        os.chdir('a')
 
83
        self.run_bzr('init')
 
84
        os.mkdir('b')
 
85
        os.chdir('b')
 
86
        self.run_bzr('init')
 
87
        os.chdir('../..')
91
88
 
92
 
        self.run_bzr(['mkdir', 'dir', 'a/dir', 'a/b/dir'])
93
 
        self.assertTrue(os.path.isdir('dir'))
94
 
        self.assertTrue(os.path.isdir('a/dir'))
95
 
        self.assertTrue(os.path.isdir('a/b/dir'))
 
89
        self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
 
90
        self.failUnless(os.path.isdir('dir'))
 
91
        self.failUnless(os.path.isdir('a/dir'))
 
92
        self.failUnless(os.path.isdir('a/b/dir'))
96
93
 
97
94
        wt = WorkingTree.open('.')
98
95
        wt_a = WorkingTree.open('a')
99
96
        wt_b = WorkingTree.open('a/b')
100
 
 
 
97
        
101
98
        delta = wt.changes_from(wt.basis_tree())
102
 
        self.assertEqual(len(delta.added), 1)
103
 
        self.assertEqual(delta.added[0][0], 'dir')
104
 
        self.assertFalse(delta.modified)
 
99
        self.assertEquals(len(delta.added), 1)
 
100
        self.assertEquals(delta.added[0][0], 'dir')
 
101
        self.failIf(delta.modified)
105
102
 
106
103
        delta = wt_a.changes_from(wt_a.basis_tree())
107
 
        self.assertEqual(len(delta.added), 1)
108
 
        self.assertEqual(delta.added[0][0], 'dir')
109
 
        self.assertFalse(delta.modified)
 
104
        self.assertEquals(len(delta.added), 1)
 
105
        self.assertEquals(delta.added[0][0], 'dir')
 
106
        self.failIf(delta.modified)
110
107
 
111
108
        delta = wt_b.changes_from(wt_b.basis_tree())
112
 
        self.assertEqual(len(delta.added), 1)
113
 
        self.assertEqual(delta.added[0][0], 'dir')
114
 
        self.assertFalse(delta.modified)
115
 
 
116
 
    def test_mkdir_quiet(self):
117
 
        """'bzr mkdir --quiet' should not print a status message"""
118
 
 
119
 
        self.make_branch_and_tree('.')
120
 
        out, err = self.run_bzr(['mkdir', '--quiet', 'foo'])
121
 
        self.assertEqual('', err)
122
 
        self.assertEqual('', out)
123
 
 
124
 
 
125
 
class SubdirCommit(TestCaseWithTransport):
 
109
        self.assertEquals(len(delta.added), 1)
 
110
        self.assertEquals(delta.added[0][0], 'dir')
 
111
        self.failIf(delta.modified)
 
112
 
 
113
    def check_branch(self):
 
114
        """After all the above changes, run the check and upgrade commands.
 
115
 
 
116
        The upgrade should be a no-op."""
 
117
        b = Branch.open(u'.')
 
118
        mutter('branch has %d revisions', b.revno())
 
119
        
 
120
        mutter('check branch...')
 
121
        from bzrlib.check import check
 
122
        check(b, False)
 
123
 
 
124
 
 
125
class SubdirCommit(TestCaseInTempDir):
126
126
 
127
127
    def test_subdir_commit(self):
128
 
        """Test committing a subdirectory, and committing a directory."""
129
 
        tree = self.make_branch_and_tree('.')
130
 
        b = tree.branch
 
128
        """Test committing a subdirectory, and committing within a directory."""
 
129
        run_bzr = self.run_bzr
 
130
        eq = self.assertEqual
 
131
 
131
132
        self.build_tree(['a/', 'b/'])
132
 
        def set_contents(contents):
133
 
            self.build_tree_contents([
134
 
                ('a/one', contents),
135
 
                ('b/two', contents),
136
 
                ('top', contents),
137
 
                ])
138
 
        set_contents('old contents')
139
 
        tree.smart_add(['.'])
140
 
        tree.commit('first revision')
141
 
        set_contents('new contents')
142
 
 
 
133
        
 
134
        run_bzr('init')
 
135
        b = Branch.open(u'.')
 
136
        
 
137
        for fn in ('a/one', 'b/two', 'top'):
 
138
            file(fn, 'w').write('old contents')
 
139
            
 
140
        run_bzr('add')
 
141
        run_bzr('commit', '-m', 'first revision')
 
142
        
 
143
        for fn in ('a/one', 'b/two', 'top'):
 
144
            file(fn, 'w').write('new contents')
 
145
            
143
146
        mutter('start selective subdir commit')
144
 
        self.run_bzr(['commit', 'a', '-m', 'commit a only'])
145
 
 
 
147
        run_bzr('commit', 'a', '-m', 'commit a only')
 
148
        
 
149
        old = b.repository.revision_tree(b.get_rev_id(1))
146
150
        new = b.repository.revision_tree(b.get_rev_id(2))
147
 
        new.lock_read()
148
 
 
149
 
        def get_text_by_path(tree, path):
150
 
            return tree.get_file_text(tree.path2id(path), path)
151
 
 
152
 
        self.assertEqual(get_text_by_path(new, 'b/two'), 'old contents')
153
 
        self.assertEqual(get_text_by_path(new, 'top'), 'old contents')
154
 
        self.assertEqual(get_text_by_path(new, 'a/one'), 'new contents')
155
 
        new.unlock()
156
 
 
 
151
        
 
152
        eq(new.get_file_by_path('b/two').read(), 'old contents')
 
153
        eq(new.get_file_by_path('top').read(), 'old contents')
 
154
        eq(new.get_file_by_path('a/one').read(), 'new contents')
 
155
        
 
156
        os.chdir('a')
157
157
        # commit from here should do nothing
158
 
        self.run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'],
159
 
                     working_dir='a')
 
158
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
160
159
        v3 = b.repository.revision_tree(b.get_rev_id(3))
161
 
        v3.lock_read()
162
 
        self.assertEqual(get_text_by_path(v3, 'b/two'), 'old contents')
163
 
        self.assertEqual(get_text_by_path(v3, 'top'), 'old contents')
164
 
        self.assertEqual(get_text_by_path(v3, 'a/one'), 'new contents')
165
 
        v3.unlock()
166
 
 
 
160
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
 
161
        eq(v3.get_file_by_path('top').read(), 'old contents')
 
162
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
 
163
                
167
164
        # commit in subdirectory commits whole tree
168
 
        self.run_bzr(['commit', '-m', 'commit whole tree from subdir'],
169
 
                     working_dir='a')
 
165
        run_bzr('commit', '-m', 'commit whole tree from subdir')
170
166
        v4 = b.repository.revision_tree(b.get_rev_id(4))
171
 
        v4.lock_read()
172
 
        self.assertEqual(get_text_by_path(v4, 'b/two'), 'new contents')
173
 
        self.assertEqual(get_text_by_path(v4, 'top'), 'new contents')
174
 
        v4.unlock()
175
 
 
 
167
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
 
168
        eq(v4.get_file_by_path('top').read(), 'new contents')
 
169
        
176
170
        # TODO: factor out some kind of assert_tree_state() method
 
171
        
 
172
 
 
173
if __name__ == '__main__':
 
174
    import unittest
 
175
    unittest.main()
 
176