← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

and the tutorial patch came back, the very next day

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/versioning.py
22
22
 
23
23
import os
24
24
 
25
 
from bzrlib.tests import BzrTestBase, TestCaseInTempDir
 
25
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
26
26
from bzrlib.branch import Branch
27
 
from bzrlib.trace import mutter
28
 
from bzrlib.osutils import pathjoin
 
27
 
 
28
import logging
 
29
logger = logging.getLogger('bzr.test.versioning')
 
30
debug = logger.debug
29
31
 
30
32
 
31
33
class TestVersioning(TestCaseInTempDir):
32
34
    
33
35
    def test_mkdir(self): 
34
36
        """Basic 'bzr mkdir' operation"""
 
37
        from bzrlib.commands import run_bzr
35
38
 
36
 
        self.run_bzr('init')
37
 
        self.run_bzr('mkdir', 'foo')
 
39
        run_bzr(['init'])
 
40
        run_bzr(['mkdir', 'foo'])
38
41
        self.assert_(os.path.isdir('foo'))
39
42
 
40
 
        self.run_bzr('mkdir', 'foo', retcode=3)
 
43
        self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
41
44
 
42
45
        from bzrlib.diff import compare_trees
43
46
        from bzrlib.branch import Branch
44
 
        b = Branch.open(u'.')
 
47
        b = Branch('.')
45
48
        
46
49
        delta = compare_trees(b.basis_tree(), b.working_tree())
47
50
 
51
54
        self.assertEquals(delta.added[0][0], 'foo')
52
55
        self.failIf(delta.modified)
53
56
 
54
 
    def test_mkdir_in_subdir(self):
55
 
        """'bzr mkdir' operation in subdirectory"""
56
 
 
57
 
        self.run_bzr('init')
58
 
        self.run_bzr('mkdir', 'dir')
59
 
        self.assert_(os.path.isdir('dir'))
60
 
 
61
 
        os.chdir('dir')
62
 
        self.log('Run mkdir in subdir')
63
 
        self.run_bzr('mkdir', 'subdir')
64
 
        self.assert_(os.path.isdir('subdir'))
65
 
        os.chdir('..')
66
 
 
67
 
        from bzrlib.diff import compare_trees
68
 
        from bzrlib.branch import Branch
69
 
        b = Branch.open(u'.')
70
 
        
71
 
        delta = compare_trees(b.basis_tree(), b.working_tree())
72
 
 
73
 
        self.log('delta.added = %r' % delta.added)
74
 
 
75
 
        self.assertEquals(len(delta.added), 2)
76
 
        self.assertEquals(delta.added[0][0], 'dir')
77
 
        self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
78
 
        self.failIf(delta.modified)
79
 
 
80
 
    def test_mkdir_w_nested_trees(self):
81
 
        """'bzr mkdir' with nested trees"""
82
 
 
83
 
        self.run_bzr('init')
84
 
        os.mkdir('a')
85
 
        os.chdir('a')
86
 
        self.run_bzr('init')
87
 
        os.mkdir('b')
88
 
        os.chdir('b')
89
 
        self.run_bzr('init')
90
 
        os.chdir('../..')
91
 
 
92
 
        self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
93
 
        self.failUnless(os.path.isdir('dir'))
94
 
        self.failUnless(os.path.isdir('a/dir'))
95
 
        self.failUnless(os.path.isdir('a/b/dir'))
96
 
 
97
 
        from bzrlib.diff import compare_trees
98
 
        b = Branch.open(u'.')
99
 
        b_a = Branch.open('a')
100
 
        b_b = Branch.open('a/b')
101
 
        
102
 
        delta = compare_trees(b.basis_tree(), b.working_tree())
103
 
        self.assertEquals(len(delta.added), 1)
104
 
        self.assertEquals(delta.added[0][0], 'dir')
105
 
        self.failIf(delta.modified)
106
 
 
107
 
        delta = compare_trees(b_a.basis_tree(), b_a.working_tree())
108
 
        self.assertEquals(len(delta.added), 1)
109
 
        self.assertEquals(delta.added[0][0], 'dir')
110
 
        self.failIf(delta.modified)
111
 
 
112
 
        delta = compare_trees(b_b.basis_tree(), b_b.working_tree())
113
 
        self.assertEquals(len(delta.added), 1)
114
 
        self.assertEquals(delta.added[0][0], 'dir')
115
 
        self.failIf(delta.modified)
116
 
 
117
 
    def test_working_tree_add_in_unversioned(self):
 
57
    def test_branch_add_in_unversioned(self):
118
58
        """Try to add a file in an unversioned directory.
119
59
 
120
 
        "bzr add" adds the parent as necessary, but simple working tree add
 
60
        "bzr add" adds the parent as necessary, but simple branch add
121
61
        doesn't do that.
122
62
        """
123
63
        from bzrlib.branch import Branch
124
64
        from bzrlib.errors import NotVersionedError
125
 
        from bzrlib.workingtree import WorkingTree
126
65
 
127
 
        b = Branch.initialize(u'.')
 
66
        b = Branch('.', init=True)
128
67
 
129
68
        self.build_tree(['foo/',
130
69
                         'foo/hello'])
131
70
 
132
71
        self.assertRaises(NotVersionedError,
133
 
                          WorkingTree(b.base, b).add,
 
72
                          b.add,
134
73
                          'foo/hello')
135
74
        
136
 
        self.check_branch()
137
 
 
138
 
    def check_branch(self):
 
75
        self.check_and_upgrade()
 
76
 
 
77
 
 
78
    def test_add_in_unversioned(self):
 
79
        """Try to add a file in an unversioned directory.
 
80
 
 
81
        "bzr add" should add the parent(s) as necessary.
 
82
        """
 
83
        from bzrlib.branch import Branch
 
84
        from bzrlib.commands import run_bzr
 
85
        eq = self.assertEqual
 
86
 
 
87
        b = Branch('.', init=True)
 
88
 
 
89
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
90
        eq(list(b.unknowns()), ['inertiatic'])
 
91
        run_bzr(['add', 'inertiatic/esp'])
 
92
        eq(list(b.unknowns()), [])
 
93
 
 
94
        # Multiple unversioned parents
 
95
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
 
96
        eq(list(b.unknowns()), ['veil'])
 
97
        run_bzr(['add', 'veil/cerpin/taxt'])
 
98
        eq(list(b.unknowns()), [])
 
99
 
 
100
        # Check whacky paths work
 
101
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
 
102
        eq(list(b.unknowns()), ['cicatriz'])
 
103
        run_bzr(['add', 'inertiatic/../cicatriz/esp'])
 
104
        eq(list(b.unknowns()), [])
 
105
 
 
106
    def test_add_in_versioned(self):
 
107
        """Try to add a file in a versioned directory.
 
108
 
 
109
        "bzr add" should do this happily.
 
110
        """
 
111
        from bzrlib.branch import Branch
 
112
        from bzrlib.commands import run_bzr
 
113
        eq = self.assertEqual
 
114
 
 
115
        b = Branch('.', init=True)
 
116
 
 
117
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
 
118
        eq(list(b.unknowns()), ['inertiatic'])
 
119
        run_bzr(['add', '--no-recurse', 'inertiatic'])
 
120
        eq(list(b.unknowns()), ['inertiatic/esp'])
 
121
        run_bzr(['add', 'inertiatic/esp'])
 
122
        eq(list(b.unknowns()), [])
 
123
 
 
124
    def test_subdir_add(self):
 
125
        """Add in subdirectory should add only things from there down"""
 
126
        
 
127
        from bzrlib.branch import Branch
 
128
        from bzrlib.commands import run_bzr
 
129
        
 
130
        eq = self.assertEqual
 
131
        ass = self.assert_
 
132
        chdir = os.chdir
 
133
        
 
134
        b = Branch('.', init=True)
 
135
        self.build_tree(['src/', 'README'])
 
136
        
 
137
        eq(sorted(b.unknowns()),
 
138
           ['README', 'src'])
 
139
        
 
140
        eq(run_bzr(['add', 'src']), 0)
 
141
        
 
142
        self.build_tree(['src/foo.c'])
 
143
        
 
144
        chdir('src')
 
145
        eq(run_bzr(['add']), 0)
 
146
        
 
147
        eq(sorted(b.unknowns()), 
 
148
           ['README'])
 
149
        eq(len(b.inventory), 3)
 
150
                
 
151
        chdir('..')
 
152
        eq(run_bzr(['add']), 0)
 
153
        eq(list(b.unknowns()), [])
 
154
 
 
155
        self.check_and_upgrade()
 
156
 
 
157
 
 
158
    def check_and_upgrade(self):
139
159
        """After all the above changes, run the check and upgrade commands.
140
160
 
141
161
        The upgrade should be a no-op."""
142
 
        b = Branch.open(u'.')
143
 
        mutter('branch has %d revisions', b.revno())
144
 
        
145
 
        mutter('check branch...')
146
 
        from bzrlib.check import check
147
 
        check(b, False)
148
 
 
149
 
 
 
162
        b = Branch('.')
 
163
        debug('branch has %d revisions', b.revno())
 
164
        
 
165
        debug('check branch...')
 
166
        from bzrlib.check import check
 
167
        check(b)
 
168
        
 
169
        debug('upgrade branch...')
 
170
        from bzrlib.upgrade import upgrade
 
171
        upgrade(b)
 
172
        
 
173
        debug('check branch...')
 
174
        from bzrlib.check import check
 
175
        check(b)
 
176
        
 
177
 
 
178
        
150
179
class SubdirCommit(TestCaseInTempDir):
151
180
 
152
181
    def test_subdir_commit(self):
157
186
        self.build_tree(['a/', 'b/'])
158
187
        
159
188
        run_bzr('init')
160
 
        b = Branch.open(u'.')
 
189
        b = Branch('.')
161
190
        
162
191
        for fn in ('a/one', 'b/two', 'top'):
163
192
            file(fn, 'w').write('old contents')
168
197
        for fn in ('a/one', 'b/two', 'top'):
169
198
            file(fn, 'w').write('new contents')
170
199
            
171
 
        mutter('start selective subdir commit')
172
200
        run_bzr('commit', 'a', '-m', 'commit a only')
173
201
        
174
 
        old = b.revision_tree(b.get_rev_id(1))
175
 
        new = b.revision_tree(b.get_rev_id(2))
 
202
        old = b.revision_tree(b.lookup_revision(1))
 
203
        new = b.revision_tree(b.lookup_revision(2))
176
204
        
177
205
        eq(new.get_file_by_path('b/two').read(), 'old contents')
178
206
        eq(new.get_file_by_path('top').read(), 'old contents')
181
209
        os.chdir('a')
182
210
        # commit from here should do nothing
183
211
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
184
 
        v3 = b.revision_tree(b.get_rev_id(3))
 
212
        v3 = b.revision_tree(b.lookup_revision(3))
185
213
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
186
214
        eq(v3.get_file_by_path('top').read(), 'old contents')
187
215
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
188
216
                
189
217
        # commit in subdirectory commits whole tree
190
218
        run_bzr('commit', '-m', 'commit whole tree from subdir')
191
 
        v4 = b.revision_tree(b.get_rev_id(4))
 
219
        v4 = b.revision_tree(b.lookup_revision(4))
192
220
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
193
221
        eq(v4.get_file_by_path('top').read(), 'new contents')
194
222
        
195
223
        # TODO: factor out some kind of assert_tree_state() method
196
224
        
197
 
 
198
 
if __name__ == '__main__':
199
 
    import unittest
200
 
    unittest.main()
201