← 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-08-29 10:57:01 UTC
  • mfrom: (1092.1.41)
  • Revision ID: mbp@sourcefrog.net-20050829105701-7aaa81ecf1bfee05
- merge in merge improvements and additional tests 
  from aaron and lifeless

robertc@robertcollins.net-20050825131100-85772edabc817481

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