/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/per_workingtree/test_transform.py

Improve the API for Transform.

Merged from https://code.launchpad.net/~jelmer/brz/transform/+merge/386855

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_transform.py
135
135
        self.assertIs(None, transform.final_kind(trans_id))
136
136
        transform.create_file([b'contents'], trans_id)
137
137
        transform.set_executability(True, trans_id)
138
 
        transform.version_file(b'my_pretties', trans_id)
 
138
        transform.version_file(trans_id, file_id=b'my_pretties')
139
139
        self.assertRaises(DuplicateKey, transform.version_file,
140
 
                          b'my_pretties', trans_id)
 
140
                          trans_id, file_id=b'my_pretties')
141
141
        self.assertEqual(transform.final_file_id(trans_id), b'my_pretties')
142
142
        self.assertEqual(transform.final_parent(trans_id), root)
143
143
        self.assertIs(transform.final_parent(root), ROOT_PARENT)
144
144
        self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
145
145
        oz_id = transform.create_path('oz', root)
146
146
        transform.create_directory(oz_id)
147
 
        transform.version_file(b'ozzie', oz_id)
 
147
        transform.version_file(oz_id, file_id=b'ozzie')
148
148
        trans_id2 = transform.create_path('name2', root)
149
149
        transform.create_file([b'contents'], trans_id2)
150
150
        transform.set_executability(False, trans_id2)
151
 
        transform.version_file(b'my_pretties2', trans_id2)
 
151
        transform.version_file(trans_id2, file_id=b'my_pretties2')
152
152
        modified_paths = transform.apply().modified_paths
153
153
        with self.wt.get_file('name') as f:
154
154
            self.assertEqual(b'contents', f.read())
419
419
        self.assertEqual(transform.find_conflicts(),
420
420
                         [('unversioned parent', lion_id),
421
421
                          ('missing parent', lion_id)])
422
 
        transform.version_file(b"Courage", lion_id)
 
422
        transform.version_file(lion_id, file_id=b"Courage")
423
423
        self.assertEqual(transform.find_conflicts(),
424
424
                         [('missing parent', lion_id),
425
425
                          ('versioning no contents', lion_id)])
436
436
        transform.set_executability(True, oz_id)
437
437
        self.assertEqual(transform.find_conflicts(),
438
438
                         [('unversioned executability', oz_id)])
439
 
        transform.version_file(b'oz-id', oz_id)
 
439
        transform.version_file(oz_id, file_id=b'oz-id')
440
440
        self.assertEqual(transform.find_conflicts(),
441
441
                         [('non-file executability', oz_id)])
442
442
        transform.set_executability(None, oz_id)
764
764
        transform.new_symlink(link_name1, oz_id, link_target1, b'wizard-id')
765
765
        wiz_id = transform.create_path(link_name2, oz_id)
766
766
        transform.create_symlink(link_target2, wiz_id)
767
 
        transform.version_file(b'wiz-id2', wiz_id)
 
767
        transform.version_file(wiz_id, file_id=b'wiz-id2')
768
768
        transform.set_executability(True, wiz_id)
769
769
        self.assertEqual(transform.find_conflicts(),
770
770
                         [('non-file executability', wiz_id)])
987
987
        transform, root = self.transform()
988
988
        transform.adjust_root_path('oldroot', fun)
989
989
        new_root = transform.trans_id_tree_path('')
990
 
        transform.version_file(b'new-root', new_root)
 
990
        transform.version_file(new_root, file_id=b'new-root')
991
991
        transform.apply()
992
992
 
993
993
    def test_renames(self):
1148
1148
        transform, root = self.transform()
1149
1149
        try:
1150
1150
            old = transform.trans_id_tree_path('old')
1151
 
            transform.version_file(b'id-1', old)
 
1151
            transform.version_file(old, file_id=b'id-1')
1152
1152
            self.assertEqual([(b'id-1', (None, 'old'), False, (False, True),
1153
1153
                               (b'eert_toor', b'eert_toor'),
1154
1154
                               ('old', 'old'), ('file', 'file'),
1197
1197
            # move file_id to a different file
1198
1198
            self.assertEqual([], list(transform.iter_changes()))
1199
1199
            transform.unversion_file(old)
1200
 
            transform.version_file(b'id-1', new)
 
1200
            transform.version_file(new, file_id=b'id-1')
1201
1201
            transform.adjust_path('old', root, new)
1202
1202
            self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1203
1203
                               (b'eert_toor', b'eert_toor'),
1308
1308
            transform.create_directory(subdir)
1309
1309
            transform.set_executability(False, old)
1310
1310
            transform.unversion_file(old)
1311
 
            transform.version_file(b'id-1', old)
 
1311
            transform.version_file(old, file_id=b'id-1')
1312
1312
            transform.adjust_path('old', root, old)
1313
1313
            self.assertEqual([], list(transform.iter_changes()))
1314
1314
        finally:
1550
1550
        tt.create_directory(foo_trans_id)
1551
1551
        bar_trans_id = tt.trans_id_tree_path("foo/bar")
1552
1552
        tt.create_file([b"aa\n"], bar_trans_id)
1553
 
        tt.version_file(b"bar-1", bar_trans_id)
 
1553
        tt.version_file(bar_trans_id, file_id=b"bar-1")
1554
1554
        tt.apply()
1555
1555
        self.assertPathExists("foo/bar")
1556
1556
        with wt.lock_read():