← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

add a clean target

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
29
 
from bzrlib.workingtree import WorkingTree
 
27
 
 
28
import logging
 
29
logger = logging.getLogger('bzr.test.versioning')
 
30
debug = logger.debug
30
31
 
31
32
 
32
33
class TestVersioning(TestCaseInTempDir):
33
34
    
34
35
    def test_mkdir(self): 
35
36
        """Basic 'bzr mkdir' operation"""
 
37
        from bzrlib.commands import run_bzr
36
38
 
37
 
        self.run_bzr('init')
38
 
        self.run_bzr('mkdir', 'foo')
 
39
        run_bzr(['init'])
 
40
        run_bzr(['mkdir', 'foo'])
39
41
        self.assert_(os.path.isdir('foo'))
40
42
 
41
 
        self.run_bzr('mkdir', 'foo', retcode=3)
 
43
        self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
42
44
 
43
45
        from bzrlib.diff import compare_trees
44
 
        wt = WorkingTree.open('.')
 
46
        from bzrlib.branch import Branch
 
47
        b = Branch('.')
45
48
        
46
 
        delta = compare_trees(wt.basis_tree(), wt)
 
49
        delta = compare_trees(b.basis_tree(), b.working_tree())
47
50
 
48
51
        self.log('delta.added = %r' % delta.added)
49
52
 
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
 
        wt = WorkingTree.open('.')
69
 
        
70
 
        delta = compare_trees(wt.basis_tree(), wt)
71
 
 
72
 
        self.log('delta.added = %r' % delta.added)
73
 
 
74
 
        self.assertEquals(len(delta.added), 2)
75
 
        self.assertEquals(delta.added[0][0], 'dir')
76
 
        self.assertEquals(delta.added[1][0], pathjoin('dir','subdir'))
77
 
        self.failIf(delta.modified)
78
 
 
79
 
    def test_mkdir_w_nested_trees(self):
80
 
        """'bzr mkdir' with nested trees"""
81
 
 
82
 
        self.run_bzr('init')
83
 
        os.mkdir('a')
84
 
        os.chdir('a')
85
 
        self.run_bzr('init')
86
 
        os.mkdir('b')
87
 
        os.chdir('b')
88
 
        self.run_bzr('init')
89
 
        os.chdir('../..')
90
 
 
91
 
        self.run_bzr('mkdir', 'dir', 'a/dir', 'a/b/dir')
92
 
        self.failUnless(os.path.isdir('dir'))
93
 
        self.failUnless(os.path.isdir('a/dir'))
94
 
        self.failUnless(os.path.isdir('a/b/dir'))
95
 
 
96
 
        from bzrlib.diff import compare_trees
97
 
        wt = WorkingTree.open('.')
98
 
        wt_a = WorkingTree.open('a')
99
 
        wt_b = WorkingTree.open('a/b')
100
 
        
101
 
        delta = compare_trees(wt.basis_tree(), wt)
102
 
        self.assertEquals(len(delta.added), 1)
103
 
        self.assertEquals(delta.added[0][0], 'dir')
104
 
        self.failIf(delta.modified)
105
 
 
106
 
        delta = compare_trees(wt_a.basis_tree(), wt_a)
107
 
        self.assertEquals(len(delta.added), 1)
108
 
        self.assertEquals(delta.added[0][0], 'dir')
109
 
        self.failIf(delta.modified)
110
 
 
111
 
        delta = compare_trees(wt_b.basis_tree(), wt_b)
112
 
        self.assertEquals(len(delta.added), 1)
113
 
        self.assertEquals(delta.added[0][0], 'dir')
114
 
        self.failIf(delta.modified)
115
 
 
116
 
    def check_branch(self):
 
57
    def test_branch_add_in_unversioned(self):
 
58
        """Try to add a file in an unversioned directory.
 
59
 
 
60
        "bzr add" adds the parent as necessary, but simple branch add
 
61
        doesn't do that.
 
62
        """
 
63
        from bzrlib.branch import Branch
 
64
        from bzrlib.errors import NotVersionedError
 
65
 
 
66
        b = Branch('.', init=True)
 
67
 
 
68
        self.build_tree(['foo/',
 
69
                         'foo/hello'])
 
70
 
 
71
        self.assertRaises(NotVersionedError,
 
72
                          b.add,
 
73
                          'foo/hello')
 
74
        
 
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):
117
159
        """After all the above changes, run the check and upgrade commands.
118
160
 
119
161
        The upgrade should be a no-op."""
120
 
        b = Branch.open(u'.')
121
 
        mutter('branch has %d revisions', b.revno())
122
 
        
123
 
        mutter('check branch...')
124
 
        from bzrlib.check import check
125
 
        check(b, False)
126
 
 
127
 
 
 
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
        
128
179
class SubdirCommit(TestCaseInTempDir):
129
180
 
130
181
    def test_subdir_commit(self):
135
186
        self.build_tree(['a/', 'b/'])
136
187
        
137
188
        run_bzr('init')
138
 
        b = Branch.open(u'.')
 
189
        b = Branch('.')
139
190
        
140
191
        for fn in ('a/one', 'b/two', 'top'):
141
192
            file(fn, 'w').write('old contents')
146
197
        for fn in ('a/one', 'b/two', 'top'):
147
198
            file(fn, 'w').write('new contents')
148
199
            
149
 
        mutter('start selective subdir commit')
150
200
        run_bzr('commit', 'a', '-m', 'commit a only')
151
201
        
152
 
        old = b.repository.revision_tree(b.get_rev_id(1))
153
 
        new = b.repository.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))
154
204
        
155
205
        eq(new.get_file_by_path('b/two').read(), 'old contents')
156
206
        eq(new.get_file_by_path('top').read(), 'old contents')
159
209
        os.chdir('a')
160
210
        # commit from here should do nothing
161
211
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
162
 
        v3 = b.repository.revision_tree(b.get_rev_id(3))
 
212
        v3 = b.revision_tree(b.lookup_revision(3))
163
213
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
164
214
        eq(v3.get_file_by_path('top').read(), 'old contents')
165
215
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
166
216
                
167
217
        # commit in subdirectory commits whole tree
168
218
        run_bzr('commit', '-m', 'commit whole tree from subdir')
169
 
        v4 = b.repository.revision_tree(b.get_rev_id(4))
 
219
        v4 = b.revision_tree(b.lookup_revision(4))
170
220
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
171
221
        eq(v4.get_file_by_path('top').read(), 'new contents')
172
222
        
173
223
        # TODO: factor out some kind of assert_tree_state() method
174
224
        
175
 
 
176
 
if __name__ == '__main__':
177
 
    import unittest
178
 
    unittest.main()
179