/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 bzrlib/tests/test_dirstate.py

Integrate in stat-cache-updates-during-commit with faster iter-changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_dirstate.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests of the dirstate functionality being built for WorkingTreeFormat4."""
18
18
 
23
23
    dirstate,
24
24
    errors,
25
25
    inventory,
26
 
    memorytree,
27
26
    osutils,
28
27
    revision as _mod_revision,
29
 
    tests,
30
28
    )
31
 
from bzrlib.tests import test_osutils
 
29
from bzrlib.memorytree import MemoryTree
 
30
from bzrlib.tests import (
 
31
        SymlinkFeature,
 
32
        TestCase,
 
33
        TestCaseWithTransport,
 
34
        )
32
35
 
33
36
 
34
37
# TODO:
44
47
# set_path_id  setting id when state is in memory modified
45
48
 
46
49
 
47
 
def load_tests(basic_tests, module, loader):
48
 
    suite = loader.suiteClass()
49
 
    dir_reader_tests, remaining_tests = tests.split_suite_by_condition(
50
 
        basic_tests, tests.condition_isinstance(TestCaseWithDirState))
51
 
    tests.multiply_tests(dir_reader_tests,
52
 
                         test_osutils.dir_reader_scenarios(), suite)
53
 
    suite.addTest(remaining_tests)
54
 
    return suite
55
 
 
56
 
 
57
 
class TestCaseWithDirState(tests.TestCaseWithTransport):
 
50
class TestCaseWithDirState(TestCaseWithTransport):
58
51
    """Helper functions for creating DirState objects with various content."""
59
52
 
60
 
    # Set by load_tests
61
 
    _dir_reader_class = None
62
 
    _native_to_unicode = None # Not used yet
63
 
 
64
 
    def setUp(self):
65
 
        tests.TestCaseWithTransport.setUp(self)
66
 
 
67
 
        self.overrideAttr(osutils,
68
 
                          '_selected_dir_reader', self._dir_reader_class())
69
 
 
70
53
    def create_empty_dirstate(self):
71
54
        """Return a locked but empty dirstate"""
72
55
        state = dirstate.DirState.initialize('dirstate')
413
396
            (('', '', tree.get_root_id()), # common details
414
397
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
415
398
              ('d', '', 0, False, rev_id), # first parent details
416
 
              ('d', '', 0, False, rev_id), # second parent details
 
399
              ('d', '', 0, False, rev_id2), # second parent details
417
400
             ])])
418
401
        state = dirstate.DirState.from_tree(tree, 'dirstate')
419
402
        self.check_state_with_reopen(expected_result, state)
494
477
            (('', '', tree.get_root_id()), # common details
495
478
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
496
479
              ('d', '', 0, False, rev_id), # first parent details
497
 
              ('d', '', 0, False, rev_id), # second parent details
 
480
              ('d', '', 0, False, rev_id2), # second parent details
498
481
             ]),
499
482
            (('', 'a file', 'a-file-id'), # common
500
483
             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
580
563
        state.lock_read()
581
564
        try:
582
565
            entry = state._get_entry(0, path_utf8='a-file')
583
 
            # The current size should be 0 (default)
584
 
            self.assertEqual(0, entry[1][0][2])
 
566
            # The current sha1 sum should be empty
 
567
            self.assertEqual('', entry[1][0][1])
585
568
            # We should have a real entry.
586
569
            self.assertNotEqual((None, None), entry)
587
570
            # Make sure everything is old enough
588
571
            state._sha_cutoff_time()
589
572
            state._cutoff_time += 10
590
 
            # Change the file length
591
 
            self.build_tree_contents([('a-file', 'shorter')])
592
 
            sha1sum = dirstate.update_entry(state, entry, 'a-file',
593
 
                os.lstat('a-file'))
594
 
            # new file, no cached sha:
595
 
            self.assertEqual(None, sha1sum)
 
573
            sha1sum = dirstate.update_entry(state, entry, 'a-file', os.lstat('a-file'))
 
574
            # We should have gotten a real sha1
 
575
            self.assertEqual('ecc5374e9ed82ad3ea3b4d452ea995a5fd3e70e3',
 
576
                             sha1sum)
596
577
 
597
578
            # The dirblock has been updated
598
 
            self.assertEqual(7, entry[1][0][2])
 
579
            self.assertEqual(sha1sum, entry[1][0][1])
599
580
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
600
581
                             state._dirblock_state)
601
582
 
611
592
        state.lock_read()
612
593
        try:
613
594
            entry = state._get_entry(0, path_utf8='a-file')
614
 
            self.assertEqual(7, entry[1][0][2])
 
595
            self.assertEqual(sha1sum, entry[1][0][1])
615
596
        finally:
616
597
            state.unlock()
617
598
 
630
611
        state.lock_read()
631
612
        try:
632
613
            entry = state._get_entry(0, path_utf8='a-file')
633
 
            sha1sum = dirstate.update_entry(state, entry, 'a-file',
634
 
                os.lstat('a-file'))
635
 
            # No sha - too new
636
 
            self.assertEqual(None, sha1sum)
 
614
            sha1sum = dirstate.update_entry(state, entry, 'a-file', os.lstat('a-file'))
 
615
            # We should have gotten a real sha1
 
616
            self.assertEqual('ecc5374e9ed82ad3ea3b4d452ea995a5fd3e70e3',
 
617
                             sha1sum)
637
618
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
638
619
                             state._dirblock_state)
639
620
 
656
637
                state2.unlock()
657
638
        finally:
658
639
            state.unlock()
659
 
 
 
640
        
660
641
        # The file on disk should not be modified.
661
642
        state = dirstate.DirState.on_file('dirstate')
662
643
        state.lock_read()
762
743
        # https://bugs.launchpad.net/bzr/+bug/146176
763
744
        # set_state_from_inventory should preserve the stat and hash value for
764
745
        # workingtree files that are not changed by the inventory.
765
 
 
 
746
       
766
747
        tree = self.make_branch_and_tree('.')
767
748
        # depends on the default format using dirstate...
768
749
        tree.lock_write()
769
750
        try:
770
 
            # make a dirstate with some valid hashcache data
 
751
            # make a dirstate with some valid hashcache data 
771
752
            # file on disk, but that's not needed for this test
772
753
            foo_contents = 'contents of foo'
773
754
            self.build_tree_contents([('foo', foo_contents)])
793
774
                (('', 'foo', 'foo-id',),
794
775
                 [('f', foo_sha, foo_size, False, foo_packed)]),
795
776
                tree._dirstate._get_entry(0, 'foo-id'))
796
 
 
 
777
           
797
778
            # extract the inventory, and add something to it
798
779
            inv = tree._get_inventory()
799
780
            # should see the file we poked in...
821
802
        finally:
822
803
            tree.unlock()
823
804
 
 
805
 
824
806
    def test_set_state_from_inventory_mixed_paths(self):
825
807
        tree1 = self.make_branch_and_tree('tree1')
826
808
        self.build_tree(['tree1/a/', 'tree1/a/b/', 'tree1/a-b/',
867
849
        state = dirstate.DirState.initialize('dirstate')
868
850
        try:
869
851
            # check precondition to be sure the state does change appropriately.
870
 
            root_entry = (('', '', 'TREE_ROOT'), [('d', '', 0, False, 'x'*32)])
871
 
            self.assertEqual([root_entry], list(state._iter_entries()))
872
 
            self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
873
 
            self.assertEqual(root_entry,
874
 
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
875
 
            self.assertEqual((None, None),
876
 
                             state._get_entry(0, fileid_utf8='second-root-id'))
877
 
            state.set_path_id('', 'second-root-id')
878
 
            new_root_entry = (('', '', 'second-root-id'),
879
 
                              [('d', '', 0, False, 'x'*32)])
880
 
            expected_rows = [new_root_entry]
 
852
            self.assertEqual(
 
853
                [(('', '', 'TREE_ROOT'), [('d', '', 0, False,
 
854
                   'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])],
 
855
                list(state._iter_entries()))
 
856
            state.set_path_id('', 'foobarbaz')
 
857
            expected_rows = [
 
858
                (('', '', 'foobarbaz'), [('d', '', 0, False,
 
859
                   'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])]
881
860
            self.assertEqual(expected_rows, list(state._iter_entries()))
882
 
            self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
883
 
            self.assertEqual(new_root_entry, 
884
 
                             state._get_entry(0, fileid_utf8='second-root-id'))
885
 
            self.assertEqual((None, None),
886
 
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
887
861
            # should work across save too
888
862
            state.save()
889
863
        finally:
907
881
        state._validate()
908
882
        try:
909
883
            state.set_parent_trees([('parent-revid', rt)], ghosts=[])
910
 
            root_entry = (('', '', 'TREE_ROOT'),
911
 
                          [('d', '', 0, False, 'x'*32),
912
 
                           ('d', '', 0, False, 'parent-revid')])
913
 
            self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
914
 
            self.assertEqual(root_entry,
915
 
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
916
 
            self.assertEqual((None, None),
917
 
                             state._get_entry(0, fileid_utf8='Asecond-root-id'))
918
 
            state.set_path_id('', 'Asecond-root-id')
 
884
            state.set_path_id('', 'foobarbaz')
919
885
            state._validate()
920
886
            # now see that it is what we expected
921
 
            old_root_entry = (('', '', 'TREE_ROOT'),
922
 
                              [('a', '', 0, False, ''),
923
 
                               ('d', '', 0, False, 'parent-revid')])
924
 
            new_root_entry = (('', '', 'Asecond-root-id'),
925
 
                              [('d', '', 0, False, ''),
926
 
                               ('a', '', 0, False, '')])
927
 
            expected_rows = [new_root_entry, old_root_entry]
 
887
            expected_rows = [
 
888
                (('', '', 'TREE_ROOT'),
 
889
                    [('a', '', 0, False, ''),
 
890
                     ('d', '', 0, False, 'parent-revid'),
 
891
                     ]),
 
892
                (('', '', 'foobarbaz'),
 
893
                    [('d', '', 0, False, ''),
 
894
                     ('a', '', 0, False, ''),
 
895
                     ]),
 
896
                ]
928
897
            state._validate()
929
898
            self.assertEqual(expected_rows, list(state._iter_entries()))
930
 
            self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
931
 
            self.assertEqual(old_root_entry, state._get_entry(1, path_utf8=''))
932
 
            self.assertEqual((None, None),
933
 
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
934
 
            self.assertEqual(old_root_entry,
935
 
                             state._get_entry(1, fileid_utf8='TREE_ROOT'))
936
 
            self.assertEqual(new_root_entry,
937
 
                             state._get_entry(0, fileid_utf8='Asecond-root-id'))
938
 
            self.assertEqual((None, None),
939
 
                             state._get_entry(1, fileid_utf8='Asecond-root-id'))
940
899
            # should work across save too
941
900
            state.save()
942
901
        finally:
958
917
        finally:
959
918
            state.unlock()
960
919
 
 
920
 
961
921
    def test_set_parent_trees_no_content(self):
962
922
        # set_parent_trees is a slow but important api to support.
963
923
        tree1 = self.make_branch_and_memory_tree('tree1')
968
928
        finally:
969
929
            tree1.unlock()
970
930
        branch2 = tree1.branch.bzrdir.clone('tree2').open_branch()
971
 
        tree2 = memorytree.MemoryTree.create_on_branch(branch2)
 
931
        tree2 = MemoryTree.create_on_branch(branch2)
972
932
        tree2.lock_write()
973
933
        try:
974
934
            revid2 = tree2.commit('foo')
1017
977
                [(('', '', root_id), [
1018
978
                  ('d', '', 0, False, dirstate.DirState.NULLSTAT),
1019
979
                  ('d', '', 0, False, revid1),
1020
 
                  ('d', '', 0, False, revid1)
 
980
                  ('d', '', 0, False, revid2)
1021
981
                  ])],
1022
982
                list(state._iter_entries()))
1023
983
        finally:
1038
998
        finally:
1039
999
            tree1.unlock()
1040
1000
        branch2 = tree1.branch.bzrdir.clone('tree2').open_branch()
1041
 
        tree2 = memorytree.MemoryTree.create_on_branch(branch2)
 
1001
        tree2 = MemoryTree.create_on_branch(branch2)
1042
1002
        tree2.lock_write()
1043
1003
        try:
1044
1004
            tree2.put_file_bytes_non_atomic('file-id', 'new file-content')
1051
1011
            (('', '', root_id), [
1052
1012
             ('d', '', 0, False, dirstate.DirState.NULLSTAT),
1053
1013
             ('d', '', 0, False, revid1.encode('utf8')),
1054
 
             ('d', '', 0, False, revid1.encode('utf8'))
 
1014
             ('d', '', 0, False, revid2.encode('utf8'))
1055
1015
             ]),
1056
1016
            (('', 'a file', 'file-id'), [
1057
1017
             ('a', '', 0, False, ''),
1103
1063
            state.unlock()
1104
1064
        state = dirstate.DirState.on_file('dirstate')
1105
1065
        state.lock_read()
1106
 
        self.addCleanup(state.unlock)
1107
 
        self.assertEqual(expected_entries, list(state._iter_entries()))
 
1066
        try:
 
1067
            self.assertEqual(expected_entries, list(state._iter_entries()))
 
1068
        finally:
 
1069
            state.unlock()
1108
1070
 
1109
1071
    def test_add_path_to_unversioned_directory(self):
1110
1072
        """Adding a path to an unversioned directory should error.
1115
1077
        """
1116
1078
        self.build_tree(['unversioned/', 'unversioned/a file'])
1117
1079
        state = dirstate.DirState.initialize('dirstate')
1118
 
        self.addCleanup(state.unlock)
1119
 
        self.assertRaises(errors.NotVersionedError, state.add,
1120
 
                          'unversioned/a file', 'a-file-id', 'file', None, None)
 
1080
        try:
 
1081
            self.assertRaises(errors.NotVersionedError, state.add,
 
1082
                'unversioned/a file', 'a-file-id', 'file', None, None)
 
1083
        finally:
 
1084
            state.unlock()
1121
1085
 
1122
1086
    def test_add_directory_to_root_no_parents_all_data(self):
1123
1087
        # The most trivial addition of a dir is when there are no parents and
1143
1107
            state.unlock()
1144
1108
        state = dirstate.DirState.on_file('dirstate')
1145
1109
        state.lock_read()
1146
 
        self.addCleanup(state.unlock)
1147
1110
        state._validate()
1148
 
        self.assertEqual(expected_entries, list(state._iter_entries()))
 
1111
        try:
 
1112
            self.assertEqual(expected_entries, list(state._iter_entries()))
 
1113
        finally:
 
1114
            state.unlock()
1149
1115
 
1150
 
    def _test_add_symlink_to_root_no_parents_all_data(self, link_name, target):
 
1116
    def test_add_symlink_to_root_no_parents_all_data(self):
1151
1117
        # The most trivial addition of a symlink when there are no parents and
1152
1118
        # its in the root and all data about the file is supplied
1153
1119
        # bzr doesn't support fake symlinks on windows, yet.
1154
 
        self.requireFeature(tests.SymlinkFeature)
1155
 
        os.symlink(target, link_name)
1156
 
        stat = os.lstat(link_name)
 
1120
        self.requireFeature(SymlinkFeature)
 
1121
        os.symlink('target', 'a link')
 
1122
        stat = os.lstat('a link')
1157
1123
        expected_entries = [
1158
1124
            (('', '', 'TREE_ROOT'), [
1159
1125
             ('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
1160
1126
             ]),
1161
 
            (('', link_name.encode('UTF-8'), 'a link id'), [
1162
 
             ('l', target.encode('UTF-8'), stat[6],
1163
 
              False, dirstate.pack_stat(stat)), # current tree
 
1127
            (('', 'a link', 'a link id'), [
 
1128
             ('l', 'target', 6, False, dirstate.pack_stat(stat)), # current tree
1164
1129
             ]),
1165
1130
            ]
1166
1131
        state = dirstate.DirState.initialize('dirstate')
1167
1132
        try:
1168
 
            state.add(link_name, 'a link id', 'symlink', stat,
1169
 
                      target.encode('UTF-8'))
 
1133
            state.add('a link', 'a link id', 'symlink', stat, 'target')
1170
1134
            # having added it, it should be in the output of iter_entries.
1171
1135
            self.assertEqual(expected_entries, list(state._iter_entries()))
1172
1136
            # saving and reloading should not affect this.
1175
1139
            state.unlock()
1176
1140
        state = dirstate.DirState.on_file('dirstate')
1177
1141
        state.lock_read()
1178
 
        self.addCleanup(state.unlock)
1179
 
        self.assertEqual(expected_entries, list(state._iter_entries()))
1180
 
 
1181
 
    def test_add_symlink_to_root_no_parents_all_data(self):
1182
 
        self._test_add_symlink_to_root_no_parents_all_data('a link', 'target')
1183
 
 
1184
 
    def test_add_symlink_unicode_to_root_no_parents_all_data(self):
1185
 
        self.requireFeature(tests.UnicodeFilenameFeature)
1186
 
        self._test_add_symlink_to_root_no_parents_all_data(
1187
 
            u'\N{Euro Sign}link', u'targ\N{Euro Sign}et')
 
1142
        try:
 
1143
            self.assertEqual(expected_entries, list(state._iter_entries()))
 
1144
        finally:
 
1145
            state.unlock()
1188
1146
 
1189
1147
    def test_add_directory_and_child_no_parents_all_data(self):
1190
1148
        # after adding a directory, we should be able to add children to it.
1215
1173
            state.unlock()
1216
1174
        state = dirstate.DirState.on_file('dirstate')
1217
1175
        state.lock_read()
1218
 
        self.addCleanup(state.unlock)
1219
 
        self.assertEqual(expected_entries, list(state._iter_entries()))
 
1176
        try:
 
1177
            self.assertEqual(expected_entries, list(state._iter_entries()))
 
1178
        finally:
 
1179
            state.unlock()
1220
1180
 
1221
1181
    def test_add_tree_reference(self):
1222
1182
        # make a dirstate and add a tree reference
1236
1196
            state.unlock()
1237
1197
        # now check we can read it back
1238
1198
        state.lock_read()
1239
 
        self.addCleanup(state.unlock)
1240
1199
        state._validate()
1241
 
        entry2 = state._get_entry(0, 'subdir-id', 'subdir')
1242
 
        self.assertEqual(entry, entry2)
1243
 
        self.assertEqual(entry, expected_entry)
1244
 
        # and lookup by id should work too
1245
 
        entry2 = state._get_entry(0, fileid_utf8='subdir-id')
1246
 
        self.assertEqual(entry, expected_entry)
 
1200
        try:
 
1201
            entry2 = state._get_entry(0, 'subdir-id', 'subdir')
 
1202
            self.assertEqual(entry, entry2)
 
1203
            self.assertEqual(entry, expected_entry)
 
1204
            # and lookup by id should work too
 
1205
            entry2 = state._get_entry(0, fileid_utf8='subdir-id')
 
1206
            self.assertEqual(entry, expected_entry)
 
1207
        finally:
 
1208
            state.unlock()
1247
1209
 
1248
1210
    def test_add_forbidden_names(self):
1249
1211
        state = dirstate.DirState.initialize('dirstate')
1253
1215
        self.assertRaises(errors.BzrError,
1254
1216
            state.add, '..', 'ass-id', 'directory', None, None)
1255
1217
 
1256
 
    def test_set_state_with_rename_b_a_bug_395556(self):
1257
 
        # bug 395556 uncovered a bug where the dirstate ends up with a false
1258
 
        # relocation record - in a tree with no parents there should be no
1259
 
        # absent or relocated records. This then leads to further corruption
1260
 
        # when a commit occurs, as the incorrect relocation gathers an
1261
 
        # incorrect absent in tree 1, and future changes go to pot.
1262
 
        tree1 = self.make_branch_and_tree('tree1')
1263
 
        self.build_tree(['tree1/b'])
1264
 
        tree1.lock_write()
1265
 
        try:
1266
 
            tree1.add(['b'], ['b-id'])
1267
 
            root_id = tree1.get_root_id()
1268
 
            inv = tree1.inventory
1269
 
            state = dirstate.DirState.initialize('dirstate')
1270
 
            try:
1271
 
                # Set the initial state with 'b'
1272
 
                state.set_state_from_inventory(inv)
1273
 
                inv.rename('b-id', root_id, 'a')
1274
 
                # Set the new state with 'a', which currently corrupts.
1275
 
                state.set_state_from_inventory(inv)
1276
 
                expected_result1 = [('', '', root_id, 'd'),
1277
 
                                    ('', 'a', 'b-id', 'f'),
1278
 
                                   ]
1279
 
                values = []
1280
 
                for entry in state._iter_entries():
1281
 
                    values.append(entry[0] + entry[1][0][:1])
1282
 
                self.assertEqual(expected_result1, values)
1283
 
            finally:
1284
 
                state.unlock()
1285
 
        finally:
1286
 
            tree1.unlock()
1287
 
 
1288
1218
 
1289
1219
class TestGetLines(TestCaseWithDirState):
1290
1220
 
1523
1453
        There is one parent tree, which has the same shape with the following variations:
1524
1454
        b/g in the parent is gone.
1525
1455
        b/h in the parent has a different id
1526
 
        b/i is new in the parent
 
1456
        b/i is new in the parent 
1527
1457
        c is renamed to b/j in the parent
1528
1458
 
1529
1459
        :return: The dirstate, still write-locked.
1619
1549
            list(state._iter_child_entries(1, '')))
1620
1550
 
1621
1551
 
1622
 
class TestDirstateSortOrder(tests.TestCaseWithTransport):
 
1552
class TestDirstateSortOrder(TestCaseWithTransport):
1623
1553
    """Test that DirState adds entries in the right order."""
1624
1554
 
1625
1555
    def test_add_sorting(self):
1684
1614
class InstrumentedDirState(dirstate.DirState):
1685
1615
    """An DirState with instrumented sha1 functionality."""
1686
1616
 
1687
 
    def __init__(self, path, sha1_provider):
1688
 
        super(InstrumentedDirState, self).__init__(path, sha1_provider)
 
1617
    def __init__(self, path):
 
1618
        super(InstrumentedDirState, self).__init__(path)
1689
1619
        self._time_offset = 0
1690
1620
        self._log = []
1691
1621
        # member is dynamically set in DirState.__init__ to turn on trace
1692
 
        self._sha1_provider = sha1_provider
1693
1622
        self._sha1_file = self._sha1_file_and_log
1694
1623
 
1695
1624
    def _sha_cutoff_time(self):
1698
1627
 
1699
1628
    def _sha1_file_and_log(self, abspath):
1700
1629
        self._log.append(('sha1', abspath))
1701
 
        return self._sha1_provider.sha1(abspath)
 
1630
        return osutils.sha_file_by_name(abspath)
1702
1631
 
1703
1632
    def _read_link(self, abspath, old_link):
1704
1633
        self._log.append(('read_link', abspath, old_link))
1735
1664
        self.st_ino = ino
1736
1665
        self.st_mode = mode
1737
1666
 
1738
 
    @staticmethod
1739
 
    def from_stat(st):
1740
 
        return _FakeStat(st.st_size, st.st_mtime, st.st_ctime, st.st_dev,
1741
 
            st.st_ino, st.st_mode)
1742
 
 
1743
 
 
1744
 
class TestPackStat(tests.TestCaseWithTransport):
 
1667
 
 
1668
class TestPackStat(TestCaseWithTransport):
1745
1669
 
1746
1670
    def assertPackStat(self, expected, stat_value):
1747
1671
        """Check the packed and serialized form of a stat value."""
2274
2198
        self.assertEqual(exp_dirblocks, state._dirblocks)
2275
2199
 
2276
2200
 
2277
 
class Test_InvEntryToDetails(tests.TestCase):
 
2201
class Test_InvEntryToDetails(TestCaseWithDirState):
2278
2202
 
2279
2203
    def assertDetails(self, expected, inv_entry):
2280
2204
        details = dirstate.DirState._inv_entry_to_details(inv_entry)
2287
2211
        self.assertIsInstance(tree_data, str)
2288
2212
 
2289
2213
    def test_unicode_symlink(self):
2290
 
        inv_entry = inventory.InventoryLink('link-file-id',
2291
 
                                            u'nam\N{Euro Sign}e',
 
2214
        # In general, the code base doesn't support a target that contains
 
2215
        # non-ascii characters. So we just assert tha 
 
2216
        inv_entry = inventory.InventoryLink('link-file-id', 'name',
2292
2217
                                            'link-parent-id')
2293
2218
        inv_entry.revision = 'link-revision-id'
2294
 
        target = u'link-targ\N{Euro Sign}t'
2295
 
        inv_entry.symlink_target = target
2296
 
        self.assertDetails(('l', target.encode('UTF-8'), 0, False,
2297
 
                            'link-revision-id'), inv_entry)
2298
 
 
2299
 
 
2300
 
class TestSHA1Provider(tests.TestCaseInTempDir):
2301
 
 
2302
 
    def test_sha1provider_is_an_interface(self):
2303
 
        p = dirstate.SHA1Provider()
2304
 
        self.assertRaises(NotImplementedError, p.sha1, "foo")
2305
 
        self.assertRaises(NotImplementedError, p.stat_and_sha1, "foo")
2306
 
 
2307
 
    def test_defaultsha1provider_sha1(self):
2308
 
        text = 'test\r\nwith\nall\rpossible line endings\r\n'
2309
 
        self.build_tree_contents([('foo', text)])
2310
 
        expected_sha = osutils.sha_string(text)
2311
 
        p = dirstate.DefaultSHA1Provider()
2312
 
        self.assertEqual(expected_sha, p.sha1('foo'))
2313
 
 
2314
 
    def test_defaultsha1provider_stat_and_sha1(self):
2315
 
        text = 'test\r\nwith\nall\rpossible line endings\r\n'
2316
 
        self.build_tree_contents([('foo', text)])
2317
 
        expected_sha = osutils.sha_string(text)
2318
 
        p = dirstate.DefaultSHA1Provider()
2319
 
        statvalue, sha1 = p.stat_and_sha1('foo')
2320
 
        self.assertTrue(len(statvalue) >= 10)
2321
 
        self.assertEqual(len(text), statvalue.st_size)
2322
 
        self.assertEqual(expected_sha, sha1)
 
2219
        inv_entry.symlink_target = u'link-target'
 
2220
        details = self.assertDetails(('l', 'link-target', 0, False,
 
2221
                                      'link-revision-id'), inv_entry)