/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 breezy/tests/test__dirstate_helpers.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007-2011 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
20
20
import os
21
21
import time
22
22
 
23
 
from bzrlib import (
24
 
    dirstate,
 
23
from .. import (
25
24
    errors,
26
25
    osutils,
27
26
    tests,
28
27
    )
29
 
from bzrlib.tests import (
 
28
from ..bzr import (
 
29
    dirstate,
 
30
    _dirstate_helpers_py,
 
31
    )
 
32
from . import (
30
33
    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
 
34
    )
 
35
from .test_osutils import dir_reader_scenarios
 
36
from .scenarios import (
 
37
    load_tests_apply_scenarios,
 
38
    multiply_scenarios,
 
39
    )
 
40
from . import (
 
41
    features,
 
42
    )
 
43
 
 
44
 
 
45
load_tests = load_tests_apply_scenarios
 
46
 
 
47
 
 
48
compiled_dirstate_helpers_feature = features.ModuleAvailableFeature(
 
49
    'breezy.bzr._dirstate_helpers_pyx')
 
50
 
 
51
 
 
52
# FIXME: we should also parametrize against SHA1Provider !
 
53
 
 
54
ue_scenarios = [('dirstate_Python',
 
55
    {'update_entry': dirstate.py_update_entry})]
 
56
if compiled_dirstate_helpers_feature.available():
 
57
    update_entry = compiled_dirstate_helpers_feature.module.update_entry
 
58
    ue_scenarios.append(('dirstate_Pyrex', {'update_entry': update_entry}))
 
59
 
 
60
pe_scenarios = [('dirstate_Python',
 
61
    {'_process_entry': dirstate.ProcessEntryPython})]
 
62
if compiled_dirstate_helpers_feature.available():
 
63
    process_entry = compiled_dirstate_helpers_feature.module.ProcessEntryC
 
64
    pe_scenarios.append(('dirstate_Pyrex', {'_process_entry': process_entry}))
 
65
 
 
66
helper_scenarios = [('dirstate_Python', {'helpers': _dirstate_helpers_py})]
 
67
if compiled_dirstate_helpers_feature.available():
 
68
    helper_scenarios.append(('dirstate_Pyrex',
 
69
        {'helpers': compiled_dirstate_helpers_feature.module}))
85
70
 
86
71
 
87
72
class TestBisectPathMixin(object):
243
228
    """Run all Bisect Path tests against _bisect_path_left."""
244
229
 
245
230
    def get_bisect_path(self):
246
 
        from bzrlib._dirstate_helpers_py import _bisect_path_left
 
231
        from breezy.bzr._dirstate_helpers_py import _bisect_path_left
247
232
        return _bisect_path_left
248
233
 
249
234
    def get_bisect(self):
256
241
    _test_needs_features = [compiled_dirstate_helpers_feature]
257
242
 
258
243
    def get_bisect_path(self):
259
 
        from bzrlib._dirstate_helpers_pyx import _bisect_path_left
 
244
        from breezy.bzr._dirstate_helpers_pyx import _bisect_path_left
260
245
        return _bisect_path_left
261
246
 
262
247
 
264
249
    """Run all Bisect Path tests against _bisect_path_right"""
265
250
 
266
251
    def get_bisect_path(self):
267
 
        from bzrlib._dirstate_helpers_py import _bisect_path_right
 
252
        from breezy.bzr._dirstate_helpers_py import _bisect_path_right
268
253
        return _bisect_path_right
269
254
 
270
255
    def get_bisect(self):
277
262
    _test_needs_features = [compiled_dirstate_helpers_feature]
278
263
 
279
264
    def get_bisect_path(self):
280
 
        from bzrlib._dirstate_helpers_pyx import _bisect_path_right
 
265
        from breezy.bzr._dirstate_helpers_pyx import _bisect_path_right
281
266
        return _bisect_path_right
282
267
 
283
268
 
295
280
 
296
281
    def get_bisect_dirblock(self):
297
282
        """Return an implementation of bisect_dirblock"""
298
 
        from bzrlib._dirstate_helpers_py import bisect_dirblock
 
283
        from breezy.bzr._dirstate_helpers_py import bisect_dirblock
299
284
        return bisect_dirblock
300
285
 
301
286
    def assertBisect(self, dirblocks, split_dirblocks, path, *args, **kwargs):
389
374
    _test_needs_features = [compiled_dirstate_helpers_feature]
390
375
 
391
376
    def get_bisect_dirblock(self):
392
 
        from bzrlib._dirstate_helpers_pyx import bisect_dirblock
 
377
        from breezy.bzr._dirstate_helpers_pyx import bisect_dirblock
393
378
        return bisect_dirblock
394
379
 
395
380
 
396
 
class TestCmpByDirs(tests.TestCase):
397
 
    """Test an implementation of cmp_by_dirs()
 
381
class TestLtByDirs(tests.TestCase):
 
382
    """Test an implementation of lt_by_dirs()
398
383
 
399
 
    cmp_by_dirs() compares 2 paths by their directory sections, rather than as
 
384
    lt_by_dirs() compares 2 paths by their directory sections, rather than as
400
385
    plain strings.
401
386
 
402
 
    Child test cases can override ``get_cmp_by_dirs`` to test a specific
 
387
    Child test cases can override ``get_lt_by_dirs`` to test a specific
403
388
    implementation.
404
389
    """
405
390
 
406
 
    def get_cmp_by_dirs(self):
407
 
        """Get a specific implementation of cmp_by_dirs."""
408
 
        from bzrlib._dirstate_helpers_py import cmp_by_dirs
409
 
        return cmp_by_dirs
 
391
    def get_lt_by_dirs(self):
 
392
        """Get a specific implementation of lt_by_dirs."""
 
393
        from ..bzr._dirstate_helpers_py import lt_by_dirs
 
394
        return lt_by_dirs
410
395
 
411
396
    def assertCmpByDirs(self, expected, str1, str2):
412
397
        """Compare the two strings, in both directions.
416
401
        :param str1: string to compare
417
402
        :param str2: string to compare
418
403
        """
419
 
        cmp_by_dirs = self.get_cmp_by_dirs()
 
404
        lt_by_dirs = self.get_lt_by_dirs()
420
405
        if expected == 0:
421
406
            self.assertEqual(str1, str2)
422
 
            self.assertEqual(0, cmp_by_dirs(str1, str2))
423
 
            self.assertEqual(0, cmp_by_dirs(str2, str1))
 
407
            self.assertFalse(lt_by_dirs(str1, str2))
 
408
            self.assertFalse(lt_by_dirs(str2, str1))
424
409
        elif expected > 0:
425
 
            self.assertPositive(cmp_by_dirs(str1, str2))
426
 
            self.assertNegative(cmp_by_dirs(str2, str1))
 
410
            self.assertFalse(lt_by_dirs(str1, str2))
 
411
            self.assertTrue(lt_by_dirs(str2, str1))
427
412
        else:
428
 
            self.assertNegative(cmp_by_dirs(str1, str2))
429
 
            self.assertPositive(cmp_by_dirs(str2, str1))
 
413
            self.assertTrue(lt_by_dirs(str1, str2))
 
414
            self.assertFalse(lt_by_dirs(str2, str1))
430
415
 
431
416
    def test_cmp_empty(self):
432
417
        """Compare against the empty string."""
492
477
        self.assertCmpByDirs(-1, 'ab/cd', 'ab-cd')
493
478
 
494
479
    def test_cmp_unicode_not_allowed(self):
495
 
        cmp_by_dirs = self.get_cmp_by_dirs()
496
 
        self.assertRaises(TypeError, cmp_by_dirs, u'Unicode', 'str')
497
 
        self.assertRaises(TypeError, cmp_by_dirs, 'str', u'Unicode')
498
 
        self.assertRaises(TypeError, cmp_by_dirs, u'Unicode', u'Unicode')
 
480
        lt_by_dirs = self.get_lt_by_dirs()
 
481
        self.assertRaises(TypeError, lt_by_dirs, u'Unicode', 'str')
 
482
        self.assertRaises(TypeError, lt_by_dirs, 'str', u'Unicode')
 
483
        self.assertRaises(TypeError, lt_by_dirs, u'Unicode', u'Unicode')
499
484
 
500
485
    def test_cmp_non_ascii(self):
501
486
        self.assertCmpByDirs(-1, '\xc2\xb5', '\xc3\xa5') # u'\xb5', u'\xe5'
505
490
        self.assertCmpByDirs(-1, 'b/a', 'b/\xc2\xb5') # u'b/a', u'b/\xb5'
506
491
 
507
492
 
508
 
class TestCompiledCmpByDirs(TestCmpByDirs):
509
 
    """Test the pyrex implementation of cmp_by_dirs"""
 
493
class TestCompiledLtByDirs(TestLtByDirs):
 
494
    """Test the pyrex implementation of lt_by_dirs"""
510
495
 
511
496
    _test_needs_features = [compiled_dirstate_helpers_feature]
512
497
 
513
 
    def get_cmp_by_dirs(self):
514
 
        from bzrlib._dirstate_helpers_pyx import cmp_by_dirs
515
 
        return cmp_by_dirs
516
 
 
517
 
 
518
 
class TestCmpPathByDirblock(tests.TestCase):
519
 
    """Test an implementation of _cmp_path_by_dirblock()
520
 
 
521
 
    _cmp_path_by_dirblock() compares two paths using the sort order used by
 
498
    def get_lt_by_dirs(self):
 
499
        from ..bzr._dirstate_helpers_pyx import lt_by_dirs
 
500
        return lt_by_dirs
 
501
 
 
502
 
 
503
class TestLtPathByDirblock(tests.TestCase):
 
504
    """Test an implementation of _lt_path_by_dirblock()
 
505
 
 
506
    _lt_path_by_dirblock() compares two paths using the sort order used by
522
507
    DirState. All paths in the same directory are sorted together.
523
508
 
524
 
    Child test cases can override ``get_cmp_path_by_dirblock`` to test a specific
 
509
    Child test cases can override ``get_lt_path_by_dirblock`` to test a specific
525
510
    implementation.
526
511
    """
527
512
 
528
 
    def get_cmp_path_by_dirblock(self):
529
 
        """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
 
513
    def get_lt_path_by_dirblock(self):
 
514
        """Get a specific implementation of _lt_path_by_dirblock."""
 
515
        from ..bzr._dirstate_helpers_py import _lt_path_by_dirblock
 
516
        return _lt_path_by_dirblock
532
517
 
533
 
    def assertCmpPathByDirblock(self, paths):
 
518
    def assertLtPathByDirblock(self, paths):
534
519
        """Compare all paths and make sure they evaluate to the correct order.
535
520
 
536
521
        This does N^2 comparisons. It is assumed that ``paths`` is properly
544
529
            return dirname.split('/'), basename
545
530
        self.assertEqual(sorted(paths, key=_key), paths)
546
531
 
547
 
        cmp_path_by_dirblock = self.get_cmp_path_by_dirblock()
 
532
        lt_path_by_dirblock = self.get_lt_path_by_dirblock()
548
533
        for idx1, path1 in enumerate(paths):
549
534
            for idx2, path2 in enumerate(paths):
550
 
                cmp_val = cmp_path_by_dirblock(path1, path2)
551
 
                if idx1 < idx2:
552
 
                    self.assertTrue(cmp_val < 0,
553
 
                        '%s did not state that %r came before %r, cmp=%s'
554
 
                        % (cmp_path_by_dirblock.__name__,
555
 
                           path1, path2, cmp_val))
556
 
                elif idx1 > idx2:
557
 
                    self.assertTrue(cmp_val > 0,
558
 
                        '%s did not state that %r came after %r, cmp=%s'
559
 
                        % (cmp_path_by_dirblock.__name__,
560
 
                           path1, path2, cmp_val))
561
 
                else: # idx1 == idx2
562
 
                    self.assertTrue(cmp_val == 0,
563
 
                        '%s did not state that %r == %r, cmp=%s'
564
 
                        % (cmp_path_by_dirblock.__name__,
565
 
                           path1, path2, cmp_val))
 
535
                lt_result = lt_path_by_dirblock(path1, path2)
 
536
                self.assertEqual(idx1 < idx2, lt_result,
 
537
                        '%s did not state that %r < %r, lt=%s'
 
538
                        % (lt_path_by_dirblock.__name__,
 
539
                           path1, path2, lt_result))
566
540
 
567
541
    def test_cmp_simple_paths(self):
568
542
        """Compare against the empty string."""
569
 
        self.assertCmpPathByDirblock(['', 'a', 'ab', 'abc', 'a/b/c', 'b/d/e'])
570
 
        self.assertCmpPathByDirblock(['kl', 'ab/cd', 'ab/ef', 'gh/ij'])
 
543
        self.assertLtPathByDirblock(['', 'a', 'ab', 'abc', 'a/b/c', 'b/d/e'])
 
544
        self.assertLtPathByDirblock(['kl', 'ab/cd', 'ab/ef', 'gh/ij'])
571
545
 
572
546
    def test_tricky_paths(self):
573
 
        self.assertCmpPathByDirblock([
 
547
        self.assertLtPathByDirblock([
574
548
            # Contents of ''
575
549
            '', 'a', 'a-a', 'a=a', 'b',
576
550
            # Contents of 'a'
598
572
            # Contents of 'b',
599
573
            'b/a', 'b/b',
600
574
            ])
601
 
        self.assertCmpPathByDirblock([
 
575
        self.assertLtPathByDirblock([
602
576
                 # content of '/'
603
577
                 '', 'a', 'a-a', 'a-z', 'a=a', 'a=z',
604
578
                 # content of 'a/'
629
603
                ])
630
604
 
631
605
    def test_unicode_not_allowed(self):
632
 
        cmp_path_by_dirblock = self.get_cmp_path_by_dirblock()
633
 
        self.assertRaises(TypeError, cmp_path_by_dirblock, u'Uni', 'str')
634
 
        self.assertRaises(TypeError, cmp_path_by_dirblock, 'str', u'Uni')
635
 
        self.assertRaises(TypeError, cmp_path_by_dirblock, u'Uni', u'Uni')
636
 
        self.assertRaises(TypeError, cmp_path_by_dirblock, u'x/Uni', 'x/str')
637
 
        self.assertRaises(TypeError, cmp_path_by_dirblock, 'x/str', u'x/Uni')
638
 
        self.assertRaises(TypeError, cmp_path_by_dirblock, u'x/Uni', u'x/Uni')
 
606
        lt_path_by_dirblock = self.get_lt_path_by_dirblock()
 
607
        self.assertRaises(TypeError, lt_path_by_dirblock, u'Uni', 'str')
 
608
        self.assertRaises(TypeError, lt_path_by_dirblock, 'str', u'Uni')
 
609
        self.assertRaises(TypeError, lt_path_by_dirblock, u'Uni', u'Uni')
 
610
        self.assertRaises(TypeError, lt_path_by_dirblock, u'x/Uni', 'x/str')
 
611
        self.assertRaises(TypeError, lt_path_by_dirblock, 'x/str', u'x/Uni')
 
612
        self.assertRaises(TypeError, lt_path_by_dirblock, u'x/Uni', u'x/Uni')
639
613
 
640
614
    def test_nonascii(self):
641
 
        self.assertCmpPathByDirblock([
 
615
        self.assertLtPathByDirblock([
642
616
            # content of '/'
643
617
            '', 'a', '\xc2\xb5', '\xc3\xa5',
644
618
            # content of 'a'
656
630
            ])
657
631
 
658
632
 
659
 
class TestCompiledCmpPathByDirblock(TestCmpPathByDirblock):
660
 
    """Test the pyrex implementation of _cmp_path_by_dirblock"""
 
633
class TestCompiledLtPathByDirblock(TestLtPathByDirblock):
 
634
    """Test the pyrex implementation of _lt_path_by_dirblock"""
661
635
 
662
636
    _test_needs_features = [compiled_dirstate_helpers_feature]
663
637
 
664
 
    def get_cmp_by_dirs(self):
665
 
        from bzrlib._dirstate_helpers_pyx import _cmp_path_by_dirblock
666
 
        return _cmp_path_by_dirblock
 
638
    def get_lt_path_by_dirblock(self):
 
639
        from ..bzr._dirstate_helpers_pyx import _lt_path_by_dirblock
 
640
        return _lt_path_by_dirblock
667
641
 
668
642
 
669
643
class TestMemRChr(tests.TestCase):
672
646
    _test_needs_features = [compiled_dirstate_helpers_feature]
673
647
 
674
648
    def assertMemRChr(self, expected, s, c):
675
 
        from bzrlib._dirstate_helpers_pyx import _py_memrchr
 
649
        from breezy.bzr._dirstate_helpers_pyx import _py_memrchr
676
650
        self.assertEqual(expected, _py_memrchr(s, c))
677
651
 
678
652
    def test_missing(self):
719
693
    implementation.
720
694
    """
721
695
 
 
696
    # inherits scenarios from test_dirstate
 
697
 
722
698
    def get_read_dirblocks(self):
723
 
        from bzrlib._dirstate_helpers_py import _read_dirblocks
 
699
        from breezy.bzr._dirstate_helpers_py import _read_dirblocks
724
700
        return _read_dirblocks
725
701
 
726
702
    def test_smoketest(self):
737
713
 
738
714
    def test_trailing_garbage(self):
739
715
        tree, state, expected = self.create_basic_dirstate()
740
 
        # On Linux, we can write extra data as long as we haven't read yet, but
 
716
        # On Unix, we can write extra data as long as we haven't read yet, but
741
717
        # on Win32, if you've opened the file with FILE_SHARE_READ, trying to
742
718
        # open it in append mode will fail.
743
719
        state.unlock()
760
736
    _test_needs_features = [compiled_dirstate_helpers_feature]
761
737
 
762
738
    def get_read_dirblocks(self):
763
 
        from bzrlib._dirstate_helpers_pyx import _read_dirblocks
 
739
        from breezy.bzr._dirstate_helpers_pyx import _read_dirblocks
764
740
        return _read_dirblocks
765
741
 
766
742
 
774
750
 
775
751
    def test_bisect_dirblock(self):
776
752
        if compiled_dirstate_helpers_feature.available():
777
 
            from bzrlib._dirstate_helpers_pyx import bisect_dirblock
 
753
            from breezy.bzr._dirstate_helpers_pyx import bisect_dirblock
778
754
        else:
779
 
            from bzrlib._dirstate_helpers_py import bisect_dirblock
 
755
            from breezy.bzr._dirstate_helpers_py import bisect_dirblock
780
756
        self.assertIs(bisect_dirblock, dirstate.bisect_dirblock)
781
757
 
782
758
    def test__bisect_path_left(self):
783
759
        if compiled_dirstate_helpers_feature.available():
784
 
            from bzrlib._dirstate_helpers_pyx import _bisect_path_left
 
760
            from breezy.bzr._dirstate_helpers_pyx import _bisect_path_left
785
761
        else:
786
 
            from bzrlib._dirstate_helpers_py import _bisect_path_left
 
762
            from breezy.bzr._dirstate_helpers_py import _bisect_path_left
787
763
        self.assertIs(_bisect_path_left, dirstate._bisect_path_left)
788
764
 
789
765
    def test__bisect_path_right(self):
790
766
        if compiled_dirstate_helpers_feature.available():
791
 
            from bzrlib._dirstate_helpers_pyx import _bisect_path_right
 
767
            from breezy.bzr._dirstate_helpers_pyx import _bisect_path_right
792
768
        else:
793
 
            from bzrlib._dirstate_helpers_py import _bisect_path_right
 
769
            from breezy.bzr._dirstate_helpers_py import _bisect_path_right
794
770
        self.assertIs(_bisect_path_right, dirstate._bisect_path_right)
795
771
 
796
 
    def test_cmp_by_dirs(self):
 
772
    def test_lt_by_dirs(self):
797
773
        if compiled_dirstate_helpers_feature.available():
798
 
            from bzrlib._dirstate_helpers_pyx import cmp_by_dirs
 
774
            from ..bzr._dirstate_helpers_pyx import lt_by_dirs
799
775
        else:
800
 
            from bzrlib._dirstate_helpers_py import cmp_by_dirs
801
 
        self.assertIs(cmp_by_dirs, dirstate.cmp_by_dirs)
 
776
            from ..bzr._dirstate_helpers_py import lt_by_dirs
 
777
        self.assertIs(lt_by_dirs, dirstate.lt_by_dirs)
802
778
 
803
779
    def test__read_dirblocks(self):
804
780
        if compiled_dirstate_helpers_feature.available():
805
 
            from bzrlib._dirstate_helpers_pyx import _read_dirblocks
 
781
            from breezy.bzr._dirstate_helpers_pyx import _read_dirblocks
806
782
        else:
807
 
            from bzrlib._dirstate_helpers_py import _read_dirblocks
 
783
            from breezy.bzr._dirstate_helpers_py import _read_dirblocks
808
784
        self.assertIs(_read_dirblocks, dirstate._read_dirblocks)
809
785
 
810
786
    def test_update_entry(self):
811
787
        if compiled_dirstate_helpers_feature.available():
812
 
            from bzrlib._dirstate_helpers_pyx import update_entry
 
788
            from breezy.bzr._dirstate_helpers_pyx import update_entry
813
789
        else:
814
 
            from bzrlib.dirstate import update_entry
 
790
            from breezy.bzr.dirstate import update_entry
815
791
        self.assertIs(update_entry, dirstate.update_entry)
816
792
 
817
793
    def test_process_entry(self):
818
794
        if compiled_dirstate_helpers_feature.available():
819
 
            from bzrlib._dirstate_helpers_pyx import ProcessEntryC
 
795
            from breezy.bzr._dirstate_helpers_pyx import ProcessEntryC
820
796
            self.assertIs(ProcessEntryC, dirstate._process_entry)
821
797
        else:
822
 
            from bzrlib.dirstate import ProcessEntryPython
 
798
            from breezy.bzr.dirstate import ProcessEntryPython
823
799
            self.assertIs(ProcessEntryPython, dirstate._process_entry)
824
800
 
825
801
 
826
802
class TestUpdateEntry(test_dirstate.TestCaseWithDirState):
827
803
    """Test the DirState.update_entry functions"""
828
804
 
 
805
    scenarios = multiply_scenarios(
 
806
        dir_reader_scenarios(), ue_scenarios)
 
807
 
829
808
    # Set by load_tests
830
809
    update_entry = None
831
810
 
843
822
 
844
823
    def test_observed_sha1_cachable(self):
845
824
        state, entry = self.get_state_with_a()
 
825
        state.save()
846
826
        atime = time.time() - 10
847
827
        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)
 
828
        statvalue = test_dirstate._FakeStat.from_stat(os.lstat('a'))
 
829
        statvalue.st_mtime = statvalue.st_ctime = atime
 
830
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
831
                         state._dirblock_state)
851
832
        state._observed_sha1(entry, "foo", statvalue)
852
833
        self.assertEqual('foo', entry[1][0][1])
853
834
        packed_stat = dirstate.pack_stat(statvalue)
854
835
        self.assertEqual(packed_stat, entry[1][0][4])
 
836
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
 
837
                         state._dirblock_state)
855
838
 
856
839
    def test_observed_sha1_not_cachable(self):
857
840
        state, entry = self.get_state_with_a()
 
841
        state.save()
858
842
        oldval = entry[1][0][1]
859
843
        oldstat = entry[1][0][4]
860
844
        self.build_tree(['a'])
861
845
        statvalue = os.lstat('a')
 
846
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
847
                         state._dirblock_state)
862
848
        state._observed_sha1(entry, "foo", statvalue)
863
849
        self.assertEqual(oldval, entry[1][0][1])
864
850
        self.assertEqual(oldstat, entry[1][0][4])
 
851
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
852
                         state._dirblock_state)
865
853
 
866
854
    def test_update_entry(self):
867
855
        state, _ = self.get_state_with_a()
892
880
                                          stat_value=stat_value)
893
881
        self.assertEqual(None, link_or_sha1)
894
882
 
895
 
        # The dirblock entry should not have cached the file's sha1 (too new)
 
883
        # The dirblock entry should not have computed or cached the file's
 
884
        # sha1, but it did update the files' st_size. However, this is not
 
885
        # worth writing a dirstate file for, so we leave the state UNMODIFIED
896
886
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
897
887
                         entry[1][0])
898
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
888
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
899
889
                         state._dirblock_state)
900
890
        mode = stat_value.st_mode
901
891
        self.assertEqual([('is_exec', mode, False)], state._log)
904
894
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
905
895
                         state._dirblock_state)
906
896
 
907
 
        # If we do it again right away, we don't know if the file has changed
908
 
        # so we will re-read the file. Roll the clock back so the file is
909
 
        # guaranteed to look too new.
 
897
        # Roll the clock back so the file is guaranteed to look too new. We
 
898
        # should still not compute the sha1.
910
899
        state.adjust_time(-10)
911
900
        del state._log[:]
912
901
 
914
903
                                          stat_value=stat_value)
915
904
        self.assertEqual([('is_exec', mode, False)], state._log)
916
905
        self.assertEqual(None, link_or_sha1)
917
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
906
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
918
907
                         state._dirblock_state)
919
908
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
920
909
                         entry[1][0])
930
919
        self.assertEqual([('is_exec', mode, False)], state._log)
931
920
        self.assertEqual(('f', '', 14, False, dirstate.DirState.NULLSTAT),
932
921
                         entry[1][0])
 
922
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
923
                         state._dirblock_state)
933
924
 
934
925
        # If the file is no longer new, and the clock has been moved forward
935
926
        # sufficiently, it will cache the sha.
960
951
 
961
952
    def test_update_entry_symlink(self):
962
953
        """Update entry should read symlinks."""
963
 
        self.requireFeature(tests.SymlinkFeature)
 
954
        self.requireFeature(features.SymlinkFeature)
964
955
        state, entry = self.get_state_with_a()
965
956
        state.save()
966
957
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
977
968
        # Dirblock is not updated (the link is too new)
978
969
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
979
970
                         entry[1])
980
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
971
        # The file entry turned into a symlink, that is considered
 
972
        # HASH modified worthy.
 
973
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
981
974
                         state._dirblock_state)
982
975
 
983
976
        # Because the stat_value looks new, we should re-read the target
 
977
        del state._log[:]
984
978
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
985
979
                                          stat_value=stat_value)
986
980
        self.assertEqual('target', link_or_sha1)
987
 
        self.assertEqual([('read_link', 'a', ''),
988
 
                          ('read_link', 'a', ''),
989
 
                         ], state._log)
 
981
        self.assertEqual([('read_link', 'a', '')], state._log)
990
982
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
991
983
                         entry[1])
 
984
        state.save()
992
985
        state.adjust_time(+20) # Skip into the future, all files look old
 
986
        del state._log[:]
993
987
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
994
988
                                          stat_value=stat_value)
 
989
        # The symlink stayed a symlink. So while it is new enough to cache, we
 
990
        # don't bother setting the flag, because it is not really worth saving
 
991
        # (when we stat the symlink, we'll have paged in the target.)
 
992
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
993
                         state._dirblock_state)
995
994
        self.assertEqual('target', link_or_sha1)
996
995
        # We need to re-read the link because only now can we cache it
997
 
        self.assertEqual([('read_link', 'a', ''),
998
 
                          ('read_link', 'a', ''),
999
 
                          ('read_link', 'a', ''),
1000
 
                         ], state._log)
 
996
        self.assertEqual([('read_link', 'a', '')], state._log)
1001
997
        self.assertEqual([('l', 'target', 6, False, packed_stat)],
1002
998
                         entry[1])
1003
999
 
 
1000
        del state._log[:]
1004
1001
        # Another call won't re-read the link
1005
 
        self.assertEqual([('read_link', 'a', ''),
1006
 
                          ('read_link', 'a', ''),
1007
 
                          ('read_link', 'a', ''),
1008
 
                         ], state._log)
 
1002
        self.assertEqual([], state._log)
1009
1003
        link_or_sha1 = self.update_entry(state, entry, abspath='a',
1010
1004
                                          stat_value=stat_value)
1011
1005
        self.assertEqual('target', link_or_sha1)
1026
1020
        self.build_tree(['a/'])
1027
1021
        state.adjust_time(+20)
1028
1022
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1023
        # a/ used to be a file, but is now a directory, worth saving
1029
1024
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
1030
1025
                         state._dirblock_state)
1031
1026
        state.save()
1032
1027
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1033
1028
                         state._dirblock_state)
1034
 
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1029
        # No changes to a/ means not worth saving.
 
1030
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1031
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1032
                         state._dirblock_state)
 
1033
        # Change the last-modified time for the directory
 
1034
        t = time.time() - 100.0
 
1035
        try:
 
1036
            os.utime('a', (t, t))
 
1037
        except OSError:
 
1038
            # It looks like Win32 + FAT doesn't allow to change times on a dir.
 
1039
            raise tests.TestSkipped("can't update mtime of a dir on FAT")
 
1040
        saved_packed_stat = entry[1][0][-1]
 
1041
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1042
        # We *do* go ahead and update the information in the dirblocks, but we
 
1043
        # don't bother setting IN_MEMORY_MODIFIED because it is trivial to
 
1044
        # recompute.
 
1045
        self.assertNotEqual(saved_packed_stat, entry[1][0][-1])
1035
1046
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1036
1047
                         state._dirblock_state)
1037
1048
 
1137
1148
 
1138
1149
    def test_update_file_to_symlink(self):
1139
1150
        """File becomes a symlink"""
1140
 
        self.requireFeature(tests.SymlinkFeature)
 
1151
        self.requireFeature(features.SymlinkFeature)
1141
1152
        state, entry = self.get_state_with_a()
1142
1153
        # The file sha1 won't be cached unless the file is old
1143
1154
        state.adjust_time(+10)
1156
1167
 
1157
1168
    def test_update_dir_to_symlink(self):
1158
1169
        """Directory becomes a symlink"""
1159
 
        self.requireFeature(tests.SymlinkFeature)
 
1170
        self.requireFeature(features.SymlinkFeature)
1160
1171
        state, entry = self.get_state_with_a()
1161
1172
        # The symlink target won't be cached if it isn't old
1162
1173
        state.adjust_time(+10)
1166
1177
 
1167
1178
    def test_update_symlink_to_file(self):
1168
1179
        """Symlink becomes a file"""
1169
 
        self.requireFeature(tests.SymlinkFeature)
 
1180
        self.requireFeature(features.SymlinkFeature)
1170
1181
        state, entry = self.get_state_with_a()
1171
1182
        # The symlink and file info won't be cached unless old
1172
1183
        state.adjust_time(+10)
1176
1187
 
1177
1188
    def test_update_symlink_to_dir(self):
1178
1189
        """Symlink becomes a directory"""
1179
 
        self.requireFeature(tests.SymlinkFeature)
 
1190
        self.requireFeature(features.SymlinkFeature)
1180
1191
        state, entry = self.get_state_with_a()
1181
1192
        # The symlink target won't be cached if it isn't old
1182
1193
        state.adjust_time(+10)
1269
1280
 
1270
1281
class TestProcessEntry(test_dirstate.TestCaseWithDirState):
1271
1282
 
 
1283
    scenarios = multiply_scenarios(dir_reader_scenarios(), pe_scenarios)
 
1284
 
1272
1285
    # Set by load_tests
1273
1286
    _process_entry = None
1274
1287
 
1321
1334
        state._sha1_provider = UppercaseSHA1Provider()
1322
1335
        self.assertChangedFileIds(['file-id'], tree)
1323
1336
 
 
1337
 
 
1338
class TestPackStat(tests.TestCase):
 
1339
    """Check packed representaton of stat values is robust on all inputs"""
 
1340
 
 
1341
    scenarios = helper_scenarios
 
1342
 
 
1343
    def pack(self, statlike_tuple):
 
1344
        return self.helpers.pack_stat(os.stat_result(statlike_tuple))
 
1345
 
 
1346
    @staticmethod
 
1347
    def unpack_field(packed_string, stat_field):
 
1348
        return _dirstate_helpers_py._unpack_stat(packed_string)[stat_field]
 
1349
 
 
1350
    def test_result(self):
 
1351
        self.assertEqual("AAAQAAAAABAAAAARAAAAAgAAAAEAAIHk",
 
1352
            self.pack((33252, 1, 2, 0, 0, 0, 4096, 15.5, 16.5, 17.5)))
 
1353
 
 
1354
    def test_giant_inode(self):
 
1355
        packed = self.pack((33252, 0xF80000ABC, 0, 0, 0, 0, 0, 0, 0, 0))
 
1356
        self.assertEqual(0x80000ABC, self.unpack_field(packed, "st_ino"))
 
1357
 
 
1358
    def test_giant_size(self):
 
1359
        packed = self.pack((33252, 0, 0, 0, 0, 0, (1 << 33) + 4096, 0, 0, 0))
 
1360
        self.assertEqual(4096, self.unpack_field(packed, "st_size"))
 
1361
 
 
1362
    def test_fractional_mtime(self):
 
1363
        packed = self.pack((33252, 0, 0, 0, 0, 0, 0, 0, 16.9375, 0))
 
1364
        self.assertEqual(16, self.unpack_field(packed, "st_mtime"))
 
1365
 
 
1366
    def test_ancient_mtime(self):
 
1367
        packed = self.pack((33252, 0, 0, 0, 0, 0, 0, 0, -11644473600.0, 0))
 
1368
        self.assertEqual(1240428288, self.unpack_field(packed, "st_mtime"))
 
1369
 
 
1370
    def test_distant_mtime(self):
 
1371
        packed = self.pack((33252, 0, 0, 0, 0, 0, 0, 0, 64060588800.0, 0))
 
1372
        self.assertEqual(3931046656, self.unpack_field(packed, "st_mtime"))
 
1373
 
 
1374
    def test_fractional_ctime(self):
 
1375
        packed = self.pack((33252, 0, 0, 0, 0, 0, 0, 0, 0, 17.5625))
 
1376
        self.assertEqual(17, self.unpack_field(packed, "st_ctime"))
 
1377
 
 
1378
    def test_ancient_ctime(self):
 
1379
        packed = self.pack((33252, 0, 0, 0, 0, 0, 0, 0, 0, -11644473600.0))
 
1380
        self.assertEqual(1240428288, self.unpack_field(packed, "st_ctime"))
 
1381
 
 
1382
    def test_distant_ctime(self):
 
1383
        packed = self.pack((33252, 0, 0, 0, 0, 0, 0, 0, 0, 64060588800.0))
 
1384
        self.assertEqual(3931046656, self.unpack_field(packed, "st_ctime"))
 
1385
 
 
1386
    def test_negative_dev(self):
 
1387
        packed = self.pack((33252, 0, -0xFFFFFCDE, 0, 0, 0, 0, 0, 0, 0))
 
1388
        self.assertEqual(0x322, self.unpack_field(packed, "st_dev"))