~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_versioning.py

  • Committer: Aaron Bentley
  • Date: 2005-12-25 00:38:48 UTC
  • mto: (1185.67.11 bzr.revision-storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051225003848-111ac71170cb2605
Renamed Branch.storage to Branch.repository

Show diffs side-by-side

added added

removed removed

Lines of Context:
170
170
        mutter('start selective subdir commit')
171
171
        run_bzr('commit', 'a', '-m', 'commit a only')
172
172
        
173
 
        old = b.storage.revision_tree(b.get_rev_id(1))
174
 
        new = b.storage.revision_tree(b.get_rev_id(2))
 
173
        old = b.repository.revision_tree(b.get_rev_id(1))
 
174
        new = b.repository.revision_tree(b.get_rev_id(2))
175
175
        
176
176
        eq(new.get_file_by_path('b/two').read(), 'old contents')
177
177
        eq(new.get_file_by_path('top').read(), 'old contents')
180
180
        os.chdir('a')
181
181
        # commit from here should do nothing
182
182
        run_bzr('commit', '.', '-m', 'commit subdir only', '--unchanged')
183
 
        v3 = b.storage.revision_tree(b.get_rev_id(3))
 
183
        v3 = b.repository.revision_tree(b.get_rev_id(3))
184
184
        eq(v3.get_file_by_path('b/two').read(), 'old contents')
185
185
        eq(v3.get_file_by_path('top').read(), 'old contents')
186
186
        eq(v3.get_file_by_path('a/one').read(), 'new contents')
187
187
                
188
188
        # commit in subdirectory commits whole tree
189
189
        run_bzr('commit', '-m', 'commit whole tree from subdir')
190
 
        v4 = b.storage.revision_tree(b.get_rev_id(4))
 
190
        v4 = b.repository.revision_tree(b.get_rev_id(4))
191
191
        eq(v4.get_file_by_path('b/two').read(), 'new contents')        
192
192
        eq(v4.get_file_by_path('top').read(), 'new contents')
193
193