/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/test_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-03 00:43:31 UTC
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200703004331-ll47bbhnb6xm415v
Change argument order for Transform.version_file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
156
156
        self.assertIs(None, transform.final_kind(trans_id))
157
157
        transform.create_file([b'contents'], trans_id)
158
158
        transform.set_executability(True, trans_id)
159
 
        transform.version_file(b'my_pretties', trans_id)
 
159
        transform.version_file(trans_id, file_id=b'my_pretties')
160
160
        self.assertRaises(DuplicateKey, transform.version_file,
161
 
                          b'my_pretties', trans_id)
 
161
                          trans_id, file_id=b'my_pretties')
162
162
        self.assertEqual(transform.final_file_id(trans_id), b'my_pretties')
163
163
        self.assertEqual(transform.final_parent(trans_id), root)
164
164
        self.assertIs(transform.final_parent(root), ROOT_PARENT)
165
165
        self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
166
166
        oz_id = transform.create_path('oz', root)
167
167
        transform.create_directory(oz_id)
168
 
        transform.version_file(b'ozzie', oz_id)
 
168
        transform.version_file(oz_id, file_id=b'ozzie')
169
169
        trans_id2 = transform.create_path('name2', root)
170
170
        transform.create_file([b'contents'], trans_id2)
171
171
        transform.set_executability(False, trans_id2)
172
 
        transform.version_file(b'my_pretties2', trans_id2)
 
172
        transform.version_file(trans_id2, file_id=b'my_pretties2')
173
173
        modified_paths = transform.apply().modified_paths
174
174
        with self.wt.get_file('name') as f:
175
175
            self.assertEqual(b'contents', f.read())
440
440
        self.assertEqual(transform.find_conflicts(),
441
441
                         [('unversioned parent', lion_id),
442
442
                          ('missing parent', lion_id)])
443
 
        transform.version_file(b"Courage", lion_id)
 
443
        transform.version_file(lion_id, file_id=b"Courage")
444
444
        self.assertEqual(transform.find_conflicts(),
445
445
                         [('missing parent', lion_id),
446
446
                          ('versioning no contents', lion_id)])
457
457
        transform.set_executability(True, oz_id)
458
458
        self.assertEqual(transform.find_conflicts(),
459
459
                         [('unversioned executability', oz_id)])
460
 
        transform.version_file(b'oz-id', oz_id)
 
460
        transform.version_file(oz_id, file_id=b'oz-id')
461
461
        self.assertEqual(transform.find_conflicts(),
462
462
                         [('non-file executability', oz_id)])
463
463
        transform.set_executability(None, oz_id)
785
785
        transform.new_symlink(link_name1, oz_id, link_target1, b'wizard-id')
786
786
        wiz_id = transform.create_path(link_name2, oz_id)
787
787
        transform.create_symlink(link_target2, wiz_id)
788
 
        transform.version_file(b'wiz-id2', wiz_id)
 
788
        transform.version_file(wiz_id, file_id=b'wiz-id2')
789
789
        transform.set_executability(True, wiz_id)
790
790
        self.assertEqual(transform.find_conflicts(),
791
791
                         [('non-file executability', wiz_id)])
1008
1008
        transform, root = self.transform()
1009
1009
        transform.adjust_root_path('oldroot', fun)
1010
1010
        new_root = transform.trans_id_tree_path('')
1011
 
        transform.version_file(b'new-root', new_root)
 
1011
        transform.version_file(new_root, file_id=b'new-root')
1012
1012
        transform.apply()
1013
1013
 
1014
1014
    def test_renames(self):
1169
1169
        transform, root = self.transform()
1170
1170
        try:
1171
1171
            old = transform.trans_id_tree_path('old')
1172
 
            transform.version_file(b'id-1', old)
 
1172
            transform.version_file(old, file_id=b'id-1')
1173
1173
            self.assertEqual([(b'id-1', (None, 'old'), False, (False, True),
1174
1174
                               (b'eert_toor', b'eert_toor'),
1175
1175
                               ('old', 'old'), ('file', 'file'),
1218
1218
            # move file_id to a different file
1219
1219
            self.assertEqual([], list(transform.iter_changes()))
1220
1220
            transform.unversion_file(old)
1221
 
            transform.version_file(b'id-1', new)
 
1221
            transform.version_file(new, file_id=b'id-1')
1222
1222
            transform.adjust_path('old', root, new)
1223
1223
            self.assertEqual([(b'id-1', ('old', 'old'), True, (True, True),
1224
1224
                               (b'eert_toor', b'eert_toor'),
1329
1329
            transform.create_directory(subdir)
1330
1330
            transform.set_executability(False, old)
1331
1331
            transform.unversion_file(old)
1332
 
            transform.version_file(b'id-1', old)
 
1332
            transform.version_file(old, file_id=b'id-1')
1333
1333
            transform.adjust_path('old', root, old)
1334
1334
            self.assertEqual([], list(transform.iter_changes()))
1335
1335
        finally:
1571
1571
        tt.create_directory(foo_trans_id)
1572
1572
        bar_trans_id = tt.trans_id_tree_path("foo/bar")
1573
1573
        tt.create_file([b"aa\n"], bar_trans_id)
1574
 
        tt.version_file(b"bar-1", bar_trans_id)
 
1574
        tt.version_file(bar_trans_id, file_id=b"bar-1")
1575
1575
        tt.apply()
1576
1576
        self.assertPathExists("foo/bar")
1577
 
        wt.lock_read()
1578
 
        try:
 
1577
        with wt.lock_read():
1579
1578
            self.assertEqual(wt.kind("foo"), "directory")
1580
 
        finally:
1581
 
            wt.unlock()
1582
1579
        wt.commit("two")
1583
1580
        changes = wt.changes_from(wt.basis_tree())
1584
1581
        self.assertFalse(changes.has_changed(), changes)
2952
2949
        preview.unversion_file(preview.trans_id_file_id(b'b-id'))
2953
2950
        c_trans_id = preview.trans_id_file_id(b'c-id')
2954
2951
        preview.unversion_file(c_trans_id)
2955
 
        preview.version_file(b'c-id', c_trans_id)
 
2952
        preview.version_file(c_trans_id, file_id=b'c-id')
2956
2953
        preview_tree = preview.get_preview_tree()
2957
2954
        self.assertEqual({b'a-id', b'c-id', tree.path2id('')},
2958
2955
                         preview_tree.all_file_ids())