818
822
new_dirblock.append((info[0], info[1], info[2], info[4]))
819
823
dirblock[:] = new_dirblock
825
def test__walkdirs_utf8_selection(self):
826
# Just trigger the function once, to make sure it has selected a real
828
list(osutils._walkdirs_utf8('.'))
829
if WalkdirsWin32Feature.available():
830
# If the compiled form is available, make sure it is used
831
from bzrlib._walkdirs_win32 import _walkdirs_utf8_win32_find_file
832
self.assertIs(_walkdirs_utf8_win32_find_file,
833
osutils._real_walkdirs_utf8)
834
elif sys.platform == 'win32':
835
self.assertIs(osutils._walkdirs_unicode_to_utf8,
836
osutils._real_walkdirs_utf8)
837
elif osutils._fs_enc.upper() in ('UTF-8', 'ASCII', 'ANSI_X3.4-1968'): # ascii
838
self.assertIs(osutils._walkdirs_fs_utf8,
839
osutils._real_walkdirs_utf8)
841
self.assertIs(osutils._walkdirs_unicode_to_utf8,
842
osutils._real_walkdirs_utf8)
844
def _save_platform_info(self):
845
cur_winver = win32utils.winver
846
cur_fs_enc = osutils._fs_enc
847
cur_real_walkdirs_utf8 = osutils._real_walkdirs_utf8
849
win32utils.winver = cur_winver
850
osutils._fs_enc = cur_fs_enc
851
osutils._real_walkdirs_utf8 = cur_real_walkdirs_utf8
852
self.addCleanup(restore)
854
def assertWalkdirsUtf8Is(self, expected):
855
"""Assert the right implementation for _walkdirs_utf8 is chosen."""
856
# Force it to redetect
857
osutils._real_walkdirs_utf8 = None
858
# Nothing to list, but should still trigger the selection logic
859
self.assertEqual([(('', '.'), [])], list(osutils._walkdirs_utf8('.')))
860
self.assertIs(expected, osutils._real_walkdirs_utf8)
862
def test_force_walkdirs_utf8_fs_utf8(self):
863
self._save_platform_info()
864
win32utils.winver = None # Avoid the win32 detection code
865
osutils._fs_enc = 'UTF-8'
866
self.assertWalkdirsUtf8Is(osutils._walkdirs_fs_utf8)
868
def test_force_walkdirs_utf8_fs_ascii(self):
869
self._save_platform_info()
870
win32utils.winver = None # Avoid the win32 detection code
871
osutils._fs_enc = 'US-ASCII'
872
self.assertWalkdirsUtf8Is(osutils._walkdirs_fs_utf8)
874
def test_force_walkdirs_utf8_fs_ANSI(self):
875
self._save_platform_info()
876
win32utils.winver = None # Avoid the win32 detection code
877
osutils._fs_enc = 'ANSI_X3.4-1968'
878
self.assertWalkdirsUtf8Is(osutils._walkdirs_fs_utf8)
880
def test_force_walkdirs_utf8_fs_latin1(self):
881
self._save_platform_info()
882
win32utils.winver = None # Avoid the win32 detection code
883
osutils._fs_enc = 'latin1'
884
self.assertWalkdirsUtf8Is(osutils._walkdirs_unicode_to_utf8)
886
def test_force_walkdirs_utf8_nt(self):
887
self.requireFeature(WalkdirsWin32Feature)
888
self._save_platform_info()
889
win32utils.winver = 'Windows NT'
890
from bzrlib._walkdirs_win32 import _walkdirs_utf8_win32_find_file
891
self.assertWalkdirsUtf8Is(_walkdirs_utf8_win32_find_file)
893
def test_force_walkdirs_utf8_nt(self):
894
self.requireFeature(WalkdirsWin32Feature)
895
self._save_platform_info()
896
win32utils.winver = 'Windows 98'
897
self.assertWalkdirsUtf8Is(osutils._walkdirs_unicode_to_utf8)
821
899
def test_unicode_walkdirs(self):
822
900
"""Walkdirs should always return unicode paths."""
823
901
name0 = u'0file-\xb6'
974
1052
self._filter_out_stat(result)
975
1053
self.assertEqual(expected_dirblocks, result)
1055
def test__walkdirs_utf_win32_find_file(self):
1056
self.requireFeature(WalkdirsWin32Feature)
1057
self.requireFeature(tests.UnicodeFilenameFeature)
1058
from bzrlib._walkdirs_win32 import _walkdirs_utf8_win32_find_file
1059
name0u = u'0file-\xb6'
1060
name1u = u'1dir-\u062c\u0648'
1061
name2u = u'2file-\u0633'
1065
name1u + '/' + name0u,
1066
name1u + '/' + name1u + '/',
1069
self.build_tree(tree)
1070
name0 = name0u.encode('utf8')
1071
name1 = name1u.encode('utf8')
1072
name2 = name2u.encode('utf8')
1074
# All of the abspaths should be in unicode, all of the relative paths
1076
expected_dirblocks = [
1078
[(name0, name0, 'file', './' + name0u),
1079
(name1, name1, 'directory', './' + name1u),
1080
(name2, name2, 'file', './' + name2u),
1083
((name1, './' + name1u),
1084
[(name1 + '/' + name0, name0, 'file', './' + name1u
1086
(name1 + '/' + name1, name1, 'directory', './' + name1u
1090
((name1 + '/' + name1, './' + name1u + '/' + name1u),
1095
result = list(_walkdirs_utf8_win32_find_file(u'.'))
1096
self._filter_out_stat(result)
1097
self.assertEqual(expected_dirblocks, result)
1099
def assertStatIsCorrect(self, path, win32stat):
1100
os_stat = os.stat(path)
1101
self.assertEqual(os_stat.st_size, win32stat.st_size)
1102
self.assertAlmostEqual(os_stat.st_mtime, win32stat.st_mtime, places=4)
1103
self.assertAlmostEqual(os_stat.st_ctime, win32stat.st_ctime, places=4)
1104
self.assertAlmostEqual(os_stat.st_atime, win32stat.st_atime, places=4)
1105
self.assertEqual(os_stat.st_dev, win32stat.st_dev)
1106
self.assertEqual(os_stat.st_ino, win32stat.st_ino)
1107
self.assertEqual(os_stat.st_mode, win32stat.st_mode)
1109
def test__walkdirs_utf_win32_find_file_stat_file(self):
1110
"""make sure our Stat values are valid"""
1111
self.requireFeature(WalkdirsWin32Feature)
1112
self.requireFeature(tests.UnicodeFilenameFeature)
1113
from bzrlib._walkdirs_win32 import _walkdirs_utf8_win32_find_file
1114
name0u = u'0file-\xb6'
1115
name0 = name0u.encode('utf8')
1116
self.build_tree([name0u])
1117
# I hate to sleep() here, but I'm trying to make the ctime different
1120
f = open(name0u, 'ab')
1122
f.write('just a small update')
1126
result = list(_walkdirs_utf8_win32_find_file(u'.'))
1127
entry = result[0][1][0]
1128
self.assertEqual((name0, name0, 'file'), entry[:3])
1129
self.assertEqual(u'./' + name0u, entry[4])
1130
self.assertStatIsCorrect(entry[4], entry[3])
1131
self.assertNotEqual(entry[3].st_mtime, entry[3].st_ctime)
1133
def test__walkdirs_utf_win32_find_file_stat_directory(self):
1134
"""make sure our Stat values are valid"""
1135
self.requireFeature(WalkdirsWin32Feature)
1136
self.requireFeature(tests.UnicodeFilenameFeature)
1137
from bzrlib._walkdirs_win32 import _walkdirs_utf8_win32_find_file
1138
name0u = u'0dir-\u062c\u0648'
1139
name0 = name0u.encode('utf8')
1140
self.build_tree([name0u + '/'])
1142
result = list(_walkdirs_utf8_win32_find_file(u'.'))
1143
entry = result[0][1][0]
1144
self.assertEqual((name0, name0, 'directory'), entry[:3])
1145
self.assertEqual(u'./' + name0u, entry[4])
1146
self.assertStatIsCorrect(entry[4], entry[3])
977
1148
def assertPathCompare(self, path_less, path_greater):
978
1149
"""check that path_less and path_greater compare correctly."""
979
1150
self.assertEqual(0, osutils.compare_paths_prefix_order(