← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_dirstate.py

  • Committer: John Arbash Meinel
  • Date: 2008-08-25 21:50:11 UTC
  • mfrom: (0.11.3 tools)
  • mto: This revision was merged to the branch mainline in revision 3659.
  • Revision ID: john@arbash-meinel.com-20080825215011-de9esmzgkue3e522
Merge in Lukáš's helper scripts.
Update the packaging documents to describe how to do the releases
using bzr-builddeb to package all distro platforms
simultaneously.

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
 
19
19
import bisect
20
20
import os
 
21
import time
21
22
 
22
23
from bzrlib import (
23
24
    dirstate,
24
25
    errors,
25
26
    inventory,
26
 
    memorytree,
27
27
    osutils,
28
 
    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 = state.update_entry(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 = state.update_entry(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')
1006
966
            state.set_parent_trees(
1007
967
                ((revid1, tree1.branch.repository.revision_tree(revid1)),
1008
968
                 (revid2, tree2.branch.repository.revision_tree(revid2)),
1009
 
                 ('ghost-rev', tree2.branch.repository.revision_tree(
1010
 
                                   _mod_revision.NULL_REVISION))),
 
969
                 ('ghost-rev', tree2.branch.repository.revision_tree(None))),
1011
970
                ['ghost-rev'])
1012
971
            self.assertEqual([revid1, revid2, 'ghost-rev'],
1013
972
                             state.get_parent_ids())
1017
976
                [(('', '', root_id), [
1018
977
                  ('d', '', 0, False, dirstate.DirState.NULLSTAT),
1019
978
                  ('d', '', 0, False, revid1),
1020
 
                  ('d', '', 0, False, revid1)
 
979
                  ('d', '', 0, False, revid2)
1021
980
                  ])],
1022
981
                list(state._iter_entries()))
1023
982
        finally:
1038
997
        finally:
1039
998
            tree1.unlock()
1040
999
        branch2 = tree1.branch.bzrdir.clone('tree2').open_branch()
1041
 
        tree2 = memorytree.MemoryTree.create_on_branch(branch2)
 
1000
        tree2 = MemoryTree.create_on_branch(branch2)
1042
1001
        tree2.lock_write()
1043
1002
        try:
1044
1003
            tree2.put_file_bytes_non_atomic('file-id', 'new file-content')
1051
1010
            (('', '', root_id), [
1052
1011
             ('d', '', 0, False, dirstate.DirState.NULLSTAT),
1053
1012
             ('d', '', 0, False, revid1.encode('utf8')),
1054
 
             ('d', '', 0, False, revid1.encode('utf8'))
 
1013
             ('d', '', 0, False, revid2.encode('utf8'))
1055
1014
             ]),
1056
1015
            (('', 'a file', 'file-id'), [
1057
1016
             ('a', '', 0, False, ''),
1103
1062
            state.unlock()
1104
1063
        state = dirstate.DirState.on_file('dirstate')
1105
1064
        state.lock_read()
1106
 
        self.addCleanup(state.unlock)
1107
 
        self.assertEqual(expected_entries, list(state._iter_entries()))
 
1065
        try:
 
1066
            self.assertEqual(expected_entries, list(state._iter_entries()))
 
1067
        finally:
 
1068
            state.unlock()
1108
1069
 
1109
1070
    def test_add_path_to_unversioned_directory(self):
1110
1071
        """Adding a path to an unversioned directory should error.
1115
1076
        """
1116
1077
        self.build_tree(['unversioned/', 'unversioned/a file'])
1117
1078
        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)
 
1079
        try:
 
1080
            self.assertRaises(errors.NotVersionedError, state.add,
 
1081
                'unversioned/a file', 'a-file-id', 'file', None, None)
 
1082
        finally:
 
1083
            state.unlock()
1121
1084
 
1122
1085
    def test_add_directory_to_root_no_parents_all_data(self):
1123
1086
        # The most trivial addition of a dir is when there are no parents and
1143
1106
            state.unlock()
1144
1107
        state = dirstate.DirState.on_file('dirstate')
1145
1108
        state.lock_read()
1146
 
        self.addCleanup(state.unlock)
1147
1109
        state._validate()
1148
 
        self.assertEqual(expected_entries, list(state._iter_entries()))
 
1110
        try:
 
1111
            self.assertEqual(expected_entries, list(state._iter_entries()))
 
1112
        finally:
 
1113
            state.unlock()
1149
1114
 
1150
 
    def _test_add_symlink_to_root_no_parents_all_data(self, link_name, target):
 
1115
    def test_add_symlink_to_root_no_parents_all_data(self):
1151
1116
        # The most trivial addition of a symlink when there are no parents and
1152
1117
        # its in the root and all data about the file is supplied
1153
1118
        # 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)
 
1119
        self.requireFeature(SymlinkFeature)
 
1120
        os.symlink('target', 'a link')
 
1121
        stat = os.lstat('a link')
1157
1122
        expected_entries = [
1158
1123
            (('', '', 'TREE_ROOT'), [
1159
1124
             ('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
1160
1125
             ]),
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
 
1126
            (('', 'a link', 'a link id'), [
 
1127
             ('l', 'target', 6, False, dirstate.pack_stat(stat)), # current tree
1164
1128
             ]),
1165
1129
            ]
1166
1130
        state = dirstate.DirState.initialize('dirstate')
1167
1131
        try:
1168
 
            state.add(link_name, 'a link id', 'symlink', stat,
1169
 
                      target.encode('UTF-8'))
 
1132
            state.add('a link', 'a link id', 'symlink', stat, 'target')
1170
1133
            # having added it, it should be in the output of iter_entries.
1171
1134
            self.assertEqual(expected_entries, list(state._iter_entries()))
1172
1135
            # saving and reloading should not affect this.
1175
1138
            state.unlock()
1176
1139
        state = dirstate.DirState.on_file('dirstate')
1177
1140
        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')
 
1141
        try:
 
1142
            self.assertEqual(expected_entries, list(state._iter_entries()))
 
1143
        finally:
 
1144
            state.unlock()
1188
1145
 
1189
1146
    def test_add_directory_and_child_no_parents_all_data(self):
1190
1147
        # after adding a directory, we should be able to add children to it.
1215
1172
            state.unlock()
1216
1173
        state = dirstate.DirState.on_file('dirstate')
1217
1174
        state.lock_read()
1218
 
        self.addCleanup(state.unlock)
1219
 
        self.assertEqual(expected_entries, list(state._iter_entries()))
 
1175
        try:
 
1176
            self.assertEqual(expected_entries, list(state._iter_entries()))
 
1177
        finally:
 
1178
            state.unlock()
1220
1179
 
1221
1180
    def test_add_tree_reference(self):
1222
1181
        # make a dirstate and add a tree reference
1236
1195
            state.unlock()
1237
1196
        # now check we can read it back
1238
1197
        state.lock_read()
1239
 
        self.addCleanup(state.unlock)
1240
1198
        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)
 
1199
        try:
 
1200
            entry2 = state._get_entry(0, 'subdir-id', 'subdir')
 
1201
            self.assertEqual(entry, entry2)
 
1202
            self.assertEqual(entry, expected_entry)
 
1203
            # and lookup by id should work too
 
1204
            entry2 = state._get_entry(0, fileid_utf8='subdir-id')
 
1205
            self.assertEqual(entry, expected_entry)
 
1206
        finally:
 
1207
            state.unlock()
1247
1208
 
1248
1209
    def test_add_forbidden_names(self):
1249
1210
        state = dirstate.DirState.initialize('dirstate')
1253
1214
        self.assertRaises(errors.BzrError,
1254
1215
            state.add, '..', 'ass-id', 'directory', None, None)
1255
1216
 
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
1217
 
1289
1218
class TestGetLines(TestCaseWithDirState):
1290
1219
 
1523
1452
        There is one parent tree, which has the same shape with the following variations:
1524
1453
        b/g in the parent is gone.
1525
1454
        b/h in the parent has a different id
1526
 
        b/i is new in the parent
 
1455
        b/i is new in the parent 
1527
1456
        c is renamed to b/j in the parent
1528
1457
 
1529
1458
        :return: The dirstate, still write-locked.
1619
1548
            list(state._iter_child_entries(1, '')))
1620
1549
 
1621
1550
 
1622
 
class TestDirstateSortOrder(tests.TestCaseWithTransport):
 
1551
class TestDirstateSortOrder(TestCaseWithTransport):
1623
1552
    """Test that DirState adds entries in the right order."""
1624
1553
 
1625
1554
    def test_add_sorting(self):
1674
1603
 
1675
1604
        # *really* cheesy way to just get an empty tree
1676
1605
        repo = self.make_repository('repo')
1677
 
        empty_tree = repo.revision_tree(_mod_revision.NULL_REVISION)
 
1606
        empty_tree = repo.revision_tree(None)
1678
1607
        state.set_parent_trees([('null:', empty_tree)], [])
1679
1608
 
1680
1609
        dirblock_names = [d[0] for d in state._dirblocks]
1684
1613
class InstrumentedDirState(dirstate.DirState):
1685
1614
    """An DirState with instrumented sha1 functionality."""
1686
1615
 
1687
 
    def __init__(self, path, sha1_provider):
1688
 
        super(InstrumentedDirState, self).__init__(path, sha1_provider)
 
1616
    def __init__(self, path):
 
1617
        super(InstrumentedDirState, self).__init__(path)
1689
1618
        self._time_offset = 0
1690
1619
        self._log = []
1691
1620
        # member is dynamically set in DirState.__init__ to turn on trace
1692
 
        self._sha1_provider = sha1_provider
1693
1621
        self._sha1_file = self._sha1_file_and_log
1694
1622
 
1695
1623
    def _sha_cutoff_time(self):
1698
1626
 
1699
1627
    def _sha1_file_and_log(self, abspath):
1700
1628
        self._log.append(('sha1', abspath))
1701
 
        return self._sha1_provider.sha1(abspath)
 
1629
        return osutils.sha_file_by_name(abspath)
1702
1630
 
1703
1631
    def _read_link(self, abspath, old_link):
1704
1632
        self._log.append(('read_link', abspath, old_link))
1735
1663
        self.st_ino = ino
1736
1664
        self.st_mode = mode
1737
1665
 
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):
 
1666
 
 
1667
class TestUpdateEntry(TestCaseWithDirState):
 
1668
    """Test the DirState.update_entry functions"""
 
1669
 
 
1670
    def get_state_with_a(self):
 
1671
        """Create a DirState tracking a single object named 'a'"""
 
1672
        state = InstrumentedDirState.initialize('dirstate')
 
1673
        self.addCleanup(state.unlock)
 
1674
        state.add('a', 'a-id', 'file', None, '')
 
1675
        entry = state._get_entry(0, path_utf8='a')
 
1676
        return state, entry
 
1677
 
 
1678
    def test_update_entry(self):
 
1679
        state, entry = self.get_state_with_a()
 
1680
        self.build_tree(['a'])
 
1681
        # Add one where we don't provide the stat or sha already
 
1682
        self.assertEqual(('', 'a', 'a-id'), entry[0])
 
1683
        self.assertEqual([('f', '', 0, False, dirstate.DirState.NULLSTAT)],
 
1684
                         entry[1])
 
1685
        # Flush the buffers to disk
 
1686
        state.save()
 
1687
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1688
                         state._dirblock_state)
 
1689
 
 
1690
        stat_value = os.lstat('a')
 
1691
        packed_stat = dirstate.pack_stat(stat_value)
 
1692
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1693
                                          stat_value=stat_value)
 
1694
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
1695
                         link_or_sha1)
 
1696
 
 
1697
        # The dirblock entry should not cache the file's sha1
 
1698
        self.assertEqual([('f', '', 14, False, dirstate.DirState.NULLSTAT)],
 
1699
                         entry[1])
 
1700
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
1701
                         state._dirblock_state)
 
1702
        mode = stat_value.st_mode
 
1703
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False)], state._log)
 
1704
 
 
1705
        state.save()
 
1706
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1707
                         state._dirblock_state)
 
1708
 
 
1709
        # If we do it again right away, we don't know if the file has changed
 
1710
        # so we will re-read the file. Roll the clock back so the file is
 
1711
        # guaranteed to look too new.
 
1712
        state.adjust_time(-10)
 
1713
 
 
1714
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1715
                                          stat_value=stat_value)
 
1716
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
 
1717
                          ('sha1', 'a'), ('is_exec', mode, False),
 
1718
                         ], state._log)
 
1719
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
1720
                         link_or_sha1)
 
1721
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
1722
                         state._dirblock_state)
 
1723
        self.assertEqual([('f', '', 14, False, dirstate.DirState.NULLSTAT)],
 
1724
                         entry[1])
 
1725
        state.save()
 
1726
 
 
1727
        # However, if we move the clock forward so the file is considered
 
1728
        # "stable", it should just cache the value.
 
1729
        state.adjust_time(+20)
 
1730
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1731
                                          stat_value=stat_value)
 
1732
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
1733
                         link_or_sha1)
 
1734
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
 
1735
                          ('sha1', 'a'), ('is_exec', mode, False),
 
1736
                          ('sha1', 'a'), ('is_exec', mode, False),
 
1737
                         ], state._log)
 
1738
        self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
 
1739
                         entry[1])
 
1740
 
 
1741
        # Subsequent calls will just return the cached value
 
1742
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1743
                                          stat_value=stat_value)
 
1744
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
1745
                         link_or_sha1)
 
1746
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
 
1747
                          ('sha1', 'a'), ('is_exec', mode, False),
 
1748
                          ('sha1', 'a'), ('is_exec', mode, False),
 
1749
                         ], state._log)
 
1750
        self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
 
1751
                         entry[1])
 
1752
 
 
1753
    def test_update_entry_symlink(self):
 
1754
        """Update entry should read symlinks."""
 
1755
        self.requireFeature(SymlinkFeature)
 
1756
        state, entry = self.get_state_with_a()
 
1757
        state.save()
 
1758
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1759
                         state._dirblock_state)
 
1760
        os.symlink('target', 'a')
 
1761
 
 
1762
        state.adjust_time(-10) # Make the symlink look new
 
1763
        stat_value = os.lstat('a')
 
1764
        packed_stat = dirstate.pack_stat(stat_value)
 
1765
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1766
                                          stat_value=stat_value)
 
1767
        self.assertEqual('target', link_or_sha1)
 
1768
        self.assertEqual([('read_link', 'a', '')], state._log)
 
1769
        # Dirblock is not updated (the link is too new)
 
1770
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
 
1771
                         entry[1])
 
1772
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
1773
                         state._dirblock_state)
 
1774
 
 
1775
        # Because the stat_value looks new, we should re-read the target
 
1776
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1777
                                          stat_value=stat_value)
 
1778
        self.assertEqual('target', link_or_sha1)
 
1779
        self.assertEqual([('read_link', 'a', ''),
 
1780
                          ('read_link', 'a', ''),
 
1781
                         ], state._log)
 
1782
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
 
1783
                         entry[1])
 
1784
        state.adjust_time(+20) # Skip into the future, all files look old
 
1785
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1786
                                          stat_value=stat_value)
 
1787
        self.assertEqual('target', link_or_sha1)
 
1788
        # We need to re-read the link because only now can we cache it
 
1789
        self.assertEqual([('read_link', 'a', ''),
 
1790
                          ('read_link', 'a', ''),
 
1791
                          ('read_link', 'a', ''),
 
1792
                         ], state._log)
 
1793
        self.assertEqual([('l', 'target', 6, False, packed_stat)],
 
1794
                         entry[1])
 
1795
 
 
1796
        # Another call won't re-read the link
 
1797
        self.assertEqual([('read_link', 'a', ''),
 
1798
                          ('read_link', 'a', ''),
 
1799
                          ('read_link', 'a', ''),
 
1800
                         ], state._log)
 
1801
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1802
                                          stat_value=stat_value)
 
1803
        self.assertEqual('target', link_or_sha1)
 
1804
        self.assertEqual([('l', 'target', 6, False, packed_stat)],
 
1805
                         entry[1])
 
1806
 
 
1807
    def do_update_entry(self, state, entry, abspath):
 
1808
        stat_value = os.lstat(abspath)
 
1809
        return state.update_entry(entry, abspath, stat_value)
 
1810
 
 
1811
    def test_update_entry_dir(self):
 
1812
        state, entry = self.get_state_with_a()
 
1813
        self.build_tree(['a/'])
 
1814
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1815
 
 
1816
    def test_update_entry_dir_unchanged(self):
 
1817
        state, entry = self.get_state_with_a()
 
1818
        self.build_tree(['a/'])
 
1819
        state.adjust_time(+20)
 
1820
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1821
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
1822
                         state._dirblock_state)
 
1823
        state.save()
 
1824
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1825
                         state._dirblock_state)
 
1826
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1827
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1828
                         state._dirblock_state)
 
1829
 
 
1830
    def test_update_entry_file_unchanged(self):
 
1831
        state, entry = self.get_state_with_a()
 
1832
        self.build_tree(['a'])
 
1833
        sha1sum = 'b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6'
 
1834
        state.adjust_time(+20)
 
1835
        self.assertEqual(sha1sum, self.do_update_entry(state, entry, 'a'))
 
1836
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
1837
                         state._dirblock_state)
 
1838
        state.save()
 
1839
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1840
                         state._dirblock_state)
 
1841
        self.assertEqual(sha1sum, self.do_update_entry(state, entry, 'a'))
 
1842
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1843
                         state._dirblock_state)
 
1844
 
 
1845
    def create_and_test_file(self, state, entry):
 
1846
        """Create a file at 'a' and verify the state finds it.
 
1847
 
 
1848
        The state should already be versioning *something* at 'a'. This makes
 
1849
        sure that state.update_entry recognizes it as a file.
 
1850
        """
 
1851
        self.build_tree(['a'])
 
1852
        stat_value = os.lstat('a')
 
1853
        packed_stat = dirstate.pack_stat(stat_value)
 
1854
 
 
1855
        link_or_sha1 = self.do_update_entry(state, entry, abspath='a')
 
1856
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
1857
                         link_or_sha1)
 
1858
        self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
 
1859
                         entry[1])
 
1860
        return packed_stat
 
1861
 
 
1862
    def create_and_test_dir(self, state, entry):
 
1863
        """Create a directory at 'a' and verify the state finds it.
 
1864
 
 
1865
        The state should already be versioning *something* at 'a'. This makes
 
1866
        sure that state.update_entry recognizes it as a directory.
 
1867
        """
 
1868
        self.build_tree(['a/'])
 
1869
        stat_value = os.lstat('a')
 
1870
        packed_stat = dirstate.pack_stat(stat_value)
 
1871
 
 
1872
        link_or_sha1 = self.do_update_entry(state, entry, abspath='a')
 
1873
        self.assertIs(None, link_or_sha1)
 
1874
        self.assertEqual([('d', '', 0, False, packed_stat)], entry[1])
 
1875
 
 
1876
        return packed_stat
 
1877
 
 
1878
    def create_and_test_symlink(self, state, entry):
 
1879
        """Create a symlink at 'a' and verify the state finds it.
 
1880
 
 
1881
        The state should already be versioning *something* at 'a'. This makes
 
1882
        sure that state.update_entry recognizes it as a symlink.
 
1883
 
 
1884
        This should not be called if this platform does not have symlink
 
1885
        support.
 
1886
        """
 
1887
        # caller should care about skipping test on platforms without symlinks
 
1888
        os.symlink('path/to/foo', 'a')
 
1889
 
 
1890
        stat_value = os.lstat('a')
 
1891
        packed_stat = dirstate.pack_stat(stat_value)
 
1892
 
 
1893
        link_or_sha1 = self.do_update_entry(state, entry, abspath='a')
 
1894
        self.assertEqual('path/to/foo', link_or_sha1)
 
1895
        self.assertEqual([('l', 'path/to/foo', 11, False, packed_stat)],
 
1896
                         entry[1])
 
1897
        return packed_stat
 
1898
 
 
1899
    def test_update_file_to_dir(self):
 
1900
        """If a file changes to a directory we return None for the sha.
 
1901
        We also update the inventory record.
 
1902
        """
 
1903
        state, entry = self.get_state_with_a()
 
1904
        # The file sha1 won't be cached unless the file is old
 
1905
        state.adjust_time(+10)
 
1906
        self.create_and_test_file(state, entry)
 
1907
        os.remove('a')
 
1908
        self.create_and_test_dir(state, entry)
 
1909
 
 
1910
    def test_update_file_to_symlink(self):
 
1911
        """File becomes a symlink"""
 
1912
        self.requireFeature(SymlinkFeature)
 
1913
        state, entry = self.get_state_with_a()
 
1914
        # The file sha1 won't be cached unless the file is old
 
1915
        state.adjust_time(+10)
 
1916
        self.create_and_test_file(state, entry)
 
1917
        os.remove('a')
 
1918
        self.create_and_test_symlink(state, entry)
 
1919
 
 
1920
    def test_update_dir_to_file(self):
 
1921
        """Directory becoming a file updates the entry."""
 
1922
        state, entry = self.get_state_with_a()
 
1923
        # The file sha1 won't be cached unless the file is old
 
1924
        state.adjust_time(+10)
 
1925
        self.create_and_test_dir(state, entry)
 
1926
        os.rmdir('a')
 
1927
        self.create_and_test_file(state, entry)
 
1928
 
 
1929
    def test_update_dir_to_symlink(self):
 
1930
        """Directory becomes a symlink"""
 
1931
        self.requireFeature(SymlinkFeature)
 
1932
        state, entry = self.get_state_with_a()
 
1933
        # The symlink target won't be cached if it isn't old
 
1934
        state.adjust_time(+10)
 
1935
        self.create_and_test_dir(state, entry)
 
1936
        os.rmdir('a')
 
1937
        self.create_and_test_symlink(state, entry)
 
1938
 
 
1939
    def test_update_symlink_to_file(self):
 
1940
        """Symlink becomes a file"""
 
1941
        self.requireFeature(SymlinkFeature)
 
1942
        state, entry = self.get_state_with_a()
 
1943
        # The symlink and file info won't be cached unless old
 
1944
        state.adjust_time(+10)
 
1945
        self.create_and_test_symlink(state, entry)
 
1946
        os.remove('a')
 
1947
        self.create_and_test_file(state, entry)
 
1948
 
 
1949
    def test_update_symlink_to_dir(self):
 
1950
        """Symlink becomes a directory"""
 
1951
        self.requireFeature(SymlinkFeature)
 
1952
        state, entry = self.get_state_with_a()
 
1953
        # The symlink target won't be cached if it isn't old
 
1954
        state.adjust_time(+10)
 
1955
        self.create_and_test_symlink(state, entry)
 
1956
        os.remove('a')
 
1957
        self.create_and_test_dir(state, entry)
 
1958
 
 
1959
    def test__is_executable_win32(self):
 
1960
        state, entry = self.get_state_with_a()
 
1961
        self.build_tree(['a'])
 
1962
 
 
1963
        # Make sure we are using the win32 implementation of _is_executable
 
1964
        state._is_executable = state._is_executable_win32
 
1965
 
 
1966
        # The file on disk is not executable, but we are marking it as though
 
1967
        # it is. With _is_executable_win32 we ignore what is on disk.
 
1968
        entry[1][0] = ('f', '', 0, True, dirstate.DirState.NULLSTAT)
 
1969
 
 
1970
        stat_value = os.lstat('a')
 
1971
        packed_stat = dirstate.pack_stat(stat_value)
 
1972
 
 
1973
        state.adjust_time(-10) # Make sure everything is new
 
1974
        state.update_entry(entry, abspath='a', stat_value=stat_value)
 
1975
 
 
1976
        # The row is updated, but the executable bit stays set.
 
1977
        self.assertEqual([('f', '', 14, True, dirstate.DirState.NULLSTAT)],
 
1978
                         entry[1])
 
1979
 
 
1980
        # Make the disk object look old enough to cache
 
1981
        state.adjust_time(+20)
 
1982
        digest = 'b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6'
 
1983
        state.update_entry(entry, abspath='a', stat_value=stat_value)
 
1984
        self.assertEqual([('f', digest, 14, True, packed_stat)], entry[1])
 
1985
 
 
1986
 
 
1987
class TestPackStat(TestCaseWithTransport):
1745
1988
 
1746
1989
    def assertPackStat(self, expected, stat_value):
1747
1990
        """Check the packed and serialized form of a stat value."""
2274
2517
        self.assertEqual(exp_dirblocks, state._dirblocks)
2275
2518
 
2276
2519
 
2277
 
class Test_InvEntryToDetails(tests.TestCase):
 
2520
class Test_InvEntryToDetails(TestCaseWithDirState):
2278
2521
 
2279
2522
    def assertDetails(self, expected, inv_entry):
2280
2523
        details = dirstate.DirState._inv_entry_to_details(inv_entry)
2287
2530
        self.assertIsInstance(tree_data, str)
2288
2531
 
2289
2532
    def test_unicode_symlink(self):
2290
 
        inv_entry = inventory.InventoryLink('link-file-id',
2291
 
                                            u'nam\N{Euro Sign}e',
 
2533
        # In general, the code base doesn't support a target that contains
 
2534
        # non-ascii characters. So we just assert tha 
 
2535
        inv_entry = inventory.InventoryLink('link-file-id', 'name',
2292
2536
                                            'link-parent-id')
2293
2537
        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)
 
2538
        inv_entry.symlink_target = u'link-target'
 
2539
        details = self.assertDetails(('l', 'link-target', 0, False,
 
2540
                                      'link-revision-id'), inv_entry)