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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-09-26 05:14:51 UTC
  • mfrom: (3737.1.3 trivial_python_compat)
  • Revision ID: pqm@pqm.ubuntu.com-20080926051451-dvc1qg5inn7msjvr
(jam) Some win32 tweaks for the faster iter_changes code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007, 2008 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 for the compiled dirstate helpers."""
18
18
 
19
19
import bisect
20
20
import os
21
 
import time
22
21
 
23
22
from bzrlib import (
24
23
    dirstate,
25
24
    errors,
26
 
    osutils,
27
25
    tests,
28
26
    )
29
27
from bzrlib.tests import (
30
 
    test_dirstate,
31
 
    test_osutils,
32
 
    )
33
 
 
34
 
try:
35
 
    from bzrlib import _dirstate_helpers_pyx
36
 
    has_dirstate_helpers_pyx = True
37
 
except ImportError:
38
 
    has_dirstate_helpers_pyx = False
39
 
 
40
 
 
41
 
compiled_dirstate_helpers_feature = tests.ModuleAvailableFeature(
42
 
                                'bzrlib._dirstate_helpers_pyx')
43
 
 
44
 
 
45
 
def load_tests(basic_tests, module, loader):
46
 
    # FIXME: we should also parametrize against SHA1Provider !
47
 
    suite = loader.suiteClass()
48
 
    remaining_tests = basic_tests
49
 
 
50
 
    dir_reader_scenarios = test_osutils.dir_reader_scenarios()
51
 
 
52
 
    ue_scenarios = [('dirstate_Python',
53
 
                     {'update_entry': dirstate.py_update_entry})]
54
 
    if compiled_dirstate_helpers_feature.available():
55
 
        update_entry = compiled_dirstate_helpers_feature.module.update_entry
56
 
        pyrex_scenario = ('dirstate_Pyrex', {'update_entry': update_entry})
57
 
        ue_scenarios.append(pyrex_scenario)
58
 
    process_entry_tests, remaining_tests = tests.split_suite_by_condition(
59
 
        remaining_tests, tests.condition_isinstance(TestUpdateEntry))
60
 
    tests.multiply_tests(process_entry_tests,
61
 
                         tests.multiply_scenarios(dir_reader_scenarios,
62
 
                                                  ue_scenarios),
63
 
                         suite)
64
 
 
65
 
    pe_scenarios = [('dirstate_Python',
66
 
                     {'_process_entry': dirstate.ProcessEntryPython})]
67
 
    if compiled_dirstate_helpers_feature.available():
68
 
        process_entry = compiled_dirstate_helpers_feature.module.ProcessEntryC
69
 
        pyrex_scenario = ('dirstate_Pyrex', {'_process_entry': process_entry})
70
 
        pe_scenarios.append(pyrex_scenario)
71
 
    process_entry_tests, remaining_tests = tests.split_suite_by_condition(
72
 
        remaining_tests, tests.condition_isinstance(TestProcessEntry))
73
 
    tests.multiply_tests(process_entry_tests,
74
 
                         tests.multiply_scenarios(dir_reader_scenarios,
75
 
                                                  pe_scenarios),
76
 
                         suite)
77
 
 
78
 
    dir_reader_tests, remaining_tests = tests.split_suite_by_condition(
79
 
        remaining_tests, tests.condition_isinstance(
80
 
            test_dirstate.TestCaseWithDirState))
81
 
    tests.multiply_tests(dir_reader_tests, dir_reader_scenarios, suite)
82
 
    suite.addTest(remaining_tests)
83
 
 
84
 
    return suite
 
28
        SymlinkFeature,
 
29
        )
 
30
from bzrlib.tests import test_dirstate
 
31
 
 
32
 
 
33
class _CompiledDirstateHelpersFeature(tests.Feature):
 
34
    def _probe(self):
 
35
        try:
 
36
            import bzrlib._dirstate_helpers_c
 
37
        except ImportError:
 
38
            return False
 
39
        return True
 
40
 
 
41
    def feature_name(self):
 
42
        return 'bzrlib._dirstate_helpers_c'
 
43
 
 
44
CompiledDirstateHelpersFeature = _CompiledDirstateHelpersFeature()
85
45
 
86
46
 
87
47
class TestBisectPathMixin(object):
240
200
 
241
201
 
242
202
class TestBisectPathLeft(tests.TestCase, TestBisectPathMixin):
243
 
    """Run all Bisect Path tests against _bisect_path_left."""
 
203
    """Run all Bisect Path tests against _bisect_path_left_py."""
244
204
 
245
205
    def get_bisect_path(self):
246
 
        from bzrlib._dirstate_helpers_py import _bisect_path_left
247
 
        return _bisect_path_left
 
206
        from bzrlib._dirstate_helpers_py import _bisect_path_left_py
 
207
        return _bisect_path_left_py
248
208
 
249
209
    def get_bisect(self):
250
210
        return bisect.bisect_left, 0
251
211
 
252
212
 
253
213
class TestCompiledBisectPathLeft(TestBisectPathLeft):
254
 
    """Run all Bisect Path tests against _bisect_path_lect"""
 
214
    """Run all Bisect Path tests against _bisect_path_right_c"""
255
215
 
256
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
216
    _test_needs_features = [CompiledDirstateHelpersFeature]
257
217
 
258
218
    def get_bisect_path(self):
259
 
        from bzrlib._dirstate_helpers_pyx import _bisect_path_left
260
 
        return _bisect_path_left
 
219
        from bzrlib._dirstate_helpers_c import _bisect_path_left_c
 
220
        return _bisect_path_left_c
261
221
 
262
222
 
263
223
class TestBisectPathRight(tests.TestCase, TestBisectPathMixin):
264
 
    """Run all Bisect Path tests against _bisect_path_right"""
 
224
    """Run all Bisect Path tests against _bisect_path_right_py"""
265
225
 
266
226
    def get_bisect_path(self):
267
 
        from bzrlib._dirstate_helpers_py import _bisect_path_right
268
 
        return _bisect_path_right
 
227
        from bzrlib._dirstate_helpers_py import _bisect_path_right_py
 
228
        return _bisect_path_right_py
269
229
 
270
230
    def get_bisect(self):
271
231
        return bisect.bisect_right, -1
272
232
 
273
233
 
274
234
class TestCompiledBisectPathRight(TestBisectPathRight):
275
 
    """Run all Bisect Path tests against _bisect_path_right"""
 
235
    """Run all Bisect Path tests against _bisect_path_right_c"""
276
236
 
277
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
237
    _test_needs_features = [CompiledDirstateHelpersFeature]
278
238
 
279
239
    def get_bisect_path(self):
280
 
        from bzrlib._dirstate_helpers_pyx import _bisect_path_right
281
 
        return _bisect_path_right
 
240
        from bzrlib._dirstate_helpers_c import _bisect_path_right_c
 
241
        return _bisect_path_right_c
282
242
 
283
243
 
284
244
class TestBisectDirblock(tests.TestCase):
295
255
 
296
256
    def get_bisect_dirblock(self):
297
257
        """Return an implementation of bisect_dirblock"""
298
 
        from bzrlib._dirstate_helpers_py import bisect_dirblock
299
 
        return bisect_dirblock
 
258
        from bzrlib._dirstate_helpers_py import bisect_dirblock_py
 
259
        return bisect_dirblock_py
300
260
 
301
261
    def assertBisect(self, dirblocks, split_dirblocks, path, *args, **kwargs):
302
262
        """Assert that bisect_split works like bisect_left on the split paths.
386
346
    compiled version.
387
347
    """
388
348
 
389
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
349
    _test_needs_features = [CompiledDirstateHelpersFeature]
390
350
 
391
351
    def get_bisect_dirblock(self):
392
 
        from bzrlib._dirstate_helpers_pyx import bisect_dirblock
393
 
        return bisect_dirblock
 
352
        from bzrlib._dirstate_helpers_c import bisect_dirblock_c
 
353
        return bisect_dirblock_c
394
354
 
395
355
 
396
356
class TestCmpByDirs(tests.TestCase):
405
365
 
406
366
    def get_cmp_by_dirs(self):
407
367
        """Get a specific implementation of cmp_by_dirs."""
408
 
        from bzrlib._dirstate_helpers_py import cmp_by_dirs
409
 
        return cmp_by_dirs
 
368
        from bzrlib._dirstate_helpers_py import cmp_by_dirs_py
 
369
        return cmp_by_dirs_py
410
370
 
411
371
    def assertCmpByDirs(self, expected, str1, str2):
412
372
        """Compare the two strings, in both directions.
508
468
class TestCompiledCmpByDirs(TestCmpByDirs):
509
469
    """Test the pyrex implementation of cmp_by_dirs"""
510
470
 
511
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
471
    _test_needs_features = [CompiledDirstateHelpersFeature]
512
472
 
513
473
    def get_cmp_by_dirs(self):
514
 
        from bzrlib._dirstate_helpers_pyx import cmp_by_dirs
515
 
        return cmp_by_dirs
 
474
        from bzrlib._dirstate_helpers_c import cmp_by_dirs_c
 
475
        return cmp_by_dirs_c
516
476
 
517
477
 
518
478
class TestCmpPathByDirblock(tests.TestCase):
527
487
 
528
488
    def get_cmp_path_by_dirblock(self):
529
489
        """Get a specific implementation of _cmp_path_by_dirblock."""
530
 
        from bzrlib._dirstate_helpers_py import _cmp_path_by_dirblock
531
 
        return _cmp_path_by_dirblock
 
490
        from bzrlib._dirstate_helpers_py import _cmp_path_by_dirblock_py
 
491
        return _cmp_path_by_dirblock_py
532
492
 
533
493
    def assertCmpPathByDirblock(self, paths):
534
494
        """Compare all paths and make sure they evaluate to the correct order.
659
619
class TestCompiledCmpPathByDirblock(TestCmpPathByDirblock):
660
620
    """Test the pyrex implementation of _cmp_path_by_dirblock"""
661
621
 
662
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
622
    _test_needs_features = [CompiledDirstateHelpersFeature]
663
623
 
664
624
    def get_cmp_by_dirs(self):
665
 
        from bzrlib._dirstate_helpers_pyx import _cmp_path_by_dirblock
666
 
        return _cmp_path_by_dirblock
 
625
        from bzrlib._dirstate_helpers_c import _cmp_path_by_dirblock_c
 
626
        return _cmp_path_by_dirblock_c
667
627
 
668
628
 
669
629
class TestMemRChr(tests.TestCase):
670
630
    """Test memrchr functionality"""
671
631
 
672
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
632
    _test_needs_features = [CompiledDirstateHelpersFeature]
673
633
 
674
634
    def assertMemRChr(self, expected, s, c):
675
 
        from bzrlib._dirstate_helpers_pyx import _py_memrchr
 
635
        from bzrlib._dirstate_helpers_c import _py_memrchr
676
636
        self.assertEqual(expected, _py_memrchr(s, c))
677
637
 
678
638
    def test_missing(self):
720
680
    """
721
681
 
722
682
    def get_read_dirblocks(self):
723
 
        from bzrlib._dirstate_helpers_py import _read_dirblocks
724
 
        return _read_dirblocks
 
683
        from bzrlib._dirstate_helpers_py import _read_dirblocks_py
 
684
        return _read_dirblocks_py
725
685
 
726
686
    def test_smoketest(self):
727
687
        """Make sure that we can create and read back a simple file."""
737
697
 
738
698
    def test_trailing_garbage(self):
739
699
        tree, state, expected = self.create_basic_dirstate()
740
 
        # On Linux, we can write extra data as long as we haven't read yet, but
741
 
        # on Win32, if you've opened the file with FILE_SHARE_READ, trying to
742
 
        # open it in append mode will fail.
743
 
        state.unlock()
 
700
        # We can modify the file as long as it hasn't been read yet.
744
701
        f = open('dirstate', 'ab')
745
702
        try:
746
703
            # Add bogus trailing garbage
747
704
            f.write('bogus\n')
748
705
        finally:
749
706
            f.close()
750
 
            state.lock_read()
751
707
        e = self.assertRaises(errors.DirstateCorrupt,
752
708
                              state._read_dirblocks_if_needed)
753
709
        # Make sure we mention the bogus characters in the error
757
713
class TestCompiledReadDirblocks(TestReadDirblocks):
758
714
    """Test the pyrex implementation of _read_dirblocks"""
759
715
 
760
 
    _test_needs_features = [compiled_dirstate_helpers_feature]
 
716
    _test_needs_features = [CompiledDirstateHelpersFeature]
761
717
 
762
718
    def get_read_dirblocks(self):
763
 
        from bzrlib._dirstate_helpers_pyx import _read_dirblocks
764
 
        return _read_dirblocks
 
719
        from bzrlib._dirstate_helpers_c import _read_dirblocks_c
 
720
        return _read_dirblocks_c
765
721
 
766
722
 
767
723
class TestUsingCompiledIfAvailable(tests.TestCase):
768
724
    """Check that any compiled functions that are available are the default.
769
725
 
770
726
    It is possible to have typos, etc in the import line, such that
771
 
    _dirstate_helpers_pyx is actually available, but the compiled functions are
 
727
    _dirstate_helpers_c is actually available, but the compiled functions are
772
728
    not being used.
773
729
    """
774
730
 
775
731
    def test_bisect_dirblock(self):
776
 
        if compiled_dirstate_helpers_feature.available():
777
 
            from bzrlib._dirstate_helpers_pyx import bisect_dirblock
 
732
        if CompiledDirstateHelpersFeature.available():
 
733
            from bzrlib._dirstate_helpers_c import bisect_dirblock_c
 
734
            self.assertIs(bisect_dirblock_c, dirstate.bisect_dirblock)
778
735
        else:
779
 
            from bzrlib._dirstate_helpers_py import bisect_dirblock
780
 
        self.assertIs(bisect_dirblock, dirstate.bisect_dirblock)
 
736
            from bzrlib._dirstate_helpers_py import bisect_dirblock_py
 
737
            self.assertIs(bisect_dirblock_py, dirstate.bisect_dirblock)
781
738
 
782
739
    def test__bisect_path_left(self):
783
 
        if compiled_dirstate_helpers_feature.available():
784
 
            from bzrlib._dirstate_helpers_pyx import _bisect_path_left
 
740
        if CompiledDirstateHelpersFeature.available():
 
741
            from bzrlib._dirstate_helpers_c import _bisect_path_left_c
 
742
            self.assertIs(_bisect_path_left_c, dirstate._bisect_path_left)
785
743
        else:
786
 
            from bzrlib._dirstate_helpers_py import _bisect_path_left
787
 
        self.assertIs(_bisect_path_left, dirstate._bisect_path_left)
 
744
            from bzrlib._dirstate_helpers_py import _bisect_path_left_py
 
745
            self.assertIs(_bisect_path_left_py, dirstate._bisect_path_left)
788
746
 
789
747
    def test__bisect_path_right(self):
790
 
        if compiled_dirstate_helpers_feature.available():
791
 
            from bzrlib._dirstate_helpers_pyx import _bisect_path_right
 
748
        if CompiledDirstateHelpersFeature.available():
 
749
            from bzrlib._dirstate_helpers_c import _bisect_path_right_c
 
750
            self.assertIs(_bisect_path_right_c, dirstate._bisect_path_right)
792
751
        else:
793
 
            from bzrlib._dirstate_helpers_py import _bisect_path_right
794
 
        self.assertIs(_bisect_path_right, dirstate._bisect_path_right)
 
752
            from bzrlib._dirstate_helpers_py import _bisect_path_right_py
 
753
            self.assertIs(_bisect_path_right_py, dirstate._bisect_path_right)
795
754
 
796
755
    def test_cmp_by_dirs(self):
797
 
        if compiled_dirstate_helpers_feature.available():
798
 
            from bzrlib._dirstate_helpers_pyx import cmp_by_dirs
 
756
        if CompiledDirstateHelpersFeature.available():
 
757
            from bzrlib._dirstate_helpers_c import cmp_by_dirs_c
 
758
            self.assertIs(cmp_by_dirs_c, dirstate.cmp_by_dirs)
799
759
        else:
800
 
            from bzrlib._dirstate_helpers_py import cmp_by_dirs
801
 
        self.assertIs(cmp_by_dirs, dirstate.cmp_by_dirs)
 
760
            from bzrlib._dirstate_helpers_py import cmp_by_dirs_py
 
761
            self.assertIs(cmp_by_dirs_py, dirstate.cmp_by_dirs)
802
762
 
803
763
    def test__read_dirblocks(self):
804
 
        if compiled_dirstate_helpers_feature.available():
805
 
            from bzrlib._dirstate_helpers_pyx import _read_dirblocks
 
764
        if CompiledDirstateHelpersFeature.available():
 
765
            from bzrlib._dirstate_helpers_c import _read_dirblocks_c
 
766
            self.assertIs(_read_dirblocks_c, dirstate._read_dirblocks)
806
767
        else:
807
 
            from bzrlib._dirstate_helpers_py import _read_dirblocks
808
 
        self.assertIs(_read_dirblocks, dirstate._read_dirblocks)
 
768
            from bzrlib._dirstate_helpers_py import _read_dirblocks_py
 
769
            self.assertIs(_read_dirblocks_py, dirstate._read_dirblocks)
809
770
 
810
771
    def test_update_entry(self):
811
 
        if compiled_dirstate_helpers_feature.available():
812
 
            from bzrlib._dirstate_helpers_pyx import update_entry
 
772
        if CompiledDirstateHelpersFeature.available():
 
773
            from bzrlib._dirstate_helpers_c import update_entry
 
774
            self.assertIs(update_entry, dirstate.update_entry)
813
775
        else:
814
 
            from bzrlib.dirstate import update_entry
815
 
        self.assertIs(update_entry, dirstate.update_entry)
 
776
            from bzrlib.dirstate import py_update_entry
 
777
            self.assertIs(py_update_entry, dirstate.py_update_entry)
816
778
 
817
779
    def test_process_entry(self):
818
 
        if compiled_dirstate_helpers_feature.available():
819
 
            from bzrlib._dirstate_helpers_pyx import ProcessEntryC
 
780
        if CompiledDirstateHelpersFeature.available():
 
781
            from bzrlib._dirstate_helpers_c import ProcessEntryC
820
782
            self.assertIs(ProcessEntryC, dirstate._process_entry)
821
783
        else:
822
784
            from bzrlib.dirstate import ProcessEntryPython
826
788
class TestUpdateEntry(test_dirstate.TestCaseWithDirState):
827
789
    """Test the DirState.update_entry functions"""
828
790
 
829
 
    # Set by load_tests
830
 
    update_entry = None
831
 
 
832
 
    def setUp(self):
833
 
        super(TestUpdateEntry, self).setUp()
834
 
        self.overrideAttr(dirstate, 'update_entry', self.update_entry)
835
 
 
836
791
    def get_state_with_a(self):
837
792
        """Create a DirState tracking a single object named 'a'"""
838
793
        state = test_dirstate.InstrumentedDirState.initialize('dirstate')
839
794
        self.addCleanup(state.unlock)
840
795
        state.add('a', 'a-id', 'file', None, '')
841
796
        entry = state._get_entry(0, path_utf8='a')
 
797
        self.set_update_entry()
842
798
        return state, entry
843
799
 
844
 
    def test_observed_sha1_cachable(self):
845
 
        state, entry = self.get_state_with_a()
846
 
        atime = time.time() - 10
847
 
        self.build_tree(['a'])
848
 
        statvalue = os.lstat('a')
849
 
        statvalue = test_dirstate._FakeStat(statvalue.st_size, atime, atime,
850
 
            statvalue.st_dev, statvalue.st_ino, statvalue.st_mode)
851
 
        state._observed_sha1(entry, "foo", statvalue)
852
 
        self.assertEqual('foo', entry[1][0][1])
853
 
        packed_stat = dirstate.pack_stat(statvalue)
854
 
        self.assertEqual(packed_stat, entry[1][0][4])
855
 
 
856
 
    def test_observed_sha1_not_cachable(self):
857
 
        state, entry = self.get_state_with_a()
858
 
        oldval = entry[1][0][1]
859
 
        oldstat = entry[1][0][4]
860
 
        self.build_tree(['a'])
861
 
        statvalue = os.lstat('a')
862
 
        state._observed_sha1(entry, "foo", statvalue)
863
 
        self.assertEqual(oldval, entry[1][0][1])
864
 
        self.assertEqual(oldstat, entry[1][0][4])
 
800
    def set_update_entry(self):
 
801
        self.update_entry = dirstate.py_update_entry
865
802
 
866
803
    def test_update_entry(self):
867
 
        state, _ = self.get_state_with_a()
868
 
        tree = self.make_branch_and_tree('tree')
869
 
        tree.lock_write()
870
 
        empty_revid = tree.commit('empty')
871
 
        self.build_tree(['tree/a'])
872
 
        tree.add(['a'], ['a-id'])
873
 
        with_a_id = tree.commit('with_a')
874
 
        self.addCleanup(tree.unlock)
875
 
        state.set_parent_trees(
876
 
            [(empty_revid, tree.branch.repository.revision_tree(empty_revid))],
877
 
            [])
878
 
        entry = state._get_entry(0, path_utf8='a')
 
804
        state, entry = self.get_state_with_a()
879
805
        self.build_tree(['a'])
880
806
        # Add one where we don't provide the stat or sha already
881
807
        self.assertEqual(('', 'a', 'a-id'), entry[0])
882
 
        self.assertEqual(('f', '', 0, False, dirstate.DirState.NULLSTAT),
883
 
                         entry[1][0])
 
808
        self.assertEqual([('f', '', 0, False, dirstate.DirState.NULLSTAT)],
 
809
                         entry[1])
884
810
        # Flush the buffers to disk
885
811
        state.save()
886
812
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
890
816
        packed_stat = dirstate.pack_stat(stat_value)
891
817
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
892
818
                                          stat_value=stat_value)
893
 
        self.assertEqual(None, link_or_sha1)
 
819
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
820
                         link_or_sha1)
894
821
 
895
 
        # The dirblock entry should not have cached the file's sha1 (too new)
896
 
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
897
 
                         entry[1][0])
 
822
        # The dirblock entry should not cache the file's sha1
 
823
        self.assertEqual([('f', '', 14, False, dirstate.DirState.NULLSTAT)],
 
824
                         entry[1])
898
825
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
899
826
                         state._dirblock_state)
900
827
        mode = stat_value.st_mode
901
 
        self.assertEqual([('is_exec', mode, False)], state._log)
 
828
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False)], state._log)
902
829
 
903
830
        state.save()
904
831
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
908
835
        # so we will re-read the file. Roll the clock back so the file is
909
836
        # guaranteed to look too new.
910
837
        state.adjust_time(-10)
911
 
        del state._log[:]
912
838
 
913
839
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
914
840
                                          stat_value=stat_value)
915
 
        self.assertEqual([('is_exec', mode, False)], state._log)
916
 
        self.assertEqual(None, link_or_sha1)
 
841
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
 
842
                          ('sha1', 'a'), ('is_exec', mode, False),
 
843
                         ], state._log)
 
844
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
845
                         link_or_sha1)
917
846
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
918
847
                         state._dirblock_state)
919
 
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
920
 
                         entry[1][0])
 
848
        self.assertEqual([('f', '', 14, False, dirstate.DirState.NULLSTAT)],
 
849
                         entry[1])
921
850
        state.save()
922
851
 
923
 
        # If it is cachable (the clock has moved forward) but new it still
924
 
        # won't calculate the sha or cache it.
 
852
        # However, if we move the clock forward so the file is considered
 
853
        # "stable", it should just cache the value.
925
854
        state.adjust_time(+20)
926
 
        del state._log[:]
927
 
        link_or_sha1 = dirstate.update_entry(state, entry, abspath='a',
928
 
                                          stat_value=stat_value)
929
 
        self.assertEqual(None, link_or_sha1)
930
 
        self.assertEqual([('is_exec', mode, False)], state._log)
931
 
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
932
 
                         entry[1][0])
933
 
 
934
 
        # If the file is no longer new, and the clock has been moved forward
935
 
        # sufficiently, it will cache the sha.
936
 
        del state._log[:]
937
 
        state.set_parent_trees(
938
 
            [(with_a_id, tree.branch.repository.revision_tree(with_a_id))],
939
 
            [])
940
 
        entry = state._get_entry(0, path_utf8='a')
941
 
 
942
855
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
943
856
                                          stat_value=stat_value)
944
857
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
945
858
                         link_or_sha1)
946
 
        self.assertEqual([('is_exec', mode, False), ('sha1', 'a')],
947
 
                          state._log)
948
 
        self.assertEqual(('f', link_or_sha1, 14, False, packed_stat),
949
 
                         entry[1][0])
 
859
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
 
860
                          ('sha1', 'a'), ('is_exec', mode, False),
 
861
                          ('sha1', 'a'), ('is_exec', mode, False),
 
862
                         ], state._log)
 
863
        self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
 
864
                         entry[1])
950
865
 
951
866
        # Subsequent calls will just return the cached value
952
 
        del state._log[:]
953
867
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
954
868
                                          stat_value=stat_value)
955
869
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
956
870
                         link_or_sha1)
957
 
        self.assertEqual([], state._log)
958
 
        self.assertEqual(('f', link_or_sha1, 14, False, packed_stat),
959
 
                         entry[1][0])
 
871
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
 
872
                          ('sha1', 'a'), ('is_exec', mode, False),
 
873
                          ('sha1', 'a'), ('is_exec', mode, False),
 
874
                         ], state._log)
 
875
        self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
 
876
                         entry[1])
960
877
 
961
878
    def test_update_entry_symlink(self):
962
879
        """Update entry should read symlinks."""
963
 
        self.requireFeature(tests.SymlinkFeature)
 
880
        self.requireFeature(SymlinkFeature)
964
881
        state, entry = self.get_state_with_a()
965
882
        state.save()
966
883
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1036
953
                         state._dirblock_state)
1037
954
 
1038
955
    def test_update_entry_file_unchanged(self):
1039
 
        state, _ = self.get_state_with_a()
1040
 
        tree = self.make_branch_and_tree('tree')
1041
 
        tree.lock_write()
1042
 
        self.build_tree(['tree/a'])
1043
 
        tree.add(['a'], ['a-id'])
1044
 
        with_a_id = tree.commit('witha')
1045
 
        self.addCleanup(tree.unlock)
1046
 
        state.set_parent_trees(
1047
 
            [(with_a_id, tree.branch.repository.revision_tree(with_a_id))],
1048
 
            [])
1049
 
        entry = state._get_entry(0, path_utf8='a')
 
956
        state, entry = self.get_state_with_a()
1050
957
        self.build_tree(['a'])
1051
958
        sha1sum = 'b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6'
1052
959
        state.adjust_time(+20)
1060
967
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1061
968
                         state._dirblock_state)
1062
969
 
1063
 
    def test_update_entry_tree_reference(self):
1064
 
        state = test_dirstate.InstrumentedDirState.initialize('dirstate')
1065
 
        self.addCleanup(state.unlock)
1066
 
        state.add('r', 'r-id', 'tree-reference', None, '')
1067
 
        self.build_tree(['r/'])
1068
 
        entry = state._get_entry(0, path_utf8='r')
1069
 
        self.do_update_entry(state, entry, 'r')
1070
 
        entry = state._get_entry(0, path_utf8='r')
1071
 
        self.assertEqual('t', entry[1][0][0])
1072
 
 
1073
970
    def create_and_test_file(self, state, entry):
1074
 
        """Create a file at 'a' and verify the state finds it during update.
 
971
        """Create a file at 'a' and verify the state finds it.
1075
972
 
1076
973
        The state should already be versioning *something* at 'a'. This makes
1077
974
        sure that state.update_entry recognizes it as a file.
1081
978
        packed_stat = dirstate.pack_stat(stat_value)
1082
979
 
1083
980
        link_or_sha1 = self.do_update_entry(state, entry, abspath='a')
1084
 
        self.assertEqual(None, link_or_sha1)
1085
 
        self.assertEqual([('f', '', 14, False, dirstate.DirState.NULLSTAT)],
 
981
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
982
                         link_or_sha1)
 
983
        self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
1086
984
                         entry[1])
1087
985
        return packed_stat
1088
986
 
1102
1000
 
1103
1001
        return packed_stat
1104
1002
 
1105
 
    # FIXME: Add unicode version
1106
1003
    def create_and_test_symlink(self, state, entry):
1107
1004
        """Create a symlink at 'a' and verify the state finds it.
1108
1005
 
1137
1034
 
1138
1035
    def test_update_file_to_symlink(self):
1139
1036
        """File becomes a symlink"""
1140
 
        self.requireFeature(tests.SymlinkFeature)
 
1037
        self.requireFeature(SymlinkFeature)
1141
1038
        state, entry = self.get_state_with_a()
1142
1039
        # The file sha1 won't be cached unless the file is old
1143
1040
        state.adjust_time(+10)
1156
1053
 
1157
1054
    def test_update_dir_to_symlink(self):
1158
1055
        """Directory becomes a symlink"""
1159
 
        self.requireFeature(tests.SymlinkFeature)
 
1056
        self.requireFeature(SymlinkFeature)
1160
1057
        state, entry = self.get_state_with_a()
1161
1058
        # The symlink target won't be cached if it isn't old
1162
1059
        state.adjust_time(+10)
1166
1063
 
1167
1064
    def test_update_symlink_to_file(self):
1168
1065
        """Symlink becomes a file"""
1169
 
        self.requireFeature(tests.SymlinkFeature)
 
1066
        self.requireFeature(SymlinkFeature)
1170
1067
        state, entry = self.get_state_with_a()
1171
1068
        # The symlink and file info won't be cached unless old
1172
1069
        state.adjust_time(+10)
1176
1073
 
1177
1074
    def test_update_symlink_to_dir(self):
1178
1075
        """Symlink becomes a directory"""
1179
 
        self.requireFeature(tests.SymlinkFeature)
 
1076
        self.requireFeature(SymlinkFeature)
1180
1077
        state, entry = self.get_state_with_a()
1181
1078
        # The symlink target won't be cached if it isn't old
1182
1079
        state.adjust_time(+10)
1205
1102
        self.assertEqual([('f', '', 14, True, dirstate.DirState.NULLSTAT)],
1206
1103
                         entry[1])
1207
1104
 
1208
 
        # Make the disk object look old enough to cache (but it won't cache the
1209
 
        # sha as it is a new file).
 
1105
        # Make the disk object look old enough to cache
1210
1106
        state.adjust_time(+20)
1211
1107
        digest = 'b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6'
1212
1108
        self.update_entry(state, entry, abspath='a', stat_value=stat_value)
1213
 
        self.assertEqual([('f', '', 14, True, dirstate.DirState.NULLSTAT)],
1214
 
            entry[1])
1215
 
 
1216
 
    def _prepare_tree(self):
1217
 
        # Create a tree
1218
 
        text = 'Hello World\n'
1219
 
        tree = self.make_branch_and_tree('tree')
1220
 
        self.build_tree_contents([('tree/a file', text)])
1221
 
        tree.add('a file', 'a-file-id')
1222
 
        # Note: dirstate does not sha prior to the first commit
1223
 
        # so commit now in order for the test to work
1224
 
        tree.commit('first')
1225
 
        return tree, text
1226
 
 
1227
 
    def test_sha1provider_sha1_used(self):
1228
 
        tree, text = self._prepare_tree()
1229
 
        state = dirstate.DirState.from_tree(tree, 'dirstate',
1230
 
            UppercaseSHA1Provider())
1231
 
        self.addCleanup(state.unlock)
1232
 
        expected_sha = osutils.sha_string(text.upper() + "foo")
1233
 
        entry = state._get_entry(0, path_utf8='a file')
1234
 
        state._sha_cutoff_time()
1235
 
        state._cutoff_time += 10
1236
 
        sha1 = self.update_entry(state, entry, 'tree/a file',
1237
 
                                 os.lstat('tree/a file'))
1238
 
        self.assertEqual(expected_sha, sha1)
1239
 
 
1240
 
    def test_sha1provider_stat_and_sha1_used(self):
1241
 
        tree, text = self._prepare_tree()
1242
 
        tree.lock_write()
1243
 
        self.addCleanup(tree.unlock)
1244
 
        state = tree._current_dirstate()
1245
 
        state._sha1_provider = UppercaseSHA1Provider()
1246
 
        # If we used the standard provider, it would look like nothing has
1247
 
        # changed
1248
 
        file_ids_changed = [change[0] for change
1249
 
                            in tree.iter_changes(tree.basis_tree())]
1250
 
        self.assertEqual(['a-file-id'], file_ids_changed)
1251
 
 
1252
 
 
1253
 
class UppercaseSHA1Provider(dirstate.SHA1Provider):
1254
 
    """A custom SHA1Provider."""
1255
 
 
1256
 
    def sha1(self, abspath):
1257
 
        return self.stat_and_sha1(abspath)[1]
1258
 
 
1259
 
    def stat_and_sha1(self, abspath):
1260
 
        file_obj = file(abspath, 'rb')
1261
 
        try:
1262
 
            statvalue = os.fstat(file_obj.fileno())
1263
 
            text = ''.join(file_obj.readlines())
1264
 
            sha1 = osutils.sha_string(text.upper() + "foo")
1265
 
        finally:
1266
 
            file_obj.close()
1267
 
        return statvalue, sha1
1268
 
 
1269
 
 
1270
 
class TestProcessEntry(test_dirstate.TestCaseWithDirState):
1271
 
 
1272
 
    # Set by load_tests
1273
 
    _process_entry = None
1274
 
 
1275
 
    def setUp(self):
1276
 
        super(TestProcessEntry, self).setUp()
1277
 
        self.overrideAttr(dirstate, '_process_entry', self._process_entry)
1278
 
 
1279
 
    def assertChangedFileIds(self, expected, tree):
1280
 
        tree.lock_read()
1281
 
        try:
1282
 
            file_ids = [info[0] for info
1283
 
                        in tree.iter_changes(tree.basis_tree())]
1284
 
        finally:
1285
 
            tree.unlock()
1286
 
        self.assertEqual(sorted(expected), sorted(file_ids))
1287
 
 
1288
 
    def test_exceptions_raised(self):
1289
 
        # This is a direct test of bug #495023, it relies on osutils.is_inside
1290
 
        # getting called in an inner function. Which makes it a bit brittle,
1291
 
        # but at least it does reproduce the bug.
1292
 
        tree = self.make_branch_and_tree('tree')
1293
 
        self.build_tree(['tree/file', 'tree/dir/', 'tree/dir/sub',
1294
 
                         'tree/dir2/', 'tree/dir2/sub2'])
1295
 
        tree.add(['file', 'dir', 'dir/sub', 'dir2', 'dir2/sub2'])
1296
 
        tree.commit('first commit')
1297
 
        tree.lock_read()
1298
 
        self.addCleanup(tree.unlock)
1299
 
        basis_tree = tree.basis_tree()
1300
 
        def is_inside_raises(*args, **kwargs):
1301
 
            raise RuntimeError('stop this')
1302
 
        self.overrideAttr(osutils, 'is_inside', is_inside_raises)
1303
 
        self.assertListRaises(RuntimeError, tree.iter_changes, basis_tree)
1304
 
 
1305
 
    def test_simple_changes(self):
1306
 
        tree = self.make_branch_and_tree('tree')
1307
 
        self.build_tree(['tree/file'])
1308
 
        tree.add(['file'], ['file-id'])
1309
 
        self.assertChangedFileIds([tree.get_root_id(), 'file-id'], tree)
1310
 
        tree.commit('one')
1311
 
        self.assertChangedFileIds([], tree)
1312
 
 
1313
 
    def test_sha1provider_stat_and_sha1_used(self):
1314
 
        tree = self.make_branch_and_tree('tree')
1315
 
        self.build_tree(['tree/file'])
1316
 
        tree.add(['file'], ['file-id'])
1317
 
        tree.commit('one')
1318
 
        tree.lock_write()
1319
 
        self.addCleanup(tree.unlock)
1320
 
        state = tree._current_dirstate()
1321
 
        state._sha1_provider = UppercaseSHA1Provider()
1322
 
        self.assertChangedFileIds(['file-id'], tree)
1323
 
 
 
1109
        self.assertEqual([('f', digest, 14, True, packed_stat)], entry[1])
 
1110
 
 
1111
 
 
1112
class TestCompiledUpdateEntry(TestUpdateEntry):
 
1113
    """Test the pyrex implementation of _read_dirblocks"""
 
1114
 
 
1115
    _test_needs_features = [CompiledDirstateHelpersFeature]
 
1116
 
 
1117
    def set_update_entry(self):
 
1118
        from bzrlib._dirstate_helpers_c import update_entry
 
1119
        self.update_entry = update_entry