← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

  • Committer: Martin Pool
  • Date: 2005-09-16 09:56:24 UTC
  • Revision ID: mbp@sourcefrog.net-20050916095623-ca0dff452934f21f
- make progress bar more tolerant of out-of-range values

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/versioning.py
17
17
 
18
18
"""Tests of simple versioning operations"""
19
19
 
20
 
 
21
 
from bzrlib.selftest import InTempDir
22
 
 
23
 
class Mkdir(InTempDir):
24
 
    def runTest(self): 
 
20
# TODO: test adding a file whose directory is not versioned
 
21
# TODO: test trying to commit within a directory that is not yet added
 
22
 
 
23
 
 
24
import os
 
25
 
 
26
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
 
27
from bzrlib.branch import Branch
 
28
 
 
29
import logging
 
30
logger = logging.getLogger('bzr.test.versioning')
 
31
debug = logger.debug
 
32
 
 
33
 
 
34
class TestVersioning(TestCaseInTempDir):
 
35
    
 
36
    def test_mkdir(self): 
25
37
        """Basic 'bzr mkdir' operation"""
26
38
        from bzrlib.commands import run_bzr
27
 
        import os
28
39
 
29
40
        run_bzr(['init'])
30
41
        run_bzr(['mkdir', 'foo'])
32
43
 
33
44
        self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
34
45
 
35
 
        from bzrlib.diff import compare_trees, TreeDelta
 
46
        from bzrlib.diff import compare_trees
36
47
        from bzrlib.branch import Branch
37
48
        b = Branch('.')
38
49
        
39
50
        delta = compare_trees(b.basis_tree(), b.working_tree())
40
51
 
 
52
        self.log('delta.added = %r' % delta.added)
 
53
 
41
54
        self.assertEquals(len(delta.added), 1)
42
55
        self.assertEquals(delta.added[0][0], 'foo')
43
56
        self.failIf(delta.modified)
44
57
 
45
 
 
46
 
 
47
 
class AddInUnversioned(InTempDir):
48
 
    def runTest(self):
 
58
    def test_add_in_unversioned(self):
49
59
        """Try to add a file in an unversioned directory.
50
60
 
51
61
        smart_add may eventually add the parent as necessary, but simple
52
62
        branch add doesn't do that.
53
63
        """
54
64
        from bzrlib.branch import Branch
55
 
        import os
56
65
        from bzrlib.errors import NotVersionedError
57
66
 
58
67
        b = Branch('.', init=True)
64
73
                          b.add,
65
74
                          'foo/hello')
66
75
        
 
76
        self.check_and_upgrade()
 
77
 
67
78
        
68
 
class SubdirCommit(InTempDir):
69
 
    def runTest(self):
70
 
        """Various commits from a subdirectory"""
 
79
    def test_subdir_add(self):
 
80
        """Add in subdirectory should add only things from there down"""
71
81
        
72
82
        from bzrlib.branch import Branch
73
83
        from bzrlib.commands import run_bzr
74
 
        import os
 
84
        
 
85
        eq = self.assertEqual
 
86
        ass = self.assert_
 
87
        chdir = os.chdir
75
88
        
76
89
        b = Branch('.', init=True)
77
 
        self.build_tree(['src/', 'src/foo.c', 'README'])
78
 
        
79
 
        self.assertEqual(sorted(b.unknowns()),
80
 
                         ['README', 'src'])
81
 
        
82
 
        self.assertEqual(run_bzr(['version']), 0)
83
 
        
84
 
        self.assertEqual(run_bzr(['add']), 0)
85
 
        
86
 
        
87
 
 
88
 
 
89
 
TEST_CLASSES = [
90
 
    Mkdir,
91
 
    AddInUnversioned,
92
 
    ]
 
90
        self.build_tree(['src/', 'README'])
 
91
        
 
92
        eq(sorted(b.unknowns()),
 
93
           ['README', 'src'])
 
94
        
 
95
        eq(run_bzr(['add', 'src']), 0)
 
96
        
 
97
        self.build_tree(['src/foo.c'])
 
98
        
 
99
        chdir('src')
 
100
        eq(run_bzr(['add']), 0)
 
101
        
 
102
        eq(sorted(b.unknowns()), 
 
103
           ['README'])
 
104
        eq(len(b.inventory), 3)
 
105
                
 
106
        chdir('..')
 
107
        eq(run_bzr(['add']), 0)
 
108
        eq(list(b.unknowns()), [])
 
109
 
 
110
        self.check_and_upgrade()
 
111
 
 
112
 
 
113
    def check_and_upgrade(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('.')
 
118
        debug('branch has %d revisions', b.revno())
 
119
        
 
120
        debug('check branch...')
 
121
        from bzrlib.check import check
 
122
        check(b)
 
123
        
 
124
        debug('upgrade branch...')
 
125
        from bzrlib.upgrade import upgrade
 
126
        upgrade(b)
 
127
        
 
128
        debug('check branch...')
 
129
        from bzrlib.check import check
 
130
        check(b)
 
131
        
 
132
 
 
133
        
 
134
        
 
135
class SubdirCommit(TestCaseInTempDir):
 
136
 
 
137
    def test_subdir_commit(self):
 
138
        """Test committing a subdirectory, and committing within a directory."""
 
139
        run_bzr = self.run_bzr
 
140
        eq = self.assertEqual
 
141
 
 
142
        self.build_tree(['a/', 'b/'])
 
143
        
 
144
        run_bzr('init')
 
145
        b = Branch('.')
 
146
        
 
147
        for fn in ('a/one', 'b/two', 'top'):
 
148
            file(fn, 'w').write('old contents')
 
149
            
 
150
        run_bzr('add')
 
151
        run_bzr('commit', '-m', 'first revision')
 
152
        
 
153
        for fn in ('a/one', 'b/two', 'top'):
 
154
            file(fn, 'w').write('new contents')
 
155
            
 
156
        debug('start selective subdir commit')
 
157
        run_bzr('commit', 'a', '-m', 'commit a only')
 
158
        
 
159
        old = b.revision_tree(b.lookup_revision(1))
 
160
        new = b.revision_tree(b.lookup_revision(2))
 
161
        
 
162
        eq(new.get_file_by_path('b/two').read(), 'old contents')
 
163
        eq(new.get_file_by_path('top').read(), 'old contents')
 
164
        eq(new.get_file_by_path('a/one').read(), 'new contents')
 
165
        
 
166
        os.chdir('a')
 
167
        # commit from here should do nothing
 
168
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
 
169
        v3 = b.revision_tree(b.lookup_revision(3))
 
170
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
 
171
        eq(v3.get_file_by_path('top').read(), 'old contents')
 
172
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
 
173
                
 
174
        # commit in subdirectory commits whole tree
 
175
        run_bzr('commit', '-m', 'commit whole tree from subdir')
 
176
        v4 = b.revision_tree(b.lookup_revision(4))
 
177
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
 
178
        eq(v4.get_file_by_path('top').read(), 'new contents')
 
179
        
 
180
        # TODO: factor out some kind of assert_tree_state() method
 
181
        
 
182
 
 
183
if __name__ == '__main__':
 
184
    import unittest
 
185
    unittest.main()
 
186