← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

merge merge tweaks from aaron, which includes latest .dev

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
21
20
# TODO: test trying to commit within a directory that is not yet added
22
21
 
23
22
 
24
23
import os
25
 
from bzrlib.selftest import InTempDir, BzrTestBase
 
24
 
 
25
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
26
26
from bzrlib.branch import Branch
27
27
 
28
 
 
29
 
class TestVersioning(InTempDir):
 
28
import logging
 
29
logger = logging.getLogger('bzr.test.versioning')
 
30
debug = logger.debug
 
31
 
 
32
 
 
33
class TestVersioning(TestCaseInTempDir):
30
34
    
31
35
    def test_mkdir(self): 
32
36
        """Basic 'bzr mkdir' operation"""
40
44
 
41
45
        from bzrlib.diff import compare_trees
42
46
        from bzrlib.branch import Branch
43
 
        b = Branch('.')
 
47
        b = Branch.open('.')
44
48
        
45
49
        delta = compare_trees(b.basis_tree(), b.working_tree())
46
50
 
50
54
        self.assertEquals(delta.added[0][0], 'foo')
51
55
        self.failIf(delta.modified)
52
56
 
53
 
    def test_add_in_unversioned(self):
 
57
    def test_branch_add_in_unversioned(self):
54
58
        """Try to add a file in an unversioned directory.
55
59
 
56
 
        smart_add may eventually add the parent as necessary, but simple
57
 
        branch add doesn't do that.
 
60
        "bzr add" adds the parent as necessary, but simple branch add
 
61
        doesn't do that.
58
62
        """
59
63
        from bzrlib.branch import Branch
60
64
        from bzrlib.errors import NotVersionedError
61
65
 
62
 
        b = Branch('.', init=True)
 
66
        b = Branch.initialize('.')
63
67
 
64
68
        self.build_tree(['foo/',
65
69
                         'foo/hello'])
68
72
                          b.add,
69
73
                          'foo/hello')
70
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.initialize('.')
 
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.initialize('.')
 
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
 
71
124
    def test_subdir_add(self):
72
125
        """Add in subdirectory should add only things from there down"""
73
126
        
78
131
        ass = self.assert_
79
132
        chdir = os.chdir
80
133
        
81
 
        b = Branch('.', init=True)
 
134
        b = Branch.initialize('.')
82
135
        self.build_tree(['src/', 'README'])
83
136
        
84
137
        eq(sorted(b.unknowns()),
98
151
        chdir('..')
99
152
        eq(run_bzr(['add']), 0)
100
153
        eq(list(b.unknowns()), [])
101
 
        
102
 
        
103
 
class SubdirCommit(BzrTestBase):
 
154
 
 
155
        self.check_and_upgrade()
 
156
 
 
157
 
 
158
    def check_and_upgrade(self):
 
159
        """After all the above changes, run the check and upgrade commands.
 
160
 
 
161
        The upgrade should be a no-op."""
 
162
        b = Branch.open('.')
 
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
        
 
179
class SubdirCommit(TestCaseInTempDir):
104
180
 
105
181
    def test_subdir_commit(self):
106
182
        """Test committing a subdirectory, and committing within a directory."""
110
186
        self.build_tree(['a/', 'b/'])
111
187
        
112
188
        run_bzr('init')
113
 
        b = Branch('.')
 
189
        b = Branch.open('.')
114
190
        
115
191
        for fn in ('a/one', 'b/two', 'top'):
116
192
            file(fn, 'w').write('old contents')
123
199
            
124
200
        run_bzr('commit', 'a', '-m', 'commit a only')
125
201
        
126
 
        old = b.revision_tree(b.lookup_revision(1))
127
 
        new = b.revision_tree(b.lookup_revision(2))
 
202
        old = b.revision_tree(b.get_rev_id(1))
 
203
        new = b.revision_tree(b.get_rev_id(2))
128
204
        
129
205
        eq(new.get_file_by_path('b/two').read(), 'old contents')
130
206
        eq(new.get_file_by_path('top').read(), 'old contents')
133
209
        os.chdir('a')
134
210
        # commit from here should do nothing
135
211
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
136
 
        v3 = b.revision_tree(b.lookup_revision(3))
 
212
        v3 = b.revision_tree(b.get_rev_id(3))
137
213
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
138
214
        eq(v3.get_file_by_path('top').read(), 'old contents')
139
215
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
140
216
                
141
217
        # commit in subdirectory commits whole tree
142
218
        run_bzr('commit', '-m', 'commit whole tree from subdir')
143
 
        v4 = b.revision_tree(b.lookup_revision(4))
 
219
        v4 = b.revision_tree(b.get_rev_id(4))
144
220
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
145
221
        eq(v4.get_file_by_path('top').read(), 'new contents')
146
222