← 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-05 05:35:25 UTC
  • mfrom: (974.1.55)
  • Revision ID: mbp@sourcefrog.net-20050905053525-2112bac069dbe331
- merge various bug fixes from aaron

aaron.bentley@utoronto.ca-20050905020131-a2d5b7711dd6cd98

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
 
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
        b = Branch('.')
161
118
        debug('branch has %d revisions', b.revno())
162
119
        
163
120
        debug('check branch...')
164
121
        from bzrlib.check import check
165
 
        check(b, False)
 
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)
166
131
        
167
132
 
168
133
        
 
134
        
169
135
class SubdirCommit(TestCaseInTempDir):
170
136
 
171
137
    def test_subdir_commit(self):
176
142
        self.build_tree(['a/', 'b/'])
177
143
        
178
144
        run_bzr('init')
179
 
        b = Branch.open('.')
 
145
        b = Branch('.')
180
146
        
181
147
        for fn in ('a/one', 'b/two', 'top'):
182
148
            file(fn, 'w').write('old contents')
187
153
        for fn in ('a/one', 'b/two', 'top'):
188
154
            file(fn, 'w').write('new contents')
189
155
            
190
 
        debug('start selective subdir commit')
191
156
        run_bzr('commit', 'a', '-m', 'commit a only')
192
157
        
193
 
        old = b.revision_tree(b.get_rev_id(1))
194
 
        new = b.revision_tree(b.get_rev_id(2))
 
158
        old = b.revision_tree(b.lookup_revision(1))
 
159
        new = b.revision_tree(b.lookup_revision(2))
195
160
        
196
161
        eq(new.get_file_by_path('b/two').read(), 'old contents')
197
162
        eq(new.get_file_by_path('top').read(), 'old contents')
200
165
        os.chdir('a')
201
166
        # commit from here should do nothing
202
167
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
203
 
        v3 = b.revision_tree(b.get_rev_id(3))
 
168
        v3 = b.revision_tree(b.lookup_revision(3))
204
169
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
205
170
        eq(v3.get_file_by_path('top').read(), 'old contents')
206
171
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
207
172
                
208
173
        # commit in subdirectory commits whole tree
209
174
        run_bzr('commit', '-m', 'commit whole tree from subdir')
210
 
        v4 = b.revision_tree(b.get_rev_id(4))
 
175
        v4 = b.revision_tree(b.lookup_revision(4))
211
176
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
212
177
        eq(v4.get_file_by_path('top').read(), 'new contents')
213
178
        
214
179
        # TODO: factor out some kind of assert_tree_state() method
215
180
        
216
 
 
217
 
if __name__ == '__main__':
218
 
    import unittest
219
 
    unittest.main()
220