/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_dirstate.py

  • Committer: James Henstridge
  • Date: 2007-10-20 00:14:37 UTC
  • mto: This revision was merged to the branch mainline in revision 2925.
  • Revision ID: james@jamesh.id.au-20071020001437-pbujo03uyui6idz4
* Fix merge-directive blackbox test.
* Fix small typo in comment in smtp_connection.py

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
 
    inventory,
26
 
    memorytree,
27
26
    osutils,
28
 
    revision as _mod_revision,
29
 
    tests,
30
27
    )
31
 
from bzrlib.tests import test_osutils
 
28
from bzrlib.memorytree import MemoryTree
 
29
from bzrlib.osutils import has_symlinks
 
30
from bzrlib.tests import (
 
31
        TestCase,
 
32
        TestCaseWithTransport,
 
33
        TestSkipped,
 
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')
180
163
        """
181
164
        # The state should already be write locked, since we just had to do
182
165
        # some operation to get here.
183
 
        self.assertTrue(state._lock_token is not None)
 
166
        assert state._lock_token is not None
184
167
        try:
185
168
            self.assertEqual(expected_result[0],  state.get_parent_ids())
186
169
            # there should be no ghosts in this tree.
377
360
        # There are no files on disk and no parents
378
361
        tree = self.make_branch_and_tree('tree')
379
362
        expected_result = ([], [
380
 
            (('', '', tree.get_root_id()), # common details
 
363
            (('', '', tree.path2id('')), # common details
381
364
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
382
365
             ])])
383
366
        state = dirstate.DirState.from_tree(tree, 'dirstate')
390
373
        rev_id = tree.commit('first post').encode('utf8')
391
374
        root_stat_pack = dirstate.pack_stat(os.stat(tree.basedir))
392
375
        expected_result = ([rev_id], [
393
 
            (('', '', tree.get_root_id()), # common details
 
376
            (('', '', tree.path2id('')), # common details
394
377
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
395
378
              ('d', '', 0, False, rev_id), # first parent details
396
379
             ])])
410
393
        rev_id2 = tree2.commit('second post', allow_pointless=True)
411
394
        tree.merge_from_branch(tree2.branch)
412
395
        expected_result = ([rev_id, rev_id2], [
413
 
            (('', '', tree.get_root_id()), # common details
 
396
            (('', '', tree.path2id('')), # 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)
429
412
        tree = self.make_branch_and_tree('tree')
430
413
        self.build_tree(['tree/unknown'])
431
414
        expected_result = ([], [
432
 
            (('', '', tree.get_root_id()), # common details
 
415
            (('', '', tree.path2id('')), # common details
433
416
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
434
417
             ])])
435
418
        state = dirstate.DirState.from_tree(tree, 'dirstate')
438
421
    def get_tree_with_a_file(self):
439
422
        tree = self.make_branch_and_tree('tree')
440
423
        self.build_tree(['tree/a file'])
441
 
        tree.add('a file', 'a-file-id')
 
424
        tree.add('a file', 'a file id')
442
425
        return tree
443
426
 
444
427
    def test_non_empty_no_parents_to_dirstate(self):
446
429
        # There are files on disk and no parents
447
430
        tree = self.get_tree_with_a_file()
448
431
        expected_result = ([], [
449
 
            (('', '', tree.get_root_id()), # common details
 
432
            (('', '', tree.path2id('')), # common details
450
433
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
451
434
             ]),
452
 
            (('', 'a file', 'a-file-id'), # common
 
435
            (('', 'a file', 'a file id'), # common
453
436
             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
454
437
             ]),
455
438
            ])
464
447
        # and length:
465
448
        self.build_tree_contents([('tree/a file', 'new content\n')])
466
449
        expected_result = ([rev_id], [
467
 
            (('', '', tree.get_root_id()), # common details
 
450
            (('', '', tree.path2id('')), # common details
468
451
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
469
452
              ('d', '', 0, False, rev_id), # first parent details
470
453
             ]),
471
 
            (('', 'a file', 'a-file-id'), # common
 
454
            (('', 'a file', 'a file id'), # common
472
455
             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
473
456
              ('f', 'c3ed76e4bfd45ff1763ca206055bca8e9fc28aa8', 24, False,
474
457
               rev_id), # first parent
491
474
        # and length again, giving us three distinct values:
492
475
        self.build_tree_contents([('tree/a file', 'new content\n')])
493
476
        expected_result = ([rev_id, rev_id2], [
494
 
            (('', '', tree.get_root_id()), # common details
 
477
            (('', '', tree.path2id('')), # 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
 
            (('', 'a file', 'a-file-id'), # common
 
482
            (('', 'a file', 'a file id'), # common
500
483
             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
501
484
              ('f', 'c3ed76e4bfd45ff1763ca206055bca8e9fc28aa8', 24, False,
502
485
               rev_id), # first parent
543
526
        # get a state object
544
527
        # no parents, default tree content
545
528
        expected_result = ([], [
546
 
            (('', '', tree.get_root_id()), # common details
 
529
            (('', '', tree.path2id('')), # common details
547
530
             # current tree details, but new from_tree skips statting, it
548
531
             # uses set_state_from_inventory, and thus depends on the
549
532
             # inventory state.
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()
666
647
        finally:
667
648
            state.unlock()
668
649
 
669
 
    def test_save_refuses_if_changes_aborted(self):
670
 
        self.build_tree(['a-file', 'a-dir/'])
671
 
        state = dirstate.DirState.initialize('dirstate')
672
 
        try:
673
 
            # No stat and no sha1 sum.
674
 
            state.add('a-file', 'a-file-id', 'file', None, '')
675
 
            state.save()
676
 
        finally:
677
 
            state.unlock()
678
 
 
679
 
        # The dirstate should include TREE_ROOT and 'a-file' and nothing else
680
 
        expected_blocks = [
681
 
            ('', [(('', '', 'TREE_ROOT'),
682
 
                   [('d', '', 0, False, dirstate.DirState.NULLSTAT)])]),
683
 
            ('', [(('', 'a-file', 'a-file-id'),
684
 
                   [('f', '', 0, False, dirstate.DirState.NULLSTAT)])]),
685
 
        ]
686
 
 
687
 
        state = dirstate.DirState.on_file('dirstate')
688
 
        state.lock_write()
689
 
        try:
690
 
            state._read_dirblocks_if_needed()
691
 
            self.assertEqual(expected_blocks, state._dirblocks)
692
 
 
693
 
            # Now modify the state, but mark it as inconsistent
694
 
            state.add('a-dir', 'a-dir-id', 'directory', None, '')
695
 
            state._changes_aborted = True
696
 
            state.save()
697
 
        finally:
698
 
            state.unlock()
699
 
 
700
 
        state = dirstate.DirState.on_file('dirstate')
701
 
        state.lock_read()
702
 
        try:
703
 
            state._read_dirblocks_if_needed()
704
 
            self.assertEqual(expected_blocks, state._dirblocks)
705
 
        finally:
706
 
            state.unlock()
707
 
 
708
650
 
709
651
class TestDirStateInitialize(TestCaseWithDirState):
710
652
 
737
679
        try:
738
680
            tree1.add('')
739
681
            revid1 = tree1.commit('foo').encode('utf8')
740
 
            root_id = tree1.get_root_id()
 
682
            root_id = tree1.inventory.root.file_id
741
683
            inv = tree1.inventory
742
684
        finally:
743
685
            tree1.unlock()
758
700
            # This will unlock it
759
701
            self.check_state_with_reopen(expected_result, state)
760
702
 
761
 
    def test_set_state_from_inventory_preserves_hashcache(self):
762
 
        # https://bugs.launchpad.net/bzr/+bug/146176
763
 
        # set_state_from_inventory should preserve the stat and hash value for
764
 
        # workingtree files that are not changed by the inventory.
765
 
 
766
 
        tree = self.make_branch_and_tree('.')
767
 
        # depends on the default format using dirstate...
768
 
        tree.lock_write()
769
 
        try:
770
 
            # make a dirstate with some valid hashcache data
771
 
            # file on disk, but that's not needed for this test
772
 
            foo_contents = 'contents of foo'
773
 
            self.build_tree_contents([('foo', foo_contents)])
774
 
            tree.add('foo', 'foo-id')
775
 
 
776
 
            foo_stat = os.stat('foo')
777
 
            foo_packed = dirstate.pack_stat(foo_stat)
778
 
            foo_sha = osutils.sha_string(foo_contents)
779
 
            foo_size = len(foo_contents)
780
 
 
781
 
            # should not be cached yet, because the file's too fresh
782
 
            self.assertEqual(
783
 
                (('', 'foo', 'foo-id',),
784
 
                 [('f', '', 0, False, dirstate.DirState.NULLSTAT)]),
785
 
                tree._dirstate._get_entry(0, 'foo-id'))
786
 
            # poke in some hashcache information - it wouldn't normally be
787
 
            # stored because it's too fresh
788
 
            tree._dirstate.update_minimal(
789
 
                ('', 'foo', 'foo-id'),
790
 
                'f', False, foo_sha, foo_packed, foo_size, 'foo')
791
 
            # now should be cached
792
 
            self.assertEqual(
793
 
                (('', 'foo', 'foo-id',),
794
 
                 [('f', foo_sha, foo_size, False, foo_packed)]),
795
 
                tree._dirstate._get_entry(0, 'foo-id'))
796
 
 
797
 
            # extract the inventory, and add something to it
798
 
            inv = tree._get_inventory()
799
 
            # should see the file we poked in...
800
 
            self.assertTrue(inv.has_id('foo-id'))
801
 
            self.assertTrue(inv.has_filename('foo'))
802
 
            inv.add_path('bar', 'file', 'bar-id')
803
 
            tree._dirstate._validate()
804
 
            # this used to cause it to lose its hashcache
805
 
            tree._dirstate.set_state_from_inventory(inv)
806
 
            tree._dirstate._validate()
807
 
        finally:
808
 
            tree.unlock()
809
 
 
810
 
        tree.lock_read()
811
 
        try:
812
 
            # now check that the state still has the original hashcache value
813
 
            state = tree._dirstate
814
 
            state._validate()
815
 
            foo_tuple = state._get_entry(0, path_utf8='foo')
816
 
            self.assertEqual(
817
 
                (('', 'foo', 'foo-id',),
818
 
                 [('f', foo_sha, len(foo_contents), False,
819
 
                   dirstate.pack_stat(foo_stat))]),
820
 
                foo_tuple)
821
 
        finally:
822
 
            tree.unlock()
823
 
 
824
703
    def test_set_state_from_inventory_mixed_paths(self):
825
704
        tree1 = self.make_branch_and_tree('tree1')
826
705
        self.build_tree(['tree1/a/', 'tree1/a/b/', 'tree1/a-b/',
867
746
        state = dirstate.DirState.initialize('dirstate')
868
747
        try:
869
748
            # 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]
 
749
            self.assertEqual(
 
750
                [(('', '', 'TREE_ROOT'), [('d', '', 0, False,
 
751
                   'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])],
 
752
                list(state._iter_entries()))
 
753
            state.set_path_id('', 'foobarbaz')
 
754
            expected_rows = [
 
755
                (('', '', 'foobarbaz'), [('d', '', 0, False,
 
756
                   'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])]
881
757
            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
758
            # should work across save too
888
759
            state.save()
889
760
        finally:
907
778
        state._validate()
908
779
        try:
909
780
            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')
 
781
            state.set_path_id('', 'foobarbaz')
919
782
            state._validate()
920
783
            # 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]
 
784
            expected_rows = [
 
785
                (('', '', 'TREE_ROOT'),
 
786
                    [('a', '', 0, False, ''),
 
787
                     ('d', '', 0, False, 'parent-revid'),
 
788
                     ]),
 
789
                (('', '', 'foobarbaz'),
 
790
                    [('d', '', 0, False, ''),
 
791
                     ('a', '', 0, False, ''),
 
792
                     ]),
 
793
                ]
928
794
            state._validate()
929
795
            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
796
            # should work across save too
941
797
            state.save()
942
798
        finally:
958
814
        finally:
959
815
            state.unlock()
960
816
 
 
817
 
961
818
    def test_set_parent_trees_no_content(self):
962
819
        # set_parent_trees is a slow but important api to support.
963
820
        tree1 = self.make_branch_and_memory_tree('tree1')
968
825
        finally:
969
826
            tree1.unlock()
970
827
        branch2 = tree1.branch.bzrdir.clone('tree2').open_branch()
971
 
        tree2 = memorytree.MemoryTree.create_on_branch(branch2)
 
828
        tree2 = MemoryTree.create_on_branch(branch2)
972
829
        tree2.lock_write()
973
830
        try:
974
831
            revid2 = tree2.commit('foo')
975
 
            root_id = tree2.get_root_id()
 
832
            root_id = tree2.inventory.root.file_id
976
833
        finally:
977
834
            tree2.unlock()
978
835
        state = dirstate.DirState.initialize('dirstate')
1006
863
            state.set_parent_trees(
1007
864
                ((revid1, tree1.branch.repository.revision_tree(revid1)),
1008
865
                 (revid2, tree2.branch.repository.revision_tree(revid2)),
1009
 
                 ('ghost-rev', tree2.branch.repository.revision_tree(
1010
 
                                   _mod_revision.NULL_REVISION))),
 
866
                 ('ghost-rev', tree2.branch.repository.revision_tree(None))),
1011
867
                ['ghost-rev'])
1012
868
            self.assertEqual([revid1, revid2, 'ghost-rev'],
1013
869
                             state.get_parent_ids())
1017
873
                [(('', '', root_id), [
1018
874
                  ('d', '', 0, False, dirstate.DirState.NULLSTAT),
1019
875
                  ('d', '', 0, False, revid1),
1020
 
                  ('d', '', 0, False, revid1)
 
876
                  ('d', '', 0, False, revid2)
1021
877
                  ])],
1022
878
                list(state._iter_entries()))
1023
879
        finally:
1038
894
        finally:
1039
895
            tree1.unlock()
1040
896
        branch2 = tree1.branch.bzrdir.clone('tree2').open_branch()
1041
 
        tree2 = memorytree.MemoryTree.create_on_branch(branch2)
 
897
        tree2 = MemoryTree.create_on_branch(branch2)
1042
898
        tree2.lock_write()
1043
899
        try:
1044
900
            tree2.put_file_bytes_non_atomic('file-id', 'new file-content')
1045
901
            revid2 = tree2.commit('foo')
1046
 
            root_id = tree2.get_root_id()
 
902
            root_id = tree2.inventory.root.file_id
1047
903
        finally:
1048
904
            tree2.unlock()
1049
905
        # check the layout in memory
1051
907
            (('', '', root_id), [
1052
908
             ('d', '', 0, False, dirstate.DirState.NULLSTAT),
1053
909
             ('d', '', 0, False, revid1.encode('utf8')),
1054
 
             ('d', '', 0, False, revid1.encode('utf8'))
 
910
             ('d', '', 0, False, revid2.encode('utf8'))
1055
911
             ]),
1056
912
            (('', 'a file', 'file-id'), [
1057
913
             ('a', '', 0, False, ''),
1089
945
            (('', '', 'TREE_ROOT'), [
1090
946
             ('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
1091
947
             ]),
1092
 
            (('', 'a file', 'a-file-id'), [
 
948
            (('', 'a file', 'a file id'), [
1093
949
             ('f', '1'*20, 19, False, dirstate.pack_stat(stat)), # current tree
1094
950
             ]),
1095
951
            ]
1096
952
        try:
1097
 
            state.add('a file', 'a-file-id', 'file', stat, '1'*20)
 
953
            state.add('a file', 'a file id', 'file', stat, '1'*20)
1098
954
            # having added it, it should be in the output of iter_entries.
1099
955
            self.assertEqual(expected_entries, list(state._iter_entries()))
1100
956
            # saving and reloading should not affect this.
1103
959
            state.unlock()
1104
960
        state = dirstate.DirState.on_file('dirstate')
1105
961
        state.lock_read()
1106
 
        self.addCleanup(state.unlock)
1107
 
        self.assertEqual(expected_entries, list(state._iter_entries()))
 
962
        try:
 
963
            self.assertEqual(expected_entries, list(state._iter_entries()))
 
964
        finally:
 
965
            state.unlock()
1108
966
 
1109
967
    def test_add_path_to_unversioned_directory(self):
1110
968
        """Adding a path to an unversioned directory should error.
1115
973
        """
1116
974
        self.build_tree(['unversioned/', 'unversioned/a file'])
1117
975
        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)
 
976
        try:
 
977
            self.assertRaises(errors.NotVersionedError, state.add,
 
978
                'unversioned/a file', 'a file id', 'file', None, None)
 
979
        finally:
 
980
            state.unlock()
1121
981
 
1122
982
    def test_add_directory_to_root_no_parents_all_data(self):
1123
983
        # The most trivial addition of a dir is when there are no parents and
1143
1003
            state.unlock()
1144
1004
        state = dirstate.DirState.on_file('dirstate')
1145
1005
        state.lock_read()
1146
 
        self.addCleanup(state.unlock)
1147
1006
        state._validate()
1148
 
        self.assertEqual(expected_entries, list(state._iter_entries()))
 
1007
        try:
 
1008
            self.assertEqual(expected_entries, list(state._iter_entries()))
 
1009
        finally:
 
1010
            state.unlock()
1149
1011
 
1150
 
    def _test_add_symlink_to_root_no_parents_all_data(self, link_name, target):
 
1012
    def test_add_symlink_to_root_no_parents_all_data(self):
1151
1013
        # The most trivial addition of a symlink when there are no parents and
1152
1014
        # its in the root and all data about the file is supplied
1153
1015
        # 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)
 
1016
        if not has_symlinks():
 
1017
            raise TestSkipped("No symlink support")
 
1018
        os.symlink('target', 'a link')
 
1019
        stat = os.lstat('a link')
1157
1020
        expected_entries = [
1158
1021
            (('', '', 'TREE_ROOT'), [
1159
1022
             ('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
1160
1023
             ]),
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
 
1024
            (('', 'a link', 'a link id'), [
 
1025
             ('l', 'target', 6, False, dirstate.pack_stat(stat)), # current tree
1164
1026
             ]),
1165
1027
            ]
1166
1028
        state = dirstate.DirState.initialize('dirstate')
1167
1029
        try:
1168
 
            state.add(link_name, 'a link id', 'symlink', stat,
1169
 
                      target.encode('UTF-8'))
 
1030
            state.add('a link', 'a link id', 'symlink', stat, 'target')
1170
1031
            # having added it, it should be in the output of iter_entries.
1171
1032
            self.assertEqual(expected_entries, list(state._iter_entries()))
1172
1033
            # saving and reloading should not affect this.
1175
1036
            state.unlock()
1176
1037
        state = dirstate.DirState.on_file('dirstate')
1177
1038
        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')
 
1039
        try:
 
1040
            self.assertEqual(expected_entries, list(state._iter_entries()))
 
1041
        finally:
 
1042
            state.unlock()
1188
1043
 
1189
1044
    def test_add_directory_and_child_no_parents_all_data(self):
1190
1045
        # after adding a directory, we should be able to add children to it.
1198
1053
            (('', 'a dir', 'a dir id'), [
1199
1054
             ('d', '', 0, False, dirstate.pack_stat(dirstat)), # current tree
1200
1055
             ]),
1201
 
            (('a dir', 'a file', 'a-file-id'), [
 
1056
            (('a dir', 'a file', 'a file id'), [
1202
1057
             ('f', '1'*20, 25, False,
1203
1058
              dirstate.pack_stat(filestat)), # current tree details
1204
1059
             ]),
1206
1061
        state = dirstate.DirState.initialize('dirstate')
1207
1062
        try:
1208
1063
            state.add('a dir', 'a dir id', 'directory', dirstat, None)
1209
 
            state.add('a dir/a file', 'a-file-id', 'file', filestat, '1'*20)
 
1064
            state.add('a dir/a file', 'a file id', 'file', filestat, '1'*20)
1210
1065
            # added it, it should be in the output of iter_entries.
1211
1066
            self.assertEqual(expected_entries, list(state._iter_entries()))
1212
1067
            # saving and reloading should not affect this.
1215
1070
            state.unlock()
1216
1071
        state = dirstate.DirState.on_file('dirstate')
1217
1072
        state.lock_read()
1218
 
        self.addCleanup(state.unlock)
1219
 
        self.assertEqual(expected_entries, list(state._iter_entries()))
 
1073
        try:
 
1074
            self.assertEqual(expected_entries, list(state._iter_entries()))
 
1075
        finally:
 
1076
            state.unlock()
1220
1077
 
1221
1078
    def test_add_tree_reference(self):
1222
1079
        # make a dirstate and add a tree reference
1236
1093
            state.unlock()
1237
1094
        # now check we can read it back
1238
1095
        state.lock_read()
1239
 
        self.addCleanup(state.unlock)
1240
1096
        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)
 
1097
        try:
 
1098
            entry2 = state._get_entry(0, 'subdir-id', 'subdir')
 
1099
            self.assertEqual(entry, entry2)
 
1100
            self.assertEqual(entry, expected_entry)
 
1101
            # and lookup by id should work too
 
1102
            entry2 = state._get_entry(0, fileid_utf8='subdir-id')
 
1103
            self.assertEqual(entry, expected_entry)
 
1104
        finally:
 
1105
            state.unlock()
1247
1106
 
1248
1107
    def test_add_forbidden_names(self):
1249
1108
        state = dirstate.DirState.initialize('dirstate')
1253
1112
        self.assertRaises(errors.BzrError,
1254
1113
            state.add, '..', 'ass-id', 'directory', None, None)
1255
1114
 
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
1115
 
1289
1116
class TestGetLines(TestCaseWithDirState):
1290
1117
 
1503
1330
            state.unlock()
1504
1331
 
1505
1332
 
1506
 
class TestIterChildEntries(TestCaseWithDirState):
1507
 
 
1508
 
    def create_dirstate_with_two_trees(self):
1509
 
        """This dirstate contains multiple files and directories.
1510
 
 
1511
 
         /        a-root-value
1512
 
         a/       a-dir
1513
 
         b/       b-dir
1514
 
         c        c-file
1515
 
         d        d-file
1516
 
         a/e/     e-dir
1517
 
         a/f      f-file
1518
 
         b/g      g-file
1519
 
         b/h\xc3\xa5  h-\xc3\xa5-file  #This is u'\xe5' encoded into utf-8
1520
 
 
1521
 
        Notice that a/e is an empty directory.
1522
 
 
1523
 
        There is one parent tree, which has the same shape with the following variations:
1524
 
        b/g in the parent is gone.
1525
 
        b/h in the parent has a different id
1526
 
        b/i is new in the parent
1527
 
        c is renamed to b/j in the parent
1528
 
 
1529
 
        :return: The dirstate, still write-locked.
1530
 
        """
1531
 
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
1532
 
        null_sha = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
1533
 
        NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1534
 
        root_entry = ('', '', 'a-root-value'), [
1535
 
            ('d', '', 0, False, packed_stat),
1536
 
            ('d', '', 0, False, 'parent-revid'),
1537
 
            ]
1538
 
        a_entry = ('', 'a', 'a-dir'), [
1539
 
            ('d', '', 0, False, packed_stat),
1540
 
            ('d', '', 0, False, 'parent-revid'),
1541
 
            ]
1542
 
        b_entry = ('', 'b', 'b-dir'), [
1543
 
            ('d', '', 0, False, packed_stat),
1544
 
            ('d', '', 0, False, 'parent-revid'),
1545
 
            ]
1546
 
        c_entry = ('', 'c', 'c-file'), [
1547
 
            ('f', null_sha, 10, False, packed_stat),
1548
 
            ('r', 'b/j', 0, False, ''),
1549
 
            ]
1550
 
        d_entry = ('', 'd', 'd-file'), [
1551
 
            ('f', null_sha, 20, False, packed_stat),
1552
 
            ('f', 'd', 20, False, 'parent-revid'),
1553
 
            ]
1554
 
        e_entry = ('a', 'e', 'e-dir'), [
1555
 
            ('d', '', 0, False, packed_stat),
1556
 
            ('d', '', 0, False, 'parent-revid'),
1557
 
            ]
1558
 
        f_entry = ('a', 'f', 'f-file'), [
1559
 
            ('f', null_sha, 30, False, packed_stat),
1560
 
            ('f', 'f', 20, False, 'parent-revid'),
1561
 
            ]
1562
 
        g_entry = ('b', 'g', 'g-file'), [
1563
 
            ('f', null_sha, 30, False, packed_stat),
1564
 
            NULL_PARENT_DETAILS,
1565
 
            ]
1566
 
        h_entry1 = ('b', 'h\xc3\xa5', 'h-\xc3\xa5-file1'), [
1567
 
            ('f', null_sha, 40, False, packed_stat),
1568
 
            NULL_PARENT_DETAILS,
1569
 
            ]
1570
 
        h_entry2 = ('b', 'h\xc3\xa5', 'h-\xc3\xa5-file2'), [
1571
 
            NULL_PARENT_DETAILS,
1572
 
            ('f', 'h', 20, False, 'parent-revid'),
1573
 
            ]
1574
 
        i_entry = ('b', 'i', 'i-file'), [
1575
 
            NULL_PARENT_DETAILS,
1576
 
            ('f', 'h', 20, False, 'parent-revid'),
1577
 
            ]
1578
 
        j_entry = ('b', 'j', 'c-file'), [
1579
 
            ('r', 'c', 0, False, ''),
1580
 
            ('f', 'j', 20, False, 'parent-revid'),
1581
 
            ]
1582
 
        dirblocks = []
1583
 
        dirblocks.append(('', [root_entry]))
1584
 
        dirblocks.append(('', [a_entry, b_entry, c_entry, d_entry]))
1585
 
        dirblocks.append(('a', [e_entry, f_entry]))
1586
 
        dirblocks.append(('b', [g_entry, h_entry1, h_entry2, i_entry, j_entry]))
1587
 
        state = dirstate.DirState.initialize('dirstate')
1588
 
        state._validate()
1589
 
        try:
1590
 
            state._set_data(['parent'], dirblocks)
1591
 
        except:
1592
 
            state.unlock()
1593
 
            raise
1594
 
        return state, dirblocks
1595
 
 
1596
 
    def test_iter_children_b(self):
1597
 
        state, dirblocks = self.create_dirstate_with_two_trees()
1598
 
        self.addCleanup(state.unlock)
1599
 
        expected_result = []
1600
 
        expected_result.append(dirblocks[3][1][2]) # h2
1601
 
        expected_result.append(dirblocks[3][1][3]) # i
1602
 
        expected_result.append(dirblocks[3][1][4]) # j
1603
 
        self.assertEqual(expected_result,
1604
 
            list(state._iter_child_entries(1, 'b')))
1605
 
 
1606
 
    def test_iter_child_root(self):
1607
 
        state, dirblocks = self.create_dirstate_with_two_trees()
1608
 
        self.addCleanup(state.unlock)
1609
 
        expected_result = []
1610
 
        expected_result.append(dirblocks[1][1][0]) # a
1611
 
        expected_result.append(dirblocks[1][1][1]) # b
1612
 
        expected_result.append(dirblocks[1][1][3]) # d
1613
 
        expected_result.append(dirblocks[2][1][0]) # e
1614
 
        expected_result.append(dirblocks[2][1][1]) # f
1615
 
        expected_result.append(dirblocks[3][1][2]) # h2
1616
 
        expected_result.append(dirblocks[3][1][3]) # i
1617
 
        expected_result.append(dirblocks[3][1][4]) # j
1618
 
        self.assertEqual(expected_result,
1619
 
            list(state._iter_child_entries(1, '')))
1620
 
 
1621
 
 
1622
 
class TestDirstateSortOrder(tests.TestCaseWithTransport):
 
1333
class TestDirstateSortOrder(TestCaseWithTransport):
1623
1334
    """Test that DirState adds entries in the right order."""
1624
1335
 
1625
1336
    def test_add_sorting(self):
1674
1385
 
1675
1386
        # *really* cheesy way to just get an empty tree
1676
1387
        repo = self.make_repository('repo')
1677
 
        empty_tree = repo.revision_tree(_mod_revision.NULL_REVISION)
 
1388
        empty_tree = repo.revision_tree(None)
1678
1389
        state.set_parent_trees([('null:', empty_tree)], [])
1679
1390
 
1680
1391
        dirblock_names = [d[0] for d in state._dirblocks]
1684
1395
class InstrumentedDirState(dirstate.DirState):
1685
1396
    """An DirState with instrumented sha1 functionality."""
1686
1397
 
1687
 
    def __init__(self, path, sha1_provider):
1688
 
        super(InstrumentedDirState, self).__init__(path, sha1_provider)
 
1398
    def __init__(self, path):
 
1399
        super(InstrumentedDirState, self).__init__(path)
1689
1400
        self._time_offset = 0
1690
1401
        self._log = []
1691
1402
        # member is dynamically set in DirState.__init__ to turn on trace
1692
 
        self._sha1_provider = sha1_provider
1693
1403
        self._sha1_file = self._sha1_file_and_log
1694
1404
 
1695
1405
    def _sha_cutoff_time(self):
1698
1408
 
1699
1409
    def _sha1_file_and_log(self, abspath):
1700
1410
        self._log.append(('sha1', abspath))
1701
 
        return self._sha1_provider.sha1(abspath)
 
1411
        return osutils.sha_file_by_name(abspath)
1702
1412
 
1703
1413
    def _read_link(self, abspath, old_link):
1704
1414
        self._log.append(('read_link', abspath, old_link))
1735
1445
        self.st_ino = ino
1736
1446
        self.st_mode = mode
1737
1447
 
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):
 
1448
 
 
1449
class TestUpdateEntry(TestCaseWithDirState):
 
1450
    """Test the DirState.update_entry functions"""
 
1451
 
 
1452
    def get_state_with_a(self):
 
1453
        """Create a DirState tracking a single object named 'a'"""
 
1454
        state = InstrumentedDirState.initialize('dirstate')
 
1455
        self.addCleanup(state.unlock)
 
1456
        state.add('a', 'a-id', 'file', None, '')
 
1457
        entry = state._get_entry(0, path_utf8='a')
 
1458
        return state, entry
 
1459
 
 
1460
    def test_update_entry(self):
 
1461
        state, entry = self.get_state_with_a()
 
1462
        self.build_tree(['a'])
 
1463
        # Add one where we don't provide the stat or sha already
 
1464
        self.assertEqual(('', 'a', 'a-id'), entry[0])
 
1465
        self.assertEqual([('f', '', 0, False, dirstate.DirState.NULLSTAT)],
 
1466
                         entry[1])
 
1467
        # Flush the buffers to disk
 
1468
        state.save()
 
1469
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1470
                         state._dirblock_state)
 
1471
 
 
1472
        stat_value = os.lstat('a')
 
1473
        packed_stat = dirstate.pack_stat(stat_value)
 
1474
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1475
                                          stat_value=stat_value)
 
1476
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
1477
                         link_or_sha1)
 
1478
 
 
1479
        # The dirblock entry should not cache the file's sha1
 
1480
        self.assertEqual([('f', '', 14, False, dirstate.DirState.NULLSTAT)],
 
1481
                         entry[1])
 
1482
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
1483
                         state._dirblock_state)
 
1484
        mode = stat_value.st_mode
 
1485
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False)], state._log)
 
1486
 
 
1487
        state.save()
 
1488
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1489
                         state._dirblock_state)
 
1490
 
 
1491
        # If we do it again right away, we don't know if the file has changed
 
1492
        # so we will re-read the file. Roll the clock back so the file is
 
1493
        # guaranteed to look too new.
 
1494
        state.adjust_time(-10)
 
1495
 
 
1496
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1497
                                          stat_value=stat_value)
 
1498
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
 
1499
                          ('sha1', 'a'), ('is_exec', mode, False),
 
1500
                         ], state._log)
 
1501
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
1502
                         link_or_sha1)
 
1503
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
1504
                         state._dirblock_state)
 
1505
        self.assertEqual([('f', '', 14, False, dirstate.DirState.NULLSTAT)],
 
1506
                         entry[1])
 
1507
        state.save()
 
1508
 
 
1509
        # However, if we move the clock forward so the file is considered
 
1510
        # "stable", it should just cache the value.
 
1511
        state.adjust_time(+20)
 
1512
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1513
                                          stat_value=stat_value)
 
1514
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
1515
                         link_or_sha1)
 
1516
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
 
1517
                          ('sha1', 'a'), ('is_exec', mode, False),
 
1518
                          ('sha1', 'a'), ('is_exec', mode, False),
 
1519
                         ], state._log)
 
1520
        self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
 
1521
                         entry[1])
 
1522
 
 
1523
        # Subsequent calls will just return the cached value
 
1524
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1525
                                          stat_value=stat_value)
 
1526
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
1527
                         link_or_sha1)
 
1528
        self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
 
1529
                          ('sha1', 'a'), ('is_exec', mode, False),
 
1530
                          ('sha1', 'a'), ('is_exec', mode, False),
 
1531
                         ], state._log)
 
1532
        self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
 
1533
                         entry[1])
 
1534
 
 
1535
    def test_update_entry_symlink(self):
 
1536
        """Update entry should read symlinks."""
 
1537
        if not osutils.has_symlinks():
 
1538
            # PlatformDeficiency / TestSkipped
 
1539
            raise TestSkipped("No symlink support")
 
1540
        state, entry = self.get_state_with_a()
 
1541
        state.save()
 
1542
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1543
                         state._dirblock_state)
 
1544
        os.symlink('target', 'a')
 
1545
 
 
1546
        state.adjust_time(-10) # Make the symlink look new
 
1547
        stat_value = os.lstat('a')
 
1548
        packed_stat = dirstate.pack_stat(stat_value)
 
1549
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1550
                                          stat_value=stat_value)
 
1551
        self.assertEqual('target', link_or_sha1)
 
1552
        self.assertEqual([('read_link', 'a', '')], state._log)
 
1553
        # Dirblock is not updated (the link is too new)
 
1554
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
 
1555
                         entry[1])
 
1556
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
1557
                         state._dirblock_state)
 
1558
 
 
1559
        # Because the stat_value looks new, we should re-read the target
 
1560
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1561
                                          stat_value=stat_value)
 
1562
        self.assertEqual('target', link_or_sha1)
 
1563
        self.assertEqual([('read_link', 'a', ''),
 
1564
                          ('read_link', 'a', ''),
 
1565
                         ], state._log)
 
1566
        self.assertEqual([('l', '', 6, False, dirstate.DirState.NULLSTAT)],
 
1567
                         entry[1])
 
1568
        state.adjust_time(+20) # Skip into the future, all files look old
 
1569
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1570
                                          stat_value=stat_value)
 
1571
        self.assertEqual('target', link_or_sha1)
 
1572
        # We need to re-read the link because only now can we cache it
 
1573
        self.assertEqual([('read_link', 'a', ''),
 
1574
                          ('read_link', 'a', ''),
 
1575
                          ('read_link', 'a', ''),
 
1576
                         ], state._log)
 
1577
        self.assertEqual([('l', 'target', 6, False, packed_stat)],
 
1578
                         entry[1])
 
1579
 
 
1580
        # Another call won't re-read the link
 
1581
        self.assertEqual([('read_link', 'a', ''),
 
1582
                          ('read_link', 'a', ''),
 
1583
                          ('read_link', 'a', ''),
 
1584
                         ], state._log)
 
1585
        link_or_sha1 = state.update_entry(entry, abspath='a',
 
1586
                                          stat_value=stat_value)
 
1587
        self.assertEqual('target', link_or_sha1)
 
1588
        self.assertEqual([('l', 'target', 6, False, packed_stat)],
 
1589
                         entry[1])
 
1590
 
 
1591
    def do_update_entry(self, state, entry, abspath):
 
1592
        stat_value = os.lstat(abspath)
 
1593
        return state.update_entry(entry, abspath, stat_value)
 
1594
 
 
1595
    def test_update_entry_dir(self):
 
1596
        state, entry = self.get_state_with_a()
 
1597
        self.build_tree(['a/'])
 
1598
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1599
 
 
1600
    def test_update_entry_dir_unchanged(self):
 
1601
        state, entry = self.get_state_with_a()
 
1602
        self.build_tree(['a/'])
 
1603
        state.adjust_time(+20)
 
1604
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1605
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
1606
                         state._dirblock_state)
 
1607
        state.save()
 
1608
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1609
                         state._dirblock_state)
 
1610
        self.assertIs(None, self.do_update_entry(state, entry, 'a'))
 
1611
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1612
                         state._dirblock_state)
 
1613
 
 
1614
    def test_update_entry_file_unchanged(self):
 
1615
        state, entry = self.get_state_with_a()
 
1616
        self.build_tree(['a'])
 
1617
        sha1sum = 'b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6'
 
1618
        state.adjust_time(+20)
 
1619
        self.assertEqual(sha1sum, self.do_update_entry(state, entry, 'a'))
 
1620
        self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
 
1621
                         state._dirblock_state)
 
1622
        state.save()
 
1623
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1624
                         state._dirblock_state)
 
1625
        self.assertEqual(sha1sum, self.do_update_entry(state, entry, 'a'))
 
1626
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
 
1627
                         state._dirblock_state)
 
1628
 
 
1629
    def create_and_test_file(self, state, entry):
 
1630
        """Create a file at 'a' and verify the state finds it.
 
1631
 
 
1632
        The state should already be versioning *something* at 'a'. This makes
 
1633
        sure that state.update_entry recognizes it as a file.
 
1634
        """
 
1635
        self.build_tree(['a'])
 
1636
        stat_value = os.lstat('a')
 
1637
        packed_stat = dirstate.pack_stat(stat_value)
 
1638
 
 
1639
        link_or_sha1 = self.do_update_entry(state, entry, abspath='a')
 
1640
        self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
 
1641
                         link_or_sha1)
 
1642
        self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
 
1643
                         entry[1])
 
1644
        return packed_stat
 
1645
 
 
1646
    def create_and_test_dir(self, state, entry):
 
1647
        """Create a directory at 'a' and verify the state finds it.
 
1648
 
 
1649
        The state should already be versioning *something* at 'a'. This makes
 
1650
        sure that state.update_entry recognizes it as a directory.
 
1651
        """
 
1652
        self.build_tree(['a/'])
 
1653
        stat_value = os.lstat('a')
 
1654
        packed_stat = dirstate.pack_stat(stat_value)
 
1655
 
 
1656
        link_or_sha1 = self.do_update_entry(state, entry, abspath='a')
 
1657
        self.assertIs(None, link_or_sha1)
 
1658
        self.assertEqual([('d', '', 0, False, packed_stat)], entry[1])
 
1659
 
 
1660
        return packed_stat
 
1661
 
 
1662
    def create_and_test_symlink(self, state, entry):
 
1663
        """Create a symlink at 'a' and verify the state finds it.
 
1664
 
 
1665
        The state should already be versioning *something* at 'a'. This makes
 
1666
        sure that state.update_entry recognizes it as a symlink.
 
1667
 
 
1668
        This should not be called if this platform does not have symlink
 
1669
        support.
 
1670
        """
 
1671
        # caller should care about skipping test on platforms without symlinks
 
1672
        os.symlink('path/to/foo', 'a')
 
1673
 
 
1674
        stat_value = os.lstat('a')
 
1675
        packed_stat = dirstate.pack_stat(stat_value)
 
1676
 
 
1677
        link_or_sha1 = self.do_update_entry(state, entry, abspath='a')
 
1678
        self.assertEqual('path/to/foo', link_or_sha1)
 
1679
        self.assertEqual([('l', 'path/to/foo', 11, False, packed_stat)],
 
1680
                         entry[1])
 
1681
        return packed_stat
 
1682
 
 
1683
    def test_update_file_to_dir(self):
 
1684
        """If a file changes to a directory we return None for the sha.
 
1685
        We also update the inventory record.
 
1686
        """
 
1687
        state, entry = self.get_state_with_a()
 
1688
        # The file sha1 won't be cached unless the file is old
 
1689
        state.adjust_time(+10)
 
1690
        self.create_and_test_file(state, entry)
 
1691
        os.remove('a')
 
1692
        self.create_and_test_dir(state, entry)
 
1693
 
 
1694
    def test_update_file_to_symlink(self):
 
1695
        """File becomes a symlink"""
 
1696
        if not osutils.has_symlinks():
 
1697
            # PlatformDeficiency / TestSkipped
 
1698
            raise TestSkipped("No symlink support")
 
1699
        state, entry = self.get_state_with_a()
 
1700
        # The file sha1 won't be cached unless the file is old
 
1701
        state.adjust_time(+10)
 
1702
        self.create_and_test_file(state, entry)
 
1703
        os.remove('a')
 
1704
        self.create_and_test_symlink(state, entry)
 
1705
 
 
1706
    def test_update_dir_to_file(self):
 
1707
        """Directory becoming a file updates the entry."""
 
1708
        state, entry = self.get_state_with_a()
 
1709
        # The file sha1 won't be cached unless the file is old
 
1710
        state.adjust_time(+10)
 
1711
        self.create_and_test_dir(state, entry)
 
1712
        os.rmdir('a')
 
1713
        self.create_and_test_file(state, entry)
 
1714
 
 
1715
    def test_update_dir_to_symlink(self):
 
1716
        """Directory becomes a symlink"""
 
1717
        if not osutils.has_symlinks():
 
1718
            # PlatformDeficiency / TestSkipped
 
1719
            raise TestSkipped("No symlink support")
 
1720
        state, entry = self.get_state_with_a()
 
1721
        # The symlink target won't be cached if it isn't old
 
1722
        state.adjust_time(+10)
 
1723
        self.create_and_test_dir(state, entry)
 
1724
        os.rmdir('a')
 
1725
        self.create_and_test_symlink(state, entry)
 
1726
 
 
1727
    def test_update_symlink_to_file(self):
 
1728
        """Symlink becomes a file"""
 
1729
        if not has_symlinks():
 
1730
            raise TestSkipped("No symlink support")
 
1731
        state, entry = self.get_state_with_a()
 
1732
        # The symlink and file info won't be cached unless old
 
1733
        state.adjust_time(+10)
 
1734
        self.create_and_test_symlink(state, entry)
 
1735
        os.remove('a')
 
1736
        self.create_and_test_file(state, entry)
 
1737
 
 
1738
    def test_update_symlink_to_dir(self):
 
1739
        """Symlink becomes a directory"""
 
1740
        if not has_symlinks():
 
1741
            raise TestSkipped("No symlink support")
 
1742
        state, entry = self.get_state_with_a()
 
1743
        # The symlink target won't be cached if it isn't old
 
1744
        state.adjust_time(+10)
 
1745
        self.create_and_test_symlink(state, entry)
 
1746
        os.remove('a')
 
1747
        self.create_and_test_dir(state, entry)
 
1748
 
 
1749
    def test__is_executable_win32(self):
 
1750
        state, entry = self.get_state_with_a()
 
1751
        self.build_tree(['a'])
 
1752
 
 
1753
        # Make sure we are using the win32 implementation of _is_executable
 
1754
        state._is_executable = state._is_executable_win32
 
1755
 
 
1756
        # The file on disk is not executable, but we are marking it as though
 
1757
        # it is. With _is_executable_win32 we ignore what is on disk.
 
1758
        entry[1][0] = ('f', '', 0, True, dirstate.DirState.NULLSTAT)
 
1759
 
 
1760
        stat_value = os.lstat('a')
 
1761
        packed_stat = dirstate.pack_stat(stat_value)
 
1762
 
 
1763
        state.adjust_time(-10) # Make sure everything is new
 
1764
        state.update_entry(entry, abspath='a', stat_value=stat_value)
 
1765
 
 
1766
        # The row is updated, but the executable bit stays set.
 
1767
        self.assertEqual([('f', '', 14, True, dirstate.DirState.NULLSTAT)],
 
1768
                         entry[1])
 
1769
 
 
1770
        # Make the disk object look old enough to cache
 
1771
        state.adjust_time(+20)
 
1772
        digest = 'b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6'
 
1773
        state.update_entry(entry, abspath='a', stat_value=stat_value)
 
1774
        self.assertEqual([('f', digest, 14, True, packed_stat)], entry[1])
 
1775
 
 
1776
 
 
1777
class TestPackStat(TestCaseWithTransport):
1745
1778
 
1746
1779
    def assertPackStat(self, expected, stat_value):
1747
1780
        """Check the packed and serialized form of a stat value."""
1812
1845
        # the end it would still be fairly arbitrary, and we don't want the
1813
1846
        # extra overhead if we can avoid it. So sort everything to make sure
1814
1847
        # equality is true
1815
 
        self.assertEqual(len(map_keys), len(paths))
 
1848
        assert len(map_keys) == len(paths)
1816
1849
        expected = {}
1817
1850
        for path, keys in zip(paths, map_keys):
1818
1851
            if keys is None:
1837
1870
        :param paths: A list of directories
1838
1871
        """
1839
1872
        result = state._bisect_dirblocks(paths)
1840
 
        self.assertEqual(len(map_keys), len(paths))
 
1873
        assert len(map_keys) == len(paths)
 
1874
 
1841
1875
        expected = {}
1842
1876
        for path, keys in zip(paths, map_keys):
1843
1877
            if keys is None:
2107
2141
            self.assertEqual(expected, state._find_block(key))
2108
2142
        finally:
2109
2143
            state.unlock()
2110
 
 
2111
 
 
2112
 
class TestDiscardMergeParents(TestCaseWithDirState):
2113
 
 
2114
 
    def test_discard_no_parents(self):
2115
 
        # This should be a no-op
2116
 
        state = self.create_empty_dirstate()
2117
 
        self.addCleanup(state.unlock)
2118
 
        state._discard_merge_parents()
2119
 
        state._validate()
2120
 
 
2121
 
    def test_discard_one_parent(self):
2122
 
        # No-op
2123
 
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
2124
 
        root_entry_direntry = ('', '', 'a-root-value'), [
2125
 
            ('d', '', 0, False, packed_stat),
2126
 
            ('d', '', 0, False, packed_stat),
2127
 
            ]
2128
 
        dirblocks = []
2129
 
        dirblocks.append(('', [root_entry_direntry]))
2130
 
        dirblocks.append(('', []))
2131
 
 
2132
 
        state = self.create_empty_dirstate()
2133
 
        self.addCleanup(state.unlock)
2134
 
        state._set_data(['parent-id'], dirblocks[:])
2135
 
        state._validate()
2136
 
 
2137
 
        state._discard_merge_parents()
2138
 
        state._validate()
2139
 
        self.assertEqual(dirblocks, state._dirblocks)
2140
 
 
2141
 
    def test_discard_simple(self):
2142
 
        # No-op
2143
 
        packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
2144
 
        root_entry_direntry = ('', '', 'a-root-value'), [
2145
 
            ('d', '', 0, False, packed_stat),
2146
 
            ('d', '', 0, False, packed_stat),
2147
 
            ('d', '', 0, False, packed_stat),
2148
 
            ]
2149
 
        expected_root_entry_direntry = ('', '', 'a-root-value'), [
2150
 
            ('d', '', 0, False, packed_stat),
2151
 
            ('d', '', 0, False, packed_stat),
2152
 
            ]
2153
 
        dirblocks = []
2154
 
        dirblocks.append(('', [root_entry_direntry]))
2155
 
        dirblocks.append(('', []))
2156
 
 
2157
 
        state = self.create_empty_dirstate()
2158
 
        self.addCleanup(state.unlock)
2159
 
        state._set_data(['parent-id', 'merged-id'], dirblocks[:])
2160
 
        state._validate()
2161
 
 
2162
 
        # This should strip of the extra column
2163
 
        state._discard_merge_parents()
2164
 
        state._validate()
2165
 
        expected_dirblocks = [('', [expected_root_entry_direntry]), ('', [])]
2166
 
        self.assertEqual(expected_dirblocks, state._dirblocks)
2167
 
 
2168
 
    def test_discard_absent(self):
2169
 
        """If entries are only in a merge, discard should remove the entries"""
2170
 
        null_stat = dirstate.DirState.NULLSTAT
2171
 
        present_dir = ('d', '', 0, False, null_stat)
2172
 
        present_file = ('f', '', 0, False, null_stat)
2173
 
        absent = dirstate.DirState.NULL_PARENT_DETAILS
2174
 
        root_key = ('', '', 'a-root-value')
2175
 
        file_in_root_key = ('', 'file-in-root', 'a-file-id')
2176
 
        file_in_merged_key = ('', 'file-in-merged', 'b-file-id')
2177
 
        dirblocks = [('', [(root_key, [present_dir, present_dir, present_dir])]),
2178
 
                     ('', [(file_in_merged_key,
2179
 
                            [absent, absent, present_file]),
2180
 
                           (file_in_root_key,
2181
 
                            [present_file, present_file, present_file]),
2182
 
                          ]),
2183
 
                    ]
2184
 
 
2185
 
        state = self.create_empty_dirstate()
2186
 
        self.addCleanup(state.unlock)
2187
 
        state._set_data(['parent-id', 'merged-id'], dirblocks[:])
2188
 
        state._validate()
2189
 
 
2190
 
        exp_dirblocks = [('', [(root_key, [present_dir, present_dir])]),
2191
 
                         ('', [(file_in_root_key,
2192
 
                                [present_file, present_file]),
2193
 
                              ]),
2194
 
                        ]
2195
 
        state._discard_merge_parents()
2196
 
        state._validate()
2197
 
        self.assertEqual(exp_dirblocks, state._dirblocks)
2198
 
 
2199
 
    def test_discard_renamed(self):
2200
 
        null_stat = dirstate.DirState.NULLSTAT
2201
 
        present_dir = ('d', '', 0, False, null_stat)
2202
 
        present_file = ('f', '', 0, False, null_stat)
2203
 
        absent = dirstate.DirState.NULL_PARENT_DETAILS
2204
 
        root_key = ('', '', 'a-root-value')
2205
 
        file_in_root_key = ('', 'file-in-root', 'a-file-id')
2206
 
        # Renamed relative to parent
2207
 
        file_rename_s_key = ('', 'file-s', 'b-file-id')
2208
 
        file_rename_t_key = ('', 'file-t', 'b-file-id')
2209
 
        # And one that is renamed between the parents, but absent in this
2210
 
        key_in_1 = ('', 'file-in-1', 'c-file-id')
2211
 
        key_in_2 = ('', 'file-in-2', 'c-file-id')
2212
 
 
2213
 
        dirblocks = [
2214
 
            ('', [(root_key, [present_dir, present_dir, present_dir])]),
2215
 
            ('', [(key_in_1,
2216
 
                   [absent, present_file, ('r', 'file-in-2', 'c-file-id')]),
2217
 
                  (key_in_2,
2218
 
                   [absent, ('r', 'file-in-1', 'c-file-id'), present_file]),
2219
 
                  (file_in_root_key,
2220
 
                   [present_file, present_file, present_file]),
2221
 
                  (file_rename_s_key,
2222
 
                   [('r', 'file-t', 'b-file-id'), absent, present_file]),
2223
 
                  (file_rename_t_key,
2224
 
                   [present_file, absent, ('r', 'file-s', 'b-file-id')]),
2225
 
                 ]),
2226
 
        ]
2227
 
        exp_dirblocks = [
2228
 
            ('', [(root_key, [present_dir, present_dir])]),
2229
 
            ('', [(key_in_1, [absent, present_file]),
2230
 
                  (file_in_root_key, [present_file, present_file]),
2231
 
                  (file_rename_t_key, [present_file, absent]),
2232
 
                 ]),
2233
 
        ]
2234
 
        state = self.create_empty_dirstate()
2235
 
        self.addCleanup(state.unlock)
2236
 
        state._set_data(['parent-id', 'merged-id'], dirblocks[:])
2237
 
        state._validate()
2238
 
 
2239
 
        state._discard_merge_parents()
2240
 
        state._validate()
2241
 
        self.assertEqual(exp_dirblocks, state._dirblocks)
2242
 
 
2243
 
    def test_discard_all_subdir(self):
2244
 
        null_stat = dirstate.DirState.NULLSTAT
2245
 
        present_dir = ('d', '', 0, False, null_stat)
2246
 
        present_file = ('f', '', 0, False, null_stat)
2247
 
        absent = dirstate.DirState.NULL_PARENT_DETAILS
2248
 
        root_key = ('', '', 'a-root-value')
2249
 
        subdir_key = ('', 'sub', 'dir-id')
2250
 
        child1_key = ('sub', 'child1', 'child1-id')
2251
 
        child2_key = ('sub', 'child2', 'child2-id')
2252
 
        child3_key = ('sub', 'child3', 'child3-id')
2253
 
 
2254
 
        dirblocks = [
2255
 
            ('', [(root_key, [present_dir, present_dir, present_dir])]),
2256
 
            ('', [(subdir_key, [present_dir, present_dir, present_dir])]),
2257
 
            ('sub', [(child1_key, [absent, absent, present_file]),
2258
 
                     (child2_key, [absent, absent, present_file]),
2259
 
                     (child3_key, [absent, absent, present_file]),
2260
 
                    ]),
2261
 
        ]
2262
 
        exp_dirblocks = [
2263
 
            ('', [(root_key, [present_dir, present_dir])]),
2264
 
            ('', [(subdir_key, [present_dir, present_dir])]),
2265
 
            ('sub', []),
2266
 
        ]
2267
 
        state = self.create_empty_dirstate()
2268
 
        self.addCleanup(state.unlock)
2269
 
        state._set_data(['parent-id', 'merged-id'], dirblocks[:])
2270
 
        state._validate()
2271
 
 
2272
 
        state._discard_merge_parents()
2273
 
        state._validate()
2274
 
        self.assertEqual(exp_dirblocks, state._dirblocks)
2275
 
 
2276
 
 
2277
 
class Test_InvEntryToDetails(tests.TestCase):
2278
 
 
2279
 
    def assertDetails(self, expected, inv_entry):
2280
 
        details = dirstate.DirState._inv_entry_to_details(inv_entry)
2281
 
        self.assertEqual(expected, details)
2282
 
        # details should always allow join() and always be a plain str when
2283
 
        # finished
2284
 
        (minikind, fingerprint, size, executable, tree_data) = details
2285
 
        self.assertIsInstance(minikind, str)
2286
 
        self.assertIsInstance(fingerprint, str)
2287
 
        self.assertIsInstance(tree_data, str)
2288
 
 
2289
 
    def test_unicode_symlink(self):
2290
 
        inv_entry = inventory.InventoryLink('link-file-id',
2291
 
                                            u'nam\N{Euro Sign}e',
2292
 
                                            'link-parent-id')
2293
 
        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)