← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

Handled simultaneous renames of parent and child better

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
236
236
        self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
237
237
        mfile2_path = self.wt.abspath(os.path.join('new_directory','mfile2'))
238
238
 
 
239
    def test_both_rename(self):
 
240
        create_tree,root = self.get_transform()
 
241
        newdir = create_tree.new_directory('selftest', root, 'selftest-id')
 
242
        create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
 
243
        create_tree.apply()        
 
244
        mangle_tree,root = self.get_transform()
 
245
        selftest = mangle_tree.get_id_tree('selftest-id')
 
246
        blackbox = mangle_tree.get_id_tree('blackbox-id')
 
247
        mangle_tree.adjust_path('test', root, selftest)
 
248
        mangle_tree.adjust_path('test_too_much', root, selftest)
 
249
        mangle_tree.set_executability(True, blackbox)
 
250
        mangle_tree.apply()
 
251
 
 
252
    def test_both_rename2(self):
 
253
        create_tree,root = self.get_transform()
 
254
        bzrlib = create_tree.new_directory('bzrlib', root, 'bzrlib-id')
 
255
        tests = create_tree.new_directory('tests', bzrlib, 'tests-id')
 
256
        blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
 
257
        create_tree.new_file('test_too_much.py', blackbox, 'hello1', 
 
258
                             'test_too_much-id')
 
259
        create_tree.apply()        
 
260
        mangle_tree,root = self.get_transform()
 
261
        bzrlib = mangle_tree.get_id_tree('bzrlib-id')
 
262
        tests = mangle_tree.get_id_tree('tests-id')
 
263
        test_too_much = mangle_tree.get_id_tree('test_too_much-id')
 
264
        mangle_tree.adjust_path('selftest', bzrlib, tests)
 
265
        mangle_tree.adjust_path('blackbox.py', tests, test_too_much) 
 
266
        mangle_tree.set_executability(True, test_too_much)
 
267
        mangle_tree.apply()
 
268
 
 
269
    def test_both_rename3(self):
 
270
        create_tree,root = self.get_transform()
 
271
        tests = create_tree.new_directory('tests', root, 'tests-id')
 
272
        create_tree.new_file('test_too_much.py', tests, 'hello1', 
 
273
                             'test_too_much-id')
 
274
        create_tree.apply()        
 
275
        mangle_tree,root = self.get_transform()
 
276
        tests = mangle_tree.get_id_tree('tests-id')
 
277
        test_too_much = mangle_tree.get_id_tree('test_too_much-id')
 
278
        mangle_tree.adjust_path('selftest', root, tests)
 
279
        mangle_tree.adjust_path('blackbox.py', tests, test_too_much) 
 
280
        mangle_tree.set_executability(True, test_too_much)
 
281
        mangle_tree.apply()
 
282
 
239
283
    def test_move_dangling_ie(self):
240
284
        create_tree, root = self.get_transform()
241
285
        # prepare tree