← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

Refactored out ControlFiles and RevisionStore from _Branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/versioning.py
187
187
        debug('start selective subdir commit')
188
188
        run_bzr('commit', 'a', '-m', 'commit a only')
189
189
        
190
 
        old = b.revision_tree(b.get_rev_id(1))
191
 
        new = b.revision_tree(b.get_rev_id(2))
 
190
        old = b.storage.revision_tree(b.get_rev_id(1))
 
191
        new = b.storage.revision_tree(b.get_rev_id(2))
192
192
        
193
193
        eq(new.get_file_by_path('b/two').read(), 'old contents')
194
194
        eq(new.get_file_by_path('top').read(), 'old contents')
197
197
        os.chdir('a')
198
198
        # commit from here should do nothing
199
199
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
200
 
        v3 = b.revision_tree(b.get_rev_id(3))
 
200
        v3 = b.storage.revision_tree(b.get_rev_id(3))
201
201
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
202
202
        eq(v3.get_file_by_path('top').read(), 'old contents')
203
203
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
204
204
                
205
205
        # commit in subdirectory commits whole tree
206
206
        run_bzr('commit', '-m', 'commit whole tree from subdir')
207
 
        v4 = b.revision_tree(b.get_rev_id(4))
 
207
        v4 = b.storage.revision_tree(b.get_rev_id(4))
208
208
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
209
209
        eq(v4.get_file_by_path('top').read(), 'new contents')
210
210