185
255
transform3.delete_contents(oz_id)
186
256
self.assertEqual(transform3.find_conflicts(),
187
257
[('missing parent', oz_id)])
188
root_id = transform3.trans_id_tree_file_id('TREE_ROOT')
258
root_id = transform3.root
189
259
tip_id = transform3.trans_id_tree_file_id('tip-id')
190
260
transform3.adjust_path('tip', root_id, tip_id)
191
261
transform3.apply()
263
def test_conflict_on_case_insensitive(self):
264
tree = self.make_branch_and_tree('tree')
265
# Don't try this at home, kids!
266
# Force the tree to report that it is case sensitive, for conflict
268
tree.case_sensitive = True
269
transform = TreeTransform(tree)
270
self.addCleanup(transform.finalize)
271
transform.new_file('file', transform.root, 'content')
272
transform.new_file('FiLe', transform.root, 'content')
273
result = transform.find_conflicts()
274
self.assertEqual([], result)
276
# Force the tree to report that it is case insensitive, for conflict
278
tree.case_sensitive = False
279
transform = TreeTransform(tree)
280
self.addCleanup(transform.finalize)
281
transform.new_file('file', transform.root, 'content')
282
transform.new_file('FiLe', transform.root, 'content')
283
result = transform.find_conflicts()
284
self.assertEqual([('duplicate', 'new-1', 'new-2', 'file')], result)
286
def test_conflict_on_case_insensitive_existing(self):
287
tree = self.make_branch_and_tree('tree')
288
self.build_tree(['tree/FiLe'])
289
# Don't try this at home, kids!
290
# Force the tree to report that it is case sensitive, for conflict
292
tree.case_sensitive = True
293
transform = TreeTransform(tree)
294
self.addCleanup(transform.finalize)
295
transform.new_file('file', transform.root, 'content')
296
result = transform.find_conflicts()
297
self.assertEqual([], result)
299
# Force the tree to report that it is case insensitive, for conflict
301
tree.case_sensitive = False
302
transform = TreeTransform(tree)
303
self.addCleanup(transform.finalize)
304
transform.new_file('file', transform.root, 'content')
305
result = transform.find_conflicts()
306
self.assertEqual([('duplicate', 'new-1', 'new-2', 'file')], result)
308
def test_resolve_case_insensitive_conflict(self):
309
tree = self.make_branch_and_tree('tree')
310
# Don't try this at home, kids!
311
# Force the tree to report that it is case insensitive, for conflict
313
tree.case_sensitive = False
314
transform = TreeTransform(tree)
315
self.addCleanup(transform.finalize)
316
transform.new_file('file', transform.root, 'content')
317
transform.new_file('FiLe', transform.root, 'content')
318
resolve_conflicts(transform)
320
self.failUnlessExists('tree/file')
321
self.failUnlessExists('tree/FiLe.moved')
323
def test_resolve_checkout_case_conflict(self):
324
tree = self.make_branch_and_tree('tree')
325
# Don't try this at home, kids!
326
# Force the tree to report that it is case insensitive, for conflict
328
tree.case_sensitive = False
329
transform = TreeTransform(tree)
330
self.addCleanup(transform.finalize)
331
transform.new_file('file', transform.root, 'content')
332
transform.new_file('FiLe', transform.root, 'content')
333
resolve_conflicts(transform,
334
pass_func=lambda t, c: resolve_checkout(t, c, []))
336
self.failUnlessExists('tree/file')
337
self.failUnlessExists('tree/FiLe.moved')
339
def test_apply_case_conflict(self):
340
"""Ensure that a transform with case conflicts can always be applied"""
341
tree = self.make_branch_and_tree('tree')
342
transform = TreeTransform(tree)
343
self.addCleanup(transform.finalize)
344
transform.new_file('file', transform.root, 'content')
345
transform.new_file('FiLe', transform.root, 'content')
346
dir = transform.new_directory('dir', transform.root)
347
transform.new_file('dirfile', dir, 'content')
348
transform.new_file('dirFiLe', dir, 'content')
349
resolve_conflicts(transform)
351
self.failUnlessExists('tree/file')
352
if not os.path.exists('tree/FiLe.moved'):
353
self.failUnlessExists('tree/FiLe')
354
self.failUnlessExists('tree/dir/dirfile')
355
if not os.path.exists('tree/dir/dirFiLe.moved'):
356
self.failUnlessExists('tree/dir/dirFiLe')
358
def test_case_insensitive_limbo(self):
359
tree = self.make_branch_and_tree('tree')
360
# Don't try this at home, kids!
361
# Force the tree to report that it is case insensitive
362
tree.case_sensitive = False
363
transform = TreeTransform(tree)
364
self.addCleanup(transform.finalize)
365
dir = transform.new_directory('dir', transform.root)
366
first = transform.new_file('file', dir, 'content')
367
second = transform.new_file('FiLe', dir, 'content')
368
self.assertContainsRe(transform._limbo_name(first), 'new-1/file')
369
self.assertNotContainsRe(transform._limbo_name(second), 'new-1/FiLe')
193
371
def test_add_del(self):
194
372
start, root = self.get_transform()
195
373
start.new_directory('a', root, 'a')
485
753
create.new_file('vfile', root, 'myfile-text', 'myfile-id')
486
754
create.new_file('uvfile', root, 'othertext')
488
self.assertEqual(find_interesting(wt, wt, ['vfile']),
490
self.assertRaises(NotVersionedError, find_interesting, wt, wt,
756
result = self.applyDeprecated(symbol_versioning.zero_fifteen,
757
find_interesting, wt, wt, ['vfile'])
758
self.assertEqual(result, set(['myfile-id']))
760
def test_set_executability_order(self):
761
"""Ensure that executability behaves the same, no matter what order.
763
- create file and set executability simultaneously
764
- create file and set executability afterward
765
- unsetting the executability of a file whose executability has not been
766
declared should throw an exception (this may happen when a
767
merge attempts to create a file with a duplicate ID)
769
transform, root = self.get_transform()
772
self.addCleanup(wt.unlock)
773
transform.new_file('set_on_creation', root, 'Set on creation', 'soc',
775
sac = transform.new_file('set_after_creation', root,
776
'Set after creation', 'sac')
777
transform.set_executability(True, sac)
778
uws = transform.new_file('unset_without_set', root, 'Unset badly',
780
self.assertRaises(KeyError, transform.set_executability, None, uws)
782
self.assertTrue(wt.is_executable('soc'))
783
self.assertTrue(wt.is_executable('sac'))
785
def test_preserve_mode(self):
786
"""File mode is preserved when replacing content"""
787
if sys.platform == 'win32':
788
raise TestSkipped('chmod has no effect on win32')
789
transform, root = self.get_transform()
790
transform.new_file('file1', root, 'contents', 'file1-id', True)
793
self.addCleanup(self.wt.unlock)
794
self.assertTrue(self.wt.is_executable('file1-id'))
795
transform, root = self.get_transform()
796
file1_id = transform.trans_id_tree_file_id('file1-id')
797
transform.delete_contents(file1_id)
798
transform.create_file('contents2', file1_id)
800
self.assertTrue(self.wt.is_executable('file1-id'))
802
def test__set_mode_stats_correctly(self):
803
"""_set_mode stats to determine file mode."""
804
if sys.platform == 'win32':
805
raise TestSkipped('chmod has no effect on win32')
809
def instrumented_stat(path):
810
stat_paths.append(path)
811
return real_stat(path)
813
transform, root = self.get_transform()
815
bar1_id = transform.new_file('bar', root, 'bar contents 1\n',
816
file_id='bar-id-1', executable=False)
819
transform, root = self.get_transform()
820
bar1_id = transform.trans_id_tree_path('bar')
821
bar2_id = transform.trans_id_tree_path('bar2')
823
os.stat = instrumented_stat
824
transform.create_file('bar2 contents\n', bar2_id, mode_id=bar1_id)
829
bar1_abspath = self.wt.abspath('bar')
830
self.assertEqual([bar1_abspath], stat_paths)
832
def test_iter_changes(self):
833
self.wt.set_root_id('eert_toor')
834
transform, root = self.get_transform()
835
transform.new_file('old', root, 'blah', 'id-1', True)
837
transform, root = self.get_transform()
839
self.assertEqual([], list(transform.iter_changes()))
840
old = transform.trans_id_tree_file_id('id-1')
841
transform.unversion_file(old)
842
self.assertEqual([('id-1', ('old', None), False, (True, False),
843
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
844
(True, True))], list(transform.iter_changes()))
845
transform.new_directory('new', root, 'id-1')
846
self.assertEqual([('id-1', ('old', 'new'), True, (True, True),
847
('eert_toor', 'eert_toor'), ('old', 'new'),
848
('file', 'directory'),
849
(True, False))], list(transform.iter_changes()))
853
def test_iter_changes_new(self):
854
self.wt.set_root_id('eert_toor')
855
transform, root = self.get_transform()
856
transform.new_file('old', root, 'blah')
858
transform, root = self.get_transform()
860
old = transform.trans_id_tree_path('old')
861
transform.version_file('id-1', old)
862
self.assertEqual([('id-1', (None, 'old'), False, (False, True),
863
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
864
(False, False))], list(transform.iter_changes()))
868
def test_iter_changes_modifications(self):
869
self.wt.set_root_id('eert_toor')
870
transform, root = self.get_transform()
871
transform.new_file('old', root, 'blah', 'id-1')
872
transform.new_file('new', root, 'blah')
873
transform.new_directory('subdir', root, 'subdir-id')
875
transform, root = self.get_transform()
877
old = transform.trans_id_tree_path('old')
878
subdir = transform.trans_id_tree_file_id('subdir-id')
879
new = transform.trans_id_tree_path('new')
880
self.assertEqual([], list(transform.iter_changes()))
883
transform.delete_contents(old)
884
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
885
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', None),
886
(False, False))], list(transform.iter_changes()))
889
transform.create_file('blah', old)
890
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
891
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
892
(False, False))], list(transform.iter_changes()))
893
transform.cancel_deletion(old)
894
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
895
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
896
(False, False))], list(transform.iter_changes()))
897
transform.cancel_creation(old)
899
# move file_id to a different file
900
self.assertEqual([], list(transform.iter_changes()))
901
transform.unversion_file(old)
902
transform.version_file('id-1', new)
903
transform.adjust_path('old', root, new)
904
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
905
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
906
(False, False))], list(transform.iter_changes()))
907
transform.cancel_versioning(new)
908
transform._removed_id = set()
911
self.assertEqual([], list(transform.iter_changes()))
912
transform.set_executability(True, old)
913
self.assertEqual([('id-1', ('old', 'old'), False, (True, True),
914
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
915
(False, True))], list(transform.iter_changes()))
916
transform.set_executability(None, old)
919
self.assertEqual([], list(transform.iter_changes()))
920
transform.adjust_path('new', root, old)
921
transform._new_parent = {}
922
self.assertEqual([('id-1', ('old', 'new'), False, (True, True),
923
('eert_toor', 'eert_toor'), ('old', 'new'), ('file', 'file'),
924
(False, False))], list(transform.iter_changes()))
925
transform._new_name = {}
928
self.assertEqual([], list(transform.iter_changes()))
929
transform.adjust_path('new', subdir, old)
930
transform._new_name = {}
931
self.assertEqual([('id-1', ('old', 'subdir/old'), False,
932
(True, True), ('eert_toor', 'subdir-id'), ('old', 'old'),
933
('file', 'file'), (False, False))],
934
list(transform.iter_changes()))
935
transform._new_path = {}
940
def test_iter_changes_modified_bleed(self):
941
self.wt.set_root_id('eert_toor')
942
"""Modified flag should not bleed from one change to another"""
943
# unfortunately, we have no guarantee that file1 (which is modified)
944
# will be applied before file2. And if it's applied after file2, it
945
# obviously can't bleed into file2's change output. But for now, it
947
transform, root = self.get_transform()
948
transform.new_file('file1', root, 'blah', 'id-1')
949
transform.new_file('file2', root, 'blah', 'id-2')
951
transform, root = self.get_transform()
953
transform.delete_contents(transform.trans_id_file_id('id-1'))
954
transform.set_executability(True,
955
transform.trans_id_file_id('id-2'))
956
self.assertEqual([('id-1', (u'file1', u'file1'), True, (True, True),
957
('eert_toor', 'eert_toor'), ('file1', u'file1'),
958
('file', None), (False, False)),
959
('id-2', (u'file2', u'file2'), False, (True, True),
960
('eert_toor', 'eert_toor'), ('file2', u'file2'),
961
('file', 'file'), (False, True))],
962
list(transform.iter_changes()))
966
def test_iter_changes_move_missing(self):
967
"""Test moving ids with no files around"""
968
self.wt.set_root_id('toor_eert')
969
# Need two steps because versioning a non-existant file is a conflict.
970
transform, root = self.get_transform()
971
transform.new_directory('floater', root, 'floater-id')
973
transform, root = self.get_transform()
974
transform.delete_contents(transform.trans_id_tree_path('floater'))
976
transform, root = self.get_transform()
977
floater = transform.trans_id_tree_path('floater')
979
transform.adjust_path('flitter', root, floater)
980
self.assertEqual([('floater-id', ('floater', 'flitter'), False,
981
(True, True), ('toor_eert', 'toor_eert'), ('floater', 'flitter'),
982
(None, None), (False, False))], list(transform.iter_changes()))
986
def test_iter_changes_pointless(self):
987
"""Ensure that no-ops are not treated as modifications"""
988
self.wt.set_root_id('eert_toor')
989
transform, root = self.get_transform()
990
transform.new_file('old', root, 'blah', 'id-1')
991
transform.new_directory('subdir', root, 'subdir-id')
993
transform, root = self.get_transform()
995
old = transform.trans_id_tree_path('old')
996
subdir = transform.trans_id_tree_file_id('subdir-id')
997
self.assertEqual([], list(transform.iter_changes()))
998
transform.delete_contents(subdir)
999
transform.create_directory(subdir)
1000
transform.set_executability(False, old)
1001
transform.unversion_file(old)
1002
transform.version_file('id-1', old)
1003
transform.adjust_path('old', root, old)
1004
self.assertEqual([], list(transform.iter_changes()))
1006
transform.finalize()
1008
def test_rename_count(self):
1009
transform, root = self.get_transform()
1010
transform.new_file('name1', root, 'contents')
1011
self.assertEqual(transform.rename_count, 0)
1013
self.assertEqual(transform.rename_count, 1)
1014
transform2, root = self.get_transform()
1015
transform2.adjust_path('name2', root,
1016
transform2.trans_id_tree_path('name1'))
1017
self.assertEqual(transform2.rename_count, 0)
1019
self.assertEqual(transform2.rename_count, 2)
1021
def test_change_parent(self):
1022
"""Ensure that after we change a parent, the results are still right.
1024
Renames and parent changes on pending transforms can happen as part
1025
of conflict resolution, and are explicitly permitted by the
1028
This test ensures they work correctly with the rename-avoidance
1031
transform, root = self.get_transform()
1032
parent1 = transform.new_directory('parent1', root)
1033
child1 = transform.new_file('child1', parent1, 'contents')
1034
parent2 = transform.new_directory('parent2', root)
1035
transform.adjust_path('child1', parent2, child1)
1037
self.failIfExists(self.wt.abspath('parent1/child1'))
1038
self.failUnlessExists(self.wt.abspath('parent2/child1'))
1039
# rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
1040
# no rename for child1 (counting only renames during apply)
1041
self.failUnlessEqual(2, transform.rename_count)
1043
def test_cancel_parent(self):
1044
"""Cancelling a parent doesn't cause deletion of a non-empty directory
1046
This is like the test_change_parent, except that we cancel the parent
1047
before adjusting the path. The transform must detect that the
1048
directory is non-empty, and move children to safe locations.
1050
transform, root = self.get_transform()
1051
parent1 = transform.new_directory('parent1', root)
1052
child1 = transform.new_file('child1', parent1, 'contents')
1053
child2 = transform.new_file('child2', parent1, 'contents')
1055
transform.cancel_creation(parent1)
1057
self.fail('Failed to move child1 before deleting parent1')
1058
transform.cancel_creation(child2)
1059
transform.create_directory(parent1)
1061
transform.cancel_creation(parent1)
1062
# If the transform incorrectly believes that child2 is still in
1063
# parent1's limbo directory, it will try to rename it and fail
1064
# because was already moved by the first cancel_creation.
1066
self.fail('Transform still thinks child2 is a child of parent1')
1067
parent2 = transform.new_directory('parent2', root)
1068
transform.adjust_path('child1', parent2, child1)
1070
self.failIfExists(self.wt.abspath('parent1'))
1071
self.failUnlessExists(self.wt.abspath('parent2/child1'))
1072
# rename limbo/new-3 => parent2, rename limbo/new-2 => child1
1073
self.failUnlessEqual(2, transform.rename_count)
1075
def test_adjust_and_cancel(self):
1076
"""Make sure adjust_path keeps track of limbo children properly"""
1077
transform, root = self.get_transform()
1078
parent1 = transform.new_directory('parent1', root)
1079
child1 = transform.new_file('child1', parent1, 'contents')
1080
parent2 = transform.new_directory('parent2', root)
1081
transform.adjust_path('child1', parent2, child1)
1082
transform.cancel_creation(child1)
1084
transform.cancel_creation(parent1)
1085
# if the transform thinks child1 is still in parent1's limbo
1086
# directory, it will attempt to move it and fail.
1088
self.fail('Transform still thinks child1 is a child of parent1')
1089
transform.finalize()
1091
def test_noname_contents(self):
1092
"""TreeTransform should permit deferring naming files."""
1093
transform, root = self.get_transform()
1094
parent = transform.trans_id_file_id('parent-id')
1096
transform.create_directory(parent)
1098
self.fail("Can't handle contents with no name")
1099
transform.finalize()
1101
def test_noname_contents_nested(self):
1102
"""TreeTransform should permit deferring naming files."""
1103
transform, root = self.get_transform()
1104
parent = transform.trans_id_file_id('parent-id')
1106
transform.create_directory(parent)
1108
self.fail("Can't handle contents with no name")
1109
child = transform.new_directory('child', parent)
1110
transform.adjust_path('parent', root, parent)
1112
self.failUnlessExists(self.wt.abspath('parent/child'))
1113
self.assertEqual(1, transform.rename_count)
1115
def test_reuse_name(self):
1116
"""Avoid reusing the same limbo name for different files"""
1117
transform, root = self.get_transform()
1118
parent = transform.new_directory('parent', root)
1119
child1 = transform.new_directory('child', parent)
1121
child2 = transform.new_directory('child', parent)
1123
self.fail('Tranform tried to use the same limbo name twice')
1124
transform.adjust_path('child2', parent, child2)
1126
# limbo/new-1 => parent, limbo/new-3 => parent/child2
1127
# child2 is put into top-level limbo because child1 has already
1128
# claimed the direct limbo path when child2 is created. There is no
1129
# advantage in renaming files once they're in top-level limbo, except
1131
self.assertEqual(2, transform.rename_count)
1133
def test_reuse_when_first_moved(self):
1134
"""Don't avoid direct paths when it is safe to use them"""
1135
transform, root = self.get_transform()
1136
parent = transform.new_directory('parent', root)
1137
child1 = transform.new_directory('child', parent)
1138
transform.adjust_path('child1', parent, child1)
1139
child2 = transform.new_directory('child', parent)
1141
# limbo/new-1 => parent
1142
self.assertEqual(1, transform.rename_count)
1144
def test_reuse_after_cancel(self):
1145
"""Don't avoid direct paths when it is safe to use them"""
1146
transform, root = self.get_transform()
1147
parent2 = transform.new_directory('parent2', root)
1148
child1 = transform.new_directory('child1', parent2)
1149
transform.cancel_creation(parent2)
1150
transform.create_directory(parent2)
1151
child2 = transform.new_directory('child1', parent2)
1152
transform.adjust_path('child2', parent2, child1)
1154
# limbo/new-1 => parent2, limbo/new-2 => parent2/child1
1155
self.assertEqual(2, transform.rename_count)
1157
def test_finalize_order(self):
1158
"""Finalize must be done in child-to-parent order"""
1159
transform, root = self.get_transform()
1160
parent = transform.new_directory('parent', root)
1161
child = transform.new_directory('child', parent)
1163
transform.finalize()
1165
self.fail('Tried to remove parent before child1')
1167
def test_cancel_with_cancelled_child_should_succeed(self):
1168
transform, root = self.get_transform()
1169
parent = transform.new_directory('parent', root)
1170
child = transform.new_directory('child', parent)
1171
transform.cancel_creation(child)
1172
transform.cancel_creation(parent)
1173
transform.finalize()
1175
def test_change_entry(self):
1176
txt = 'bzrlib.transform.change_entry was deprecated in version 0.90.'
1177
self.callDeprecated([txt], change_entry, None, None, None, None, None,
1180
def test_case_insensitive_clash(self):
1181
self.requireFeature(CaseInsensitiveFilesystemFeature)
1183
wt = self.make_branch_and_tree('.')
1184
tt = TreeTransform(wt) # TreeTransform obtains write lock
1186
tt.new_file('foo', tt.root, 'bar')
1187
tt.new_file('Foo', tt.root, 'spam')
1188
# Lie to tt that we've already resolved all conflicts.
1189
tt.apply(no_conflicts=True)
1193
err = self.assertRaises(errors.FileExists, tt_helper)
1194
self.assertContainsRe(str(err),
1195
"^File exists: .+/foo")
1197
def test_two_directories_clash(self):
1199
wt = self.make_branch_and_tree('.')
1200
tt = TreeTransform(wt) # TreeTransform obtains write lock
1202
foo_1 = tt.new_directory('foo', tt.root)
1203
tt.new_directory('bar', foo_1)
1204
foo_2 = tt.new_directory('foo', tt.root)
1205
tt.new_directory('baz', foo_2)
1206
# Lie to tt that we've already resolved all conflicts.
1207
tt.apply(no_conflicts=True)
1211
err = self.assertRaises(errors.FileExists, tt_helper)
1212
self.assertContainsRe(str(err),
1213
"^File exists: .+/foo")
1215
def test_two_directories_clash_finalize(self):
1217
wt = self.make_branch_and_tree('.')
1218
tt = TreeTransform(wt) # TreeTransform obtains write lock
1220
foo_1 = tt.new_directory('foo', tt.root)
1221
tt.new_directory('bar', foo_1)
1222
foo_2 = tt.new_directory('foo', tt.root)
1223
tt.new_directory('baz', foo_2)
1224
# Lie to tt that we've already resolved all conflicts.
1225
tt.apply(no_conflicts=True)
1229
err = self.assertRaises(errors.FileExists, tt_helper)
1230
self.assertContainsRe(str(err),
1231
"^File exists: .+/foo")
494
1234
class TransformGroup(object):
495
def __init__(self, dirname):
1236
def __init__(self, dirname, root_id):
496
1237
self.name = dirname
497
1238
os.mkdir(dirname)
498
1239
self.wt = BzrDir.create_standalone_workingtree(dirname)
1240
self.wt.set_root_id(root_id)
499
1241
self.b = self.wt.branch
500
1242
self.tt = TreeTransform(self.wt)
501
1243
self.root = self.tt.trans_id_tree_file_id(self.wt.get_root_id())
503
1246
def conflict_text(tree, merge):
504
1247
template = '%s TREE\n%s%s\n%s%s MERGE-SOURCE\n'
505
1248
return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
508
1251
class TestTransformMerge(TestCaseInTempDir):
509
1253
def test_text_merge(self):
510
base = TransformGroup("base")
1254
root_id = generate_ids.gen_root_id()
1255
base = TransformGroup("base", root_id)
511
1256
base.tt.new_file('a', base.root, 'a\nb\nc\nd\be\n', 'a')
512
1257
base.tt.new_file('b', base.root, 'b1', 'b')
513
1258
base.tt.new_file('c', base.root, 'c', 'c')
698
1447
a.add(['foo', 'foo/bar', 'foo/baz'])
699
1448
a.commit('initial commit')
700
1449
b = BzrDir.create_standalone_workingtree('b')
701
build_tree(a.basis_tree(), b)
1450
basis = a.basis_tree()
1452
self.addCleanup(basis.unlock)
1453
build_tree(basis, b)
702
1454
self.assertIs(os.path.isdir('b/foo'), True)
703
1455
self.assertEqual(file('b/foo/bar', 'rb').read(), "contents")
704
1456
self.assertEqual(os.readlink('b/foo/baz'), 'a/foo/bar')
1458
def test_build_with_references(self):
1459
tree = self.make_branch_and_tree('source',
1460
format='dirstate-with-subtree')
1461
subtree = self.make_branch_and_tree('source/subtree',
1462
format='dirstate-with-subtree')
1463
tree.add_reference(subtree)
1464
tree.commit('a revision')
1465
tree.branch.create_checkout('target')
1466
self.failUnlessExists('target')
1467
self.failUnlessExists('target/subtree')
1469
def test_file_conflict_handling(self):
1470
"""Ensure that when building trees, conflict handling is done"""
1471
source = self.make_branch_and_tree('source')
1472
target = self.make_branch_and_tree('target')
1473
self.build_tree(['source/file', 'target/file'])
1474
source.add('file', 'new-file')
1475
source.commit('added file')
1476
build_tree(source.basis_tree(), target)
1477
self.assertEqual([DuplicateEntry('Moved existing file to',
1478
'file.moved', 'file', None, 'new-file')],
1480
target2 = self.make_branch_and_tree('target2')
1481
target_file = file('target2/file', 'wb')
1483
source_file = file('source/file', 'rb')
1485
target_file.write(source_file.read())
1490
build_tree(source.basis_tree(), target2)
1491
self.assertEqual([], target2.conflicts())
1493
def test_symlink_conflict_handling(self):
1494
"""Ensure that when building trees, conflict handling is done"""
1495
self.requireFeature(SymlinkFeature)
1496
source = self.make_branch_and_tree('source')
1497
os.symlink('foo', 'source/symlink')
1498
source.add('symlink', 'new-symlink')
1499
source.commit('added file')
1500
target = self.make_branch_and_tree('target')
1501
os.symlink('bar', 'target/symlink')
1502
build_tree(source.basis_tree(), target)
1503
self.assertEqual([DuplicateEntry('Moved existing file to',
1504
'symlink.moved', 'symlink', None, 'new-symlink')],
1506
target = self.make_branch_and_tree('target2')
1507
os.symlink('foo', 'target2/symlink')
1508
build_tree(source.basis_tree(), target)
1509
self.assertEqual([], target.conflicts())
1511
def test_directory_conflict_handling(self):
1512
"""Ensure that when building trees, conflict handling is done"""
1513
source = self.make_branch_and_tree('source')
1514
target = self.make_branch_and_tree('target')
1515
self.build_tree(['source/dir1/', 'source/dir1/file', 'target/dir1/'])
1516
source.add(['dir1', 'dir1/file'], ['new-dir1', 'new-file'])
1517
source.commit('added file')
1518
build_tree(source.basis_tree(), target)
1519
self.assertEqual([], target.conflicts())
1520
self.failUnlessExists('target/dir1/file')
1522
# Ensure contents are merged
1523
target = self.make_branch_and_tree('target2')
1524
self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
1525
build_tree(source.basis_tree(), target)
1526
self.assertEqual([], target.conflicts())
1527
self.failUnlessExists('target2/dir1/file2')
1528
self.failUnlessExists('target2/dir1/file')
1530
# Ensure new contents are suppressed for existing branches
1531
target = self.make_branch_and_tree('target3')
1532
self.make_branch('target3/dir1')
1533
self.build_tree(['target3/dir1/file2'])
1534
build_tree(source.basis_tree(), target)
1535
self.failIfExists('target3/dir1/file')
1536
self.failUnlessExists('target3/dir1/file2')
1537
self.failUnlessExists('target3/dir1.diverted/file')
1538
self.assertEqual([DuplicateEntry('Diverted to',
1539
'dir1.diverted', 'dir1', 'new-dir1', None)],
1542
target = self.make_branch_and_tree('target4')
1543
self.build_tree(['target4/dir1/'])
1544
self.make_branch('target4/dir1/file')
1545
build_tree(source.basis_tree(), target)
1546
self.failUnlessExists('target4/dir1/file')
1547
self.assertEqual('directory', file_kind('target4/dir1/file'))
1548
self.failUnlessExists('target4/dir1/file.diverted')
1549
self.assertEqual([DuplicateEntry('Diverted to',
1550
'dir1/file.diverted', 'dir1/file', 'new-file', None)],
1553
def test_mixed_conflict_handling(self):
1554
"""Ensure that when building trees, conflict handling is done"""
1555
source = self.make_branch_and_tree('source')
1556
target = self.make_branch_and_tree('target')
1557
self.build_tree(['source/name', 'target/name/'])
1558
source.add('name', 'new-name')
1559
source.commit('added file')
1560
build_tree(source.basis_tree(), target)
1561
self.assertEqual([DuplicateEntry('Moved existing file to',
1562
'name.moved', 'name', None, 'new-name')], target.conflicts())
1564
def test_raises_in_populated(self):
1565
source = self.make_branch_and_tree('source')
1566
self.build_tree(['source/name'])
1568
source.commit('added name')
1569
target = self.make_branch_and_tree('target')
1570
self.build_tree(['target/name'])
1572
self.assertRaises(errors.WorkingTreeAlreadyPopulated,
1573
build_tree, source.basis_tree(), target)
1575
def test_build_tree_rename_count(self):
1576
source = self.make_branch_and_tree('source')
1577
self.build_tree(['source/file1', 'source/dir1/'])
1578
source.add(['file1', 'dir1'])
1579
source.commit('add1')
1580
target1 = self.make_branch_and_tree('target1')
1581
transform_result = build_tree(source.basis_tree(), target1)
1582
self.assertEqual(2, transform_result.rename_count)
1584
self.build_tree(['source/dir1/file2'])
1585
source.add(['dir1/file2'])
1586
source.commit('add3')
1587
target2 = self.make_branch_and_tree('target2')
1588
transform_result = build_tree(source.basis_tree(), target2)
1589
# children of non-root directories should not be renamed
1590
self.assertEqual(2, transform_result.rename_count)
1592
def create_ab_tree(self):
1593
"""Create a committed test tree with two files"""
1594
source = self.make_branch_and_tree('source')
1595
self.build_tree_contents([('source/file1', 'A')])
1596
self.build_tree_contents([('source/file2', 'B')])
1597
source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
1598
source.commit('commit files')
1600
self.addCleanup(source.unlock)
1603
def test_build_tree_accelerator_tree(self):
1604
source = self.create_ab_tree()
1605
self.build_tree_contents([('source/file2', 'C')])
1607
real_source_get_file = source.get_file
1608
def get_file(file_id, path=None):
1609
calls.append(file_id)
1610
return real_source_get_file(file_id, path)
1611
source.get_file = get_file
1612
target = self.make_branch_and_tree('target')
1613
revision_tree = source.basis_tree()
1614
revision_tree.lock_read()
1615
self.addCleanup(revision_tree.unlock)
1616
build_tree(revision_tree, target, source)
1617
self.assertEqual(['file1-id'], calls)
1619
self.addCleanup(target.unlock)
1620
self.assertEqual([], list(target.iter_changes(revision_tree)))
1622
def test_build_tree_accelerator_tree_missing_file(self):
1623
source = self.create_ab_tree()
1624
os.unlink('source/file1')
1625
source.remove(['file2'])
1626
target = self.make_branch_and_tree('target')
1627
revision_tree = source.basis_tree()
1628
revision_tree.lock_read()
1629
self.addCleanup(revision_tree.unlock)
1630
build_tree(revision_tree, target, source)
1632
self.addCleanup(target.unlock)
1633
self.assertEqual([], list(target.iter_changes(revision_tree)))
1635
def test_build_tree_accelerator_wrong_kind(self):
1636
self.requireFeature(SymlinkFeature)
1637
source = self.make_branch_and_tree('source')
1638
self.build_tree_contents([('source/file1', '')])
1639
self.build_tree_contents([('source/file2', '')])
1640
source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
1641
source.commit('commit files')
1642
os.unlink('source/file2')
1643
self.build_tree_contents([('source/file2/', 'C')])
1644
os.unlink('source/file1')
1645
os.symlink('file2', 'source/file1')
1647
real_source_get_file = source.get_file
1648
def get_file(file_id, path=None):
1649
calls.append(file_id)
1650
return real_source_get_file(file_id, path)
1651
source.get_file = get_file
1652
target = self.make_branch_and_tree('target')
1653
revision_tree = source.basis_tree()
1654
revision_tree.lock_read()
1655
self.addCleanup(revision_tree.unlock)
1656
build_tree(revision_tree, target, source)
1657
self.assertEqual([], calls)
1659
self.addCleanup(target.unlock)
1660
self.assertEqual([], list(target.iter_changes(revision_tree)))
1662
def test_build_tree_hardlink(self):
1663
self.requireFeature(HardlinkFeature)
1664
source = self.create_ab_tree()
1665
target = self.make_branch_and_tree('target')
1666
revision_tree = source.basis_tree()
1667
revision_tree.lock_read()
1668
self.addCleanup(revision_tree.unlock)
1669
build_tree(revision_tree, target, source, hardlink=True)
1671
self.addCleanup(target.unlock)
1672
self.assertEqual([], list(target.iter_changes(revision_tree)))
1673
source_stat = os.stat('source/file1')
1674
target_stat = os.stat('target/file1')
1675
self.assertEqual(source_stat, target_stat)
1677
# Explicitly disallowing hardlinks should prevent them.
1678
target2 = self.make_branch_and_tree('target2')
1679
build_tree(revision_tree, target2, source, hardlink=False)
1681
self.addCleanup(target2.unlock)
1682
self.assertEqual([], list(target2.iter_changes(revision_tree)))
1683
source_stat = os.stat('source/file1')
1684
target2_stat = os.stat('target2/file1')
1685
self.assertNotEqual(source_stat, target2_stat)
1687
def test_build_tree_accelerator_tree_moved(self):
1688
source = self.make_branch_and_tree('source')
1689
self.build_tree_contents([('source/file1', 'A')])
1690
source.add(['file1'], ['file1-id'])
1691
source.commit('commit files')
1692
source.rename_one('file1', 'file2')
1694
self.addCleanup(source.unlock)
1695
target = self.make_branch_and_tree('target')
1696
revision_tree = source.basis_tree()
1697
revision_tree.lock_read()
1698
self.addCleanup(revision_tree.unlock)
1699
build_tree(revision_tree, target, source)
1701
self.addCleanup(target.unlock)
1702
self.assertEqual([], list(target.iter_changes(revision_tree)))
1704
def test_build_tree_hardlinks_preserve_execute(self):
1705
self.requireFeature(HardlinkFeature)
1706
source = self.create_ab_tree()
1707
tt = TreeTransform(source)
1708
trans_id = tt.trans_id_tree_file_id('file1-id')
1709
tt.set_executability(True, trans_id)
1711
self.assertTrue(source.is_executable('file1-id'))
1712
target = self.make_branch_and_tree('target')
1713
revision_tree = source.basis_tree()
1714
revision_tree.lock_read()
1715
self.addCleanup(revision_tree.unlock)
1716
build_tree(revision_tree, target, source, hardlink=True)
1718
self.addCleanup(target.unlock)
1719
self.assertEqual([], list(target.iter_changes(revision_tree)))
1720
self.assertTrue(source.is_executable('file1-id'))
706
1723
class MockTransform(object):
708
1725
def has_named_child(self, by_parent, parent_id, name):
732
1751
self.assertEqual(name, 'name.~1~')
733
1752
name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
734
1753
self.assertEqual(name, 'name.~4~')
1756
class TestFileMover(tests.TestCaseWithTransport):
1758
def test_file_mover(self):
1759
self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
1760
mover = _FileMover()
1761
mover.rename('a', 'q')
1762
self.failUnlessExists('q')
1763
self.failIfExists('a')
1764
self.failUnlessExists('q/b')
1765
self.failUnlessExists('c')
1766
self.failUnlessExists('c/d')
1768
def test_pre_delete_rollback(self):
1769
self.build_tree(['a/'])
1770
mover = _FileMover()
1771
mover.pre_delete('a', 'q')
1772
self.failUnlessExists('q')
1773
self.failIfExists('a')
1775
self.failIfExists('q')
1776
self.failUnlessExists('a')
1778
def test_apply_deletions(self):
1779
self.build_tree(['a/', 'b/'])
1780
mover = _FileMover()
1781
mover.pre_delete('a', 'q')
1782
mover.pre_delete('b', 'r')
1783
self.failUnlessExists('q')
1784
self.failUnlessExists('r')
1785
self.failIfExists('a')
1786
self.failIfExists('b')
1787
mover.apply_deletions()
1788
self.failIfExists('q')
1789
self.failIfExists('r')
1790
self.failIfExists('a')
1791
self.failIfExists('b')
1793
def test_file_mover_rollback(self):
1794
self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
1795
mover = _FileMover()
1796
mover.rename('c/d', 'c/f')
1797
mover.rename('c/e', 'c/d')
1799
mover.rename('a', 'c')
1800
except errors.FileExists, e:
1802
self.failUnlessExists('a')
1803
self.failUnlessExists('c/d')
1806
class Bogus(Exception):
1810
class TestTransformRollback(tests.TestCaseWithTransport):
1812
class ExceptionFileMover(_FileMover):
1814
def __init__(self, bad_source=None, bad_target=None):
1815
_FileMover.__init__(self)
1816
self.bad_source = bad_source
1817
self.bad_target = bad_target
1819
def rename(self, source, target):
1820
if (self.bad_source is not None and
1821
source.endswith(self.bad_source)):
1823
elif (self.bad_target is not None and
1824
target.endswith(self.bad_target)):
1827
_FileMover.rename(self, source, target)
1829
def test_rollback_rename(self):
1830
tree = self.make_branch_and_tree('.')
1831
self.build_tree(['a/', 'a/b'])
1832
tt = TreeTransform(tree)
1833
self.addCleanup(tt.finalize)
1834
a_id = tt.trans_id_tree_path('a')
1835
tt.adjust_path('c', tt.root, a_id)
1836
tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
1837
self.assertRaises(Bogus, tt.apply,
1838
_mover=self.ExceptionFileMover(bad_source='a'))
1839
self.failUnlessExists('a')
1840
self.failUnlessExists('a/b')
1842
self.failUnlessExists('c')
1843
self.failUnlessExists('c/d')
1845
def test_rollback_rename_into_place(self):
1846
tree = self.make_branch_and_tree('.')
1847
self.build_tree(['a/', 'a/b'])
1848
tt = TreeTransform(tree)
1849
self.addCleanup(tt.finalize)
1850
a_id = tt.trans_id_tree_path('a')
1851
tt.adjust_path('c', tt.root, a_id)
1852
tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
1853
self.assertRaises(Bogus, tt.apply,
1854
_mover=self.ExceptionFileMover(bad_target='c/d'))
1855
self.failUnlessExists('a')
1856
self.failUnlessExists('a/b')
1858
self.failUnlessExists('c')
1859
self.failUnlessExists('c/d')
1861
def test_rollback_deletion(self):
1862
tree = self.make_branch_and_tree('.')
1863
self.build_tree(['a/', 'a/b'])
1864
tt = TreeTransform(tree)
1865
self.addCleanup(tt.finalize)
1866
a_id = tt.trans_id_tree_path('a')
1867
tt.delete_contents(a_id)
1868
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
1869
self.assertRaises(Bogus, tt.apply,
1870
_mover=self.ExceptionFileMover(bad_target='d'))
1871
self.failUnlessExists('a')
1872
self.failUnlessExists('a/b')
1874
def test_resolve_no_parent(self):
1875
wt = self.make_branch_and_tree('.')
1876
tt = TreeTransform(wt)
1877
self.addCleanup(tt.finalize)
1878
parent = tt.trans_id_file_id('parent-id')
1879
tt.new_file('file', parent, 'Contents')
1880
resolve_conflicts(tt)
1883
class TestTransformPreview(tests.TestCaseWithTransport):
1885
def create_tree(self):
1886
tree = self.make_branch_and_tree('.')
1887
self.build_tree_contents([('a', 'content 1')])
1888
tree.add('a', 'a-id')
1889
tree.commit('rev1', rev_id='rev1')
1890
return tree.branch.repository.revision_tree('rev1')
1892
def get_empty_preview(self):
1893
repository = self.make_repository('repo')
1894
tree = repository.revision_tree(_mod_revision.NULL_REVISION)
1895
preview = TransformPreview(tree)
1896
self.addCleanup(preview.finalize)
1899
def test_transform_preview(self):
1900
revision_tree = self.create_tree()
1901
preview = TransformPreview(revision_tree)
1902
self.addCleanup(preview.finalize)
1904
def test_transform_preview_tree(self):
1905
revision_tree = self.create_tree()
1906
preview = TransformPreview(revision_tree)
1907
self.addCleanup(preview.finalize)
1908
preview.get_preview_tree()
1910
def test_transform_new_file(self):
1911
revision_tree = self.create_tree()
1912
preview = TransformPreview(revision_tree)
1913
self.addCleanup(preview.finalize)
1914
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
1915
preview_tree = preview.get_preview_tree()
1916
self.assertEqual(preview_tree.kind('file2-id'), 'file')
1918
preview_tree.get_file('file2-id').read(), 'content B\n')
1920
def test_diff_preview_tree(self):
1921
revision_tree = self.create_tree()
1922
preview = TransformPreview(revision_tree)
1923
self.addCleanup(preview.finalize)
1924
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
1925
preview_tree = preview.get_preview_tree()
1927
show_diff_trees(revision_tree, preview_tree, out)
1928
lines = out.getvalue().splitlines()
1929
self.assertEqual(lines[0], "=== added file 'file2'")
1930
# 3 lines of diff administrivia
1931
self.assertEqual(lines[4], "+content B")
1933
def test_transform_conflicts(self):
1934
revision_tree = self.create_tree()
1935
preview = TransformPreview(revision_tree)
1936
self.addCleanup(preview.finalize)
1937
preview.new_file('a', preview.root, 'content 2')
1938
resolve_conflicts(preview)
1939
trans_id = preview.trans_id_file_id('a-id')
1940
self.assertEqual('a.moved', preview.final_name(trans_id))
1942
def get_tree_and_preview_tree(self):
1943
revision_tree = self.create_tree()
1944
preview = TransformPreview(revision_tree)
1945
self.addCleanup(preview.finalize)
1946
a_trans_id = preview.trans_id_file_id('a-id')
1947
preview.delete_contents(a_trans_id)
1948
preview.create_file('b content', a_trans_id)
1949
preview_tree = preview.get_preview_tree()
1950
return revision_tree, preview_tree
1952
def test_iter_changes(self):
1953
revision_tree, preview_tree = self.get_tree_and_preview_tree()
1954
root = revision_tree.inventory.root.file_id
1955
self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
1956
(root, root), ('a', 'a'), ('file', 'file'),
1958
list(preview_tree.iter_changes(revision_tree)))
1960
def test_wrong_tree_value_error(self):
1961
revision_tree, preview_tree = self.get_tree_and_preview_tree()
1962
e = self.assertRaises(ValueError, preview_tree.iter_changes,
1964
self.assertEqual('from_tree must be transform source tree.', str(e))
1966
def test_include_unchanged_value_error(self):
1967
revision_tree, preview_tree = self.get_tree_and_preview_tree()
1968
e = self.assertRaises(ValueError, preview_tree.iter_changes,
1969
revision_tree, include_unchanged=True)
1970
self.assertEqual('include_unchanged is not supported', str(e))
1972
def test_specific_files(self):
1973
revision_tree, preview_tree = self.get_tree_and_preview_tree()
1974
e = self.assertRaises(ValueError, preview_tree.iter_changes,
1975
revision_tree, specific_files=['pete'])
1976
self.assertEqual('specific_files is not supported', str(e))
1978
def test_want_unversioned_value_error(self):
1979
revision_tree, preview_tree = self.get_tree_and_preview_tree()
1980
e = self.assertRaises(ValueError, preview_tree.iter_changes,
1981
revision_tree, want_unversioned=True)
1982
self.assertEqual('want_unversioned is not supported', str(e))
1984
def test_ignore_extra_trees_no_specific_files(self):
1985
# extra_trees is harmless without specific_files, so we'll silently
1986
# accept it, even though we won't use it.
1987
revision_tree, preview_tree = self.get_tree_and_preview_tree()
1988
preview_tree.iter_changes(revision_tree, extra_trees=[preview_tree])
1990
def test_ignore_require_versioned_no_specific_files(self):
1991
# require_versioned is meaningless without specific_files.
1992
revision_tree, preview_tree = self.get_tree_and_preview_tree()
1993
preview_tree.iter_changes(revision_tree, require_versioned=False)
1995
def test_ignore_pb(self):
1996
# pb could be supported, but TT.iter_changes doesn't support it.
1997
revision_tree, preview_tree = self.get_tree_and_preview_tree()
1998
preview_tree.iter_changes(revision_tree, pb=progress.DummyProgress())
2000
def test_kind(self):
2001
revision_tree = self.create_tree()
2002
preview = TransformPreview(revision_tree)
2003
self.addCleanup(preview.finalize)
2004
preview.new_file('file', preview.root, 'contents', 'file-id')
2005
preview.new_directory('directory', preview.root, 'dir-id')
2006
preview_tree = preview.get_preview_tree()
2007
self.assertEqual('file', preview_tree.kind('file-id'))
2008
self.assertEqual('directory', preview_tree.kind('dir-id'))
2010
def test_get_file_mtime(self):
2011
preview = self.get_empty_preview()
2012
file_trans_id = preview.new_file('file', preview.root, 'contents',
2014
limbo_path = preview._limbo_name(file_trans_id)
2015
preview_tree = preview.get_preview_tree()
2016
self.assertEqual(os.stat(limbo_path).st_mtime,
2017
preview_tree.get_file_mtime('file-id'))
2019
def test_get_file(self):
2020
preview = self.get_empty_preview()
2021
preview.new_file('file', preview.root, 'contents', 'file-id')
2022
preview_tree = preview.get_preview_tree()
2023
tree_file = preview_tree.get_file('file-id')
2025
self.assertEqual('contents', tree_file.read())
2029
def test_get_symlink_target(self):
2030
self.requireFeature(SymlinkFeature)
2031
preview = self.get_empty_preview()
2032
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2033
preview_tree = preview.get_preview_tree()
2034
self.assertEqual('target',
2035
preview_tree.get_symlink_target('symlink-id'))
added
removed
bzrlib/tests/test_transform.py
