← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

  • Committer: Robert Collins
  • Date: 2005-08-24 07:40:52 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050824074052-2e9ec0dd13958d20
make tests stop at the first failure, preventing multi-page omgs

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