← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_dirstate.py

Support Unicode paths for ftp transport (encoded as utf8).

* bzrlib/transport/ftp/__init__.py:
(FtpTransport._remote_path): Remove the work around, we send and
receive utf8 paths.

* bzrlib/tests/per_transport.py:
(TransportTests.test_unicode_paths): Check that the *server* can
support Unicode paths).

* bzrlib/tests/ftp_server/pyftpdlib_based.py:
(BzrConformingFS.ftp2fs): Added to decode utf8 received paths.

* bzrlib/tests/ftp_server/medusa_based.py:
(FTPTestServer): Declare that medusa can't support Unicode paths
in an had-hoc way.

* bzrlib/osutils.py:
(fancy_rename): Ensure all paths are unicode.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_dirstate.py
1
 
# Copyright (C) 2006-2011 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
16
16
 
17
17
"""Tests of the dirstate functionality being built for WorkingTreeFormat4."""
18
18
 
 
19
import bisect
19
20
import os
20
 
import tempfile
21
21
 
22
22
from bzrlib import (
23
 
    bzrdir,
24
23
    dirstate,
25
24
    errors,
26
25
    inventory,
27
26
    memorytree,
28
27
    osutils,
29
28
    revision as _mod_revision,
30
 
    revisiontree,
31
29
    tests,
32
 
    workingtree_4,
33
 
    )
34
 
from bzrlib.transport import memory
35
 
from bzrlib.tests import (
36
 
    features,
37
 
    test_osutils,
38
 
    )
39
 
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
30
    )
 
31
from bzrlib.tests import test_osutils
40
32
 
41
33
 
42
34
# TODO:
52
44
# set_path_id  setting id when state is in memory modified
53
45
 
54
46
 
55
 
load_tests = load_tests_apply_scenarios
 
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
56
55
 
57
56
 
58
57
class TestCaseWithDirState(tests.TestCaseWithTransport):
59
58
    """Helper functions for creating DirState objects with various content."""
60
59
 
61
 
    scenarios = test_osutils.dir_reader_scenarios()
62
 
 
63
60
    # Set by load_tests
64
61
    _dir_reader_class = None
65
62
    _native_to_unicode = None # Not used yet
67
64
    def setUp(self):
68
65
        tests.TestCaseWithTransport.setUp(self)
69
66
 
70
 
        self.overrideAttr(osutils,
71
 
                          '_selected_dir_reader', self._dir_reader_class())
 
67
        # Save platform specific info and reset it
 
68
        cur_dir_reader = osutils._selected_dir_reader
 
69
 
 
70
        def restore():
 
71
            osutils._selected_dir_reader = cur_dir_reader
 
72
        self.addCleanup(restore)
 
73
 
 
74
        osutils._selected_dir_reader = self._dir_reader_class()
72
75
 
73
76
    def create_empty_dirstate(self):
74
77
        """Return a locked but empty dirstate"""
535
538
 
536
539
class TestDirStateOnFile(TestCaseWithDirState):
537
540
 
538
 
    def create_updated_dirstate(self):
539
 
        self.build_tree(['a-file'])
540
 
        tree = self.make_branch_and_tree('.')
541
 
        tree.add(['a-file'], ['a-id'])
542
 
        tree.commit('add a-file')
543
 
        # Save and unlock the state, re-open it in readonly mode
544
 
        state = dirstate.DirState.from_tree(tree, 'dirstate')
545
 
        state.save()
546
 
        state.unlock()
547
 
        state = dirstate.DirState.on_file('dirstate')
548
 
        state.lock_read()
549
 
        return state
550
 
 
551
541
    def test_construct_with_path(self):
552
542
        tree = self.make_branch_and_tree('tree')
553
543
        state = dirstate.DirState.from_tree(tree, 'dirstate.from_tree')
582
572
            state.unlock()
583
573
 
584
574
    def test_can_save_in_read_lock(self):
585
 
        state = self.create_updated_dirstate()
 
575
        self.build_tree(['a-file'])
 
576
        state = dirstate.DirState.initialize('dirstate')
 
577
        try:
 
578
            # No stat and no sha1 sum.
 
579
            state.add('a-file', 'a-file-id', 'file', None, '')
 
580
            state.save()
 
581
        finally:
 
582
            state.unlock()
 
583
 
 
584
        # Now open in readonly mode
 
585
        state = dirstate.DirState.on_file('dirstate')
 
586
        state.lock_read()
586
587
        try:
587
588
            entry = state._get_entry(0, path_utf8='a-file')
588
589
            # The current size should be 0 (default)
589
590
            self.assertEqual(0, entry[1][0][2])
590
591
            # We should have a real entry.
591
592
            self.assertNotEqual((None, None), entry)
592
 
            # Set the cutoff-time into the future, so things look cacheable
 
593
            # Make sure everything is old enough
593
594
            state._sha_cutoff_time()
594
 
            state._cutoff_time += 10.0
595
 
            st = os.lstat('a-file')
596
 
            sha1sum = dirstate.update_entry(state, entry, 'a-file', st)
597
 
            # We updated the current sha1sum because the file is cacheable
598
 
            self.assertEqual('ecc5374e9ed82ad3ea3b4d452ea995a5fd3e70e3',
599
 
                             sha1sum)
 
595
            state._cutoff_time += 10
 
596
            # Change the file length
 
597
            self.build_tree_contents([('a-file', 'shorter')])
 
598
            sha1sum = dirstate.update_entry(state, entry, 'a-file',
 
599
                os.lstat('a-file'))
 
600
            # new file, no cached sha:
 
601
            self.assertEqual(None, sha1sum)
600
602
 
601
603
            # The dirblock has been updated
602
 
            self.assertEqual(st.st_size, entry[1][0][2])
603
 
            self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
 
604
            self.assertEqual(7, entry[1][0][2])
 
605
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
604
606
                             state._dirblock_state)
605
607
 
606
608
            del entry
615
617
        state.lock_read()
616
618
        try:
617
619
            entry = state._get_entry(0, path_utf8='a-file')
618
 
            self.assertEqual(st.st_size, entry[1][0][2])
 
620
            self.assertEqual(7, entry[1][0][2])
619
621
        finally:
620
622
            state.unlock()
621
623
 
622
624
    def test_save_fails_quietly_if_locked(self):
623
625
        """If dirstate is locked, save will fail without complaining."""
624
 
        state = self.create_updated_dirstate()
 
626
        self.build_tree(['a-file'])
 
627
        state = dirstate.DirState.initialize('dirstate')
 
628
        try:
 
629
            # No stat and no sha1 sum.
 
630
            state.add('a-file', 'a-file-id', 'file', None, '')
 
631
            state.save()
 
632
        finally:
 
633
            state.unlock()
 
634
 
 
635
        state = dirstate.DirState.on_file('dirstate')
 
636
        state.lock_read()
625
637
        try:
626
638
            entry = state._get_entry(0, path_utf8='a-file')
627
 
            # No cached sha1 yet.
628
 
            self.assertEqual('', entry[1][0][1])
629
 
            # Set the cutoff-time into the future, so things look cacheable
630
 
            state._sha_cutoff_time()
631
 
            state._cutoff_time += 10.0
632
 
            st = os.lstat('a-file')
633
 
            sha1sum = dirstate.update_entry(state, entry, 'a-file', st)
634
 
            self.assertEqual('ecc5374e9ed82ad3ea3b4d452ea995a5fd3e70e3',
635
 
                             sha1sum)
636
 
            self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
 
639
            sha1sum = dirstate.update_entry(state, entry, 'a-file',
 
640
                os.lstat('a-file'))
 
641
            # No sha - too new
 
642
            self.assertEqual(None, sha1sum)
 
643
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
637
644
                             state._dirblock_state)
638
645
 
639
646
            # Now, before we try to save, grab another dirstate, and take out a
729
736
 
730
737
class TestDirStateManipulations(TestCaseWithDirState):
731
738
 
732
 
    def make_minimal_tree(self):
733
 
        tree1 = self.make_branch_and_memory_tree('tree1')
734
 
        tree1.lock_write()
735
 
        self.addCleanup(tree1.unlock)
736
 
        tree1.add('')
737
 
        revid1 = tree1.commit('foo')
738
 
        return tree1, revid1
739
 
 
740
 
    def test_update_minimal_updates_id_index(self):
741
 
        state = self.create_dirstate_with_root_and_subdir()
742
 
        self.addCleanup(state.unlock)
743
 
        id_index = state._get_id_index()
744
 
        self.assertEqual(['a-root-value', 'subdir-id'], sorted(id_index))
745
 
        state.add('file-name', 'file-id', 'file', None, '')
746
 
        self.assertEqual(['a-root-value', 'file-id', 'subdir-id'],
747
 
                         sorted(id_index))
748
 
        state.update_minimal(('', 'new-name', 'file-id'), 'f',
749
 
                             path_utf8='new-name')
750
 
        self.assertEqual(['a-root-value', 'file-id', 'subdir-id'],
751
 
                         sorted(id_index))
752
 
        self.assertEqual([('', 'new-name', 'file-id')],
753
 
                         sorted(id_index['file-id']))
754
 
        state._validate()
755
 
 
756
739
    def test_set_state_from_inventory_no_content_no_parents(self):
757
740
        # setting the current inventory is a slow but important api to support.
758
 
        tree1, revid1 = self.make_minimal_tree()
759
 
        inv = tree1.inventory
760
 
        root_id = inv.path2id('')
 
741
        tree1 = self.make_branch_and_memory_tree('tree1')
 
742
        tree1.lock_write()
 
743
        try:
 
744
            tree1.add('')
 
745
            revid1 = tree1.commit('foo').encode('utf8')
 
746
            root_id = tree1.get_root_id()
 
747
            inv = tree1.inventory
 
748
        finally:
 
749
            tree1.unlock()
761
750
        expected_result = [], [
762
751
            (('', '', root_id), [
763
752
             ('d', '', 0, False, dirstate.DirState.NULLSTAT)])]
775
764
            # This will unlock it
776
765
            self.check_state_with_reopen(expected_result, state)
777
766
 
778
 
    def test_set_state_from_scratch_no_parents(self):
779
 
        tree1, revid1 = self.make_minimal_tree()
780
 
        inv = tree1.inventory
781
 
        root_id = inv.path2id('')
782
 
        expected_result = [], [
783
 
            (('', '', root_id), [
784
 
             ('d', '', 0, False, dirstate.DirState.NULLSTAT)])]
785
 
        state = dirstate.DirState.initialize('dirstate')
786
 
        try:
787
 
            state.set_state_from_scratch(inv, [], [])
788
 
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
789
 
                             state._header_state)
790
 
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
791
 
                             state._dirblock_state)
792
 
        except:
793
 
            state.unlock()
794
 
            raise
795
 
        else:
796
 
            # This will unlock it
797
 
            self.check_state_with_reopen(expected_result, state)
798
 
 
799
 
    def test_set_state_from_scratch_identical_parent(self):
800
 
        tree1, revid1 = self.make_minimal_tree()
801
 
        inv = tree1.inventory
802
 
        root_id = inv.path2id('')
803
 
        rev_tree1 = tree1.branch.repository.revision_tree(revid1)
804
 
        d_entry = ('d', '', 0, False, dirstate.DirState.NULLSTAT)
805
 
        parent_entry = ('d', '', 0, False, revid1)
806
 
        expected_result = [revid1], [
807
 
            (('', '', root_id), [d_entry, parent_entry])]
808
 
        state = dirstate.DirState.initialize('dirstate')
809
 
        try:
810
 
            state.set_state_from_scratch(inv, [(revid1, rev_tree1)], [])
811
 
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
812
 
                             state._header_state)
813
 
            self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
814
 
                             state._dirblock_state)
815
 
        except:
816
 
            state.unlock()
817
 
            raise
818
 
        else:
819
 
            # This will unlock it
820
 
            self.check_state_with_reopen(expected_result, state)
821
 
 
822
767
    def test_set_state_from_inventory_preserves_hashcache(self):
823
768
        # https://bugs.launchpad.net/bzr/+bug/146176
824
769
        # set_state_from_inventory should preserve the stat and hash value for
928
873
        state = dirstate.DirState.initialize('dirstate')
929
874
        try:
930
875
            # check precondition to be sure the state does change appropriately.
931
 
            root_entry = (('', '', 'TREE_ROOT'), [('d', '', 0, False, 'x'*32)])
932
 
            self.assertEqual([root_entry], list(state._iter_entries()))
933
 
            self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
934
 
            self.assertEqual(root_entry,
935
 
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
936
 
            self.assertEqual((None, None),
937
 
                             state._get_entry(0, fileid_utf8='second-root-id'))
938
 
            state.set_path_id('', 'second-root-id')
939
 
            new_root_entry = (('', '', 'second-root-id'),
940
 
                              [('d', '', 0, False, 'x'*32)])
941
 
            expected_rows = [new_root_entry]
 
876
            self.assertEqual(
 
877
                [(('', '', 'TREE_ROOT'), [('d', '', 0, False,
 
878
                   'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])],
 
879
                list(state._iter_entries()))
 
880
            state.set_path_id('', 'foobarbaz')
 
881
            expected_rows = [
 
882
                (('', '', 'foobarbaz'), [('d', '', 0, False,
 
883
                   'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])]
942
884
            self.assertEqual(expected_rows, list(state._iter_entries()))
943
 
            self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
944
 
            self.assertEqual(new_root_entry, 
945
 
                             state._get_entry(0, fileid_utf8='second-root-id'))
946
 
            self.assertEqual((None, None),
947
 
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
948
885
            # should work across save too
949
886
            state.save()
950
887
        finally:
968
905
        state._validate()
969
906
        try:
970
907
            state.set_parent_trees([('parent-revid', rt)], ghosts=[])
971
 
            root_entry = (('', '', 'TREE_ROOT'),
972
 
                          [('d', '', 0, False, 'x'*32),
973
 
                           ('d', '', 0, False, 'parent-revid')])
974
 
            self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
975
 
            self.assertEqual(root_entry,
976
 
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
977
 
            self.assertEqual((None, None),
978
 
                             state._get_entry(0, fileid_utf8='Asecond-root-id'))
979
 
            state.set_path_id('', 'Asecond-root-id')
 
908
            state.set_path_id('', 'foobarbaz')
980
909
            state._validate()
981
910
            # now see that it is what we expected
982
 
            old_root_entry = (('', '', 'TREE_ROOT'),
983
 
                              [('a', '', 0, False, ''),
984
 
                               ('d', '', 0, False, 'parent-revid')])
985
 
            new_root_entry = (('', '', 'Asecond-root-id'),
986
 
                              [('d', '', 0, False, ''),
987
 
                               ('a', '', 0, False, '')])
988
 
            expected_rows = [new_root_entry, old_root_entry]
 
911
            expected_rows = [
 
912
                (('', '', 'TREE_ROOT'),
 
913
                    [('a', '', 0, False, ''),
 
914
                     ('d', '', 0, False, 'parent-revid'),
 
915
                     ]),
 
916
                (('', '', 'foobarbaz'),
 
917
                    [('d', '', 0, False, ''),
 
918
                     ('a', '', 0, False, ''),
 
919
                     ]),
 
920
                ]
989
921
            state._validate()
990
922
            self.assertEqual(expected_rows, list(state._iter_entries()))
991
 
            self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
992
 
            self.assertEqual(old_root_entry, state._get_entry(1, path_utf8=''))
993
 
            self.assertEqual((None, None),
994
 
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
995
 
            self.assertEqual(old_root_entry,
996
 
                             state._get_entry(1, fileid_utf8='TREE_ROOT'))
997
 
            self.assertEqual(new_root_entry,
998
 
                             state._get_entry(0, fileid_utf8='Asecond-root-id'))
999
 
            self.assertEqual((None, None),
1000
 
                             state._get_entry(1, fileid_utf8='Asecond-root-id'))
1001
923
            # should work across save too
1002
924
            state.save()
1003
925
        finally:
1212
1134
        # The most trivial addition of a symlink when there are no parents and
1213
1135
        # its in the root and all data about the file is supplied
1214
1136
        # bzr doesn't support fake symlinks on windows, yet.
1215
 
        self.requireFeature(features.SymlinkFeature)
 
1137
        self.requireFeature(tests.SymlinkFeature)
1216
1138
        os.symlink(target, link_name)
1217
1139
        stat = os.lstat(link_name)
1218
1140
        expected_entries = [
1243
1165
        self._test_add_symlink_to_root_no_parents_all_data('a link', 'target')
1244
1166
 
1245
1167
    def test_add_symlink_unicode_to_root_no_parents_all_data(self):
1246
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
1168
        self.requireFeature(tests.UnicodeFilenameFeature)
1247
1169
        self._test_add_symlink_to_root_no_parents_all_data(
1248
1170
            u'\N{Euro Sign}link', u'targ\N{Euro Sign}et')
1249
1171
 
1347
1269
            tree1.unlock()
1348
1270
 
1349
1271
 
1350
 
class TestDirStateHashUpdates(TestCaseWithDirState):
1351
 
 
1352
 
    def do_update_entry(self, state, path):
1353
 
        entry = state._get_entry(0, path_utf8=path)
1354
 
        stat = os.lstat(path)
1355
 
        return dirstate.update_entry(state, entry, os.path.abspath(path), stat)
1356
 
 
1357
 
    def _read_state_content(self, state):
1358
 
        """Read the content of the dirstate file.
1359
 
 
1360
 
        On Windows when one process locks a file, you can't even open() the
1361
 
        file in another process (to read it). So we go directly to
1362
 
        state._state_file. This should always be the exact disk representation,
1363
 
        so it is reasonable to do so.
1364
 
        DirState also always seeks before reading, so it doesn't matter if we
1365
 
        bump the file pointer.
1366
 
        """
1367
 
        state._state_file.seek(0)
1368
 
        return state._state_file.read()
1369
 
 
1370
 
    def test_worth_saving_limit_avoids_writing(self):
1371
 
        tree = self.make_branch_and_tree('.')
1372
 
        self.build_tree(['c', 'd'])
1373
 
        tree.lock_write()
1374
 
        tree.add(['c', 'd'], ['c-id', 'd-id'])
1375
 
        tree.commit('add c and d')
1376
 
        state = InstrumentedDirState.on_file(tree.current_dirstate()._filename,
1377
 
                                             worth_saving_limit=2)
1378
 
        tree.unlock()
1379
 
        state.lock_write()
1380
 
        self.addCleanup(state.unlock)
1381
 
        state._read_dirblocks_if_needed()
1382
 
        state.adjust_time(+20) # Allow things to be cached
1383
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1384
 
                         state._dirblock_state)
1385
 
        content = self._read_state_content(state)
1386
 
        self.do_update_entry(state, 'c')
1387
 
        self.assertEqual(1, len(state._known_hash_changes))
1388
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
1389
 
                         state._dirblock_state)
1390
 
        state.save()
1391
 
        # It should not have set the state to IN_MEMORY_UNMODIFIED because the
1392
 
        # hash values haven't been written out.
1393
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
1394
 
                         state._dirblock_state)
1395
 
        self.assertEqual(content, self._read_state_content(state))
1396
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_HASH_MODIFIED,
1397
 
                         state._dirblock_state)
1398
 
        self.do_update_entry(state, 'd')
1399
 
        self.assertEqual(2, len(state._known_hash_changes))
1400
 
        state.save()
1401
 
        self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1402
 
                         state._dirblock_state)
1403
 
        self.assertEqual(0, len(state._known_hash_changes))
1404
 
 
1405
 
 
1406
1272
class TestGetLines(TestCaseWithDirState):
1407
1273
 
1408
1274
    def test_get_line_with_2_rows(self):
1801
1667
class InstrumentedDirState(dirstate.DirState):
1802
1668
    """An DirState with instrumented sha1 functionality."""
1803
1669
 
1804
 
    def __init__(self, path, sha1_provider, worth_saving_limit=0):
1805
 
        super(InstrumentedDirState, self).__init__(path, sha1_provider,
1806
 
            worth_saving_limit=worth_saving_limit)
 
1670
    def __init__(self, path, sha1_provider):
 
1671
        super(InstrumentedDirState, self).__init__(path, sha1_provider)
1807
1672
        self._time_offset = 0
1808
1673
        self._log = []
1809
1674
        # member is dynamically set in DirState.__init__ to turn on trace
2438
2303
        self.assertTrue(len(statvalue) >= 10)
2439
2304
        self.assertEqual(len(text), statvalue.st_size)
2440
2305
        self.assertEqual(expected_sha, sha1)
2441
 
 
2442
 
 
2443
 
class _Repo(object):
2444
 
    """A minimal api to get InventoryRevisionTree to work."""
2445
 
 
2446
 
    def __init__(self):
2447
 
        default_format = bzrdir.format_registry.make_bzrdir('default')
2448
 
        self._format = default_format.repository_format
2449
 
 
2450
 
    def lock_read(self):
2451
 
        pass
2452
 
 
2453
 
    def unlock(self):
2454
 
        pass
2455
 
 
2456
 
 
2457
 
class TestUpdateBasisByDelta(tests.TestCase):
2458
 
 
2459
 
    def path_to_ie(self, path, file_id, rev_id, dir_ids):
2460
 
        if path.endswith('/'):
2461
 
            is_dir = True
2462
 
            path = path[:-1]
2463
 
        else:
2464
 
            is_dir = False
2465
 
        dirname, basename = osutils.split(path)
2466
 
        try:
2467
 
            dir_id = dir_ids[dirname]
2468
 
        except KeyError:
2469
 
            dir_id = osutils.basename(dirname) + '-id'
2470
 
        if is_dir:
2471
 
            ie = inventory.InventoryDirectory(file_id, basename, dir_id)
2472
 
            dir_ids[path] = file_id
2473
 
        else:
2474
 
            ie = inventory.InventoryFile(file_id, basename, dir_id)
2475
 
            ie.text_size = 0
2476
 
            ie.text_sha1 = ''
2477
 
        ie.revision = rev_id
2478
 
        return ie
2479
 
 
2480
 
    def create_tree_from_shape(self, rev_id, shape):
2481
 
        dir_ids = {'': 'root-id'}
2482
 
        inv = inventory.Inventory('root-id', rev_id)
2483
 
        for path, file_id in shape:
2484
 
            if path == '':
2485
 
                # Replace the root entry
2486
 
                del inv._byid[inv.root.file_id]
2487
 
                inv.root.file_id = file_id
2488
 
                inv._byid[file_id] = inv.root
2489
 
                dir_ids[''] = file_id
2490
 
                continue
2491
 
            inv.add(self.path_to_ie(path, file_id, rev_id, dir_ids))
2492
 
        return revisiontree.InventoryRevisionTree(_Repo(), inv, rev_id)
2493
 
 
2494
 
    def create_empty_dirstate(self):
2495
 
        fd, path = tempfile.mkstemp(prefix='bzr-dirstate')
2496
 
        self.addCleanup(os.remove, path)
2497
 
        os.close(fd)
2498
 
        state = dirstate.DirState.initialize(path)
2499
 
        self.addCleanup(state.unlock)
2500
 
        return state
2501
 
 
2502
 
    def create_inv_delta(self, delta, rev_id):
2503
 
        """Translate a 'delta shape' into an actual InventoryDelta"""
2504
 
        dir_ids = {'': 'root-id'}
2505
 
        inv_delta = []
2506
 
        for old_path, new_path, file_id in delta:
2507
 
            if old_path is not None and old_path.endswith('/'):
2508
 
                # Don't have to actually do anything for this, because only
2509
 
                # new_path creates InventoryEntries
2510
 
                old_path = old_path[:-1]
2511
 
            if new_path is None: # Delete
2512
 
                inv_delta.append((old_path, None, file_id, None))
2513
 
                continue
2514
 
            ie = self.path_to_ie(new_path, file_id, rev_id, dir_ids)
2515
 
            inv_delta.append((old_path, new_path, file_id, ie))
2516
 
        return inv_delta
2517
 
 
2518
 
    def assertUpdate(self, active, basis, target):
2519
 
        """Assert that update_basis_by_delta works how we want.
2520
 
 
2521
 
        Set up a DirState object with active_shape for tree 0, basis_shape for
2522
 
        tree 1. Then apply the delta from basis_shape to target_shape,
2523
 
        and assert that the DirState is still valid, and that its stored
2524
 
        content matches the target_shape.
2525
 
        """
2526
 
        active_tree = self.create_tree_from_shape('active', active)
2527
 
        basis_tree = self.create_tree_from_shape('basis', basis)
2528
 
        target_tree = self.create_tree_from_shape('target', target)
2529
 
        state = self.create_empty_dirstate()
2530
 
        state.set_state_from_scratch(active_tree.inventory,
2531
 
            [('basis', basis_tree)], [])
2532
 
        delta = target_tree.inventory._make_delta(basis_tree.inventory)
2533
 
        state.update_basis_by_delta(delta, 'target')
2534
 
        state._validate()
2535
 
        dirstate_tree = workingtree_4.DirStateRevisionTree(state,
2536
 
            'target', _Repo())
2537
 
        # The target now that delta has been applied should match the
2538
 
        # RevisionTree
2539
 
        self.assertEqual([], list(dirstate_tree.iter_changes(target_tree)))
2540
 
        # And the dirblock state should be identical to the state if we created
2541
 
        # it from scratch.
2542
 
        state2 = self.create_empty_dirstate()
2543
 
        state2.set_state_from_scratch(active_tree.inventory,
2544
 
            [('target', target_tree)], [])
2545
 
        self.assertEqual(state2._dirblocks, state._dirblocks)
2546
 
        return state
2547
 
 
2548
 
    def assertBadDelta(self, active, basis, delta):
2549
 
        """Test that we raise InconsistentDelta when appropriate.
2550
 
 
2551
 
        :param active: The active tree shape
2552
 
        :param basis: The basis tree shape
2553
 
        :param delta: A description of the delta to apply. Similar to the form
2554
 
            for regular inventory deltas, but omitting the InventoryEntry.
2555
 
            So adding a file is: (None, 'path', 'file-id')
2556
 
            Adding a directory is: (None, 'path/', 'dir-id')
2557
 
            Renaming a dir is: ('old/', 'new/', 'dir-id')
2558
 
            etc.
2559
 
        """
2560
 
        active_tree = self.create_tree_from_shape('active', active)
2561
 
        basis_tree = self.create_tree_from_shape('basis', basis)
2562
 
        inv_delta = self.create_inv_delta(delta, 'target')
2563
 
        state = self.create_empty_dirstate()
2564
 
        state.set_state_from_scratch(active_tree.inventory,
2565
 
            [('basis', basis_tree)], [])
2566
 
        self.assertRaises(errors.InconsistentDelta,
2567
 
            state.update_basis_by_delta, inv_delta, 'target')
2568
 
        ## try:
2569
 
        ##     state.update_basis_by_delta(inv_delta, 'target')
2570
 
        ## except errors.InconsistentDelta, e:
2571
 
        ##     import pdb; pdb.set_trace()
2572
 
        ## else:
2573
 
        ##     import pdb; pdb.set_trace()
2574
 
        self.assertTrue(state._changes_aborted)
2575
 
 
2576
 
    def test_remove_file_matching_active_state(self):
2577
 
        state = self.assertUpdate(
2578
 
            active=[],
2579
 
            basis =[('file', 'file-id')],
2580
 
            target=[],
2581
 
            )
2582
 
 
2583
 
    def test_remove_file_present_in_active_state(self):
2584
 
        state = self.assertUpdate(
2585
 
            active=[('file', 'file-id')],
2586
 
            basis =[('file', 'file-id')],
2587
 
            target=[],
2588
 
            )
2589
 
 
2590
 
    def test_remove_file_present_elsewhere_in_active_state(self):
2591
 
        state = self.assertUpdate(
2592
 
            active=[('other-file', 'file-id')],
2593
 
            basis =[('file', 'file-id')],
2594
 
            target=[],
2595
 
            )
2596
 
 
2597
 
    def test_remove_file_active_state_has_diff_file(self):
2598
 
        state = self.assertUpdate(
2599
 
            active=[('file', 'file-id-2')],
2600
 
            basis =[('file', 'file-id')],
2601
 
            target=[],
2602
 
            )
2603
 
 
2604
 
    def test_remove_file_active_state_has_diff_file_and_file_elsewhere(self):
2605
 
        state = self.assertUpdate(
2606
 
            active=[('file', 'file-id-2'),
2607
 
                    ('other-file', 'file-id')],
2608
 
            basis =[('file', 'file-id')],
2609
 
            target=[],
2610
 
            )
2611
 
 
2612
 
    def test_add_file_matching_active_state(self):
2613
 
        state = self.assertUpdate(
2614
 
            active=[('file', 'file-id')],
2615
 
            basis =[],
2616
 
            target=[('file', 'file-id')],
2617
 
            )
2618
 
 
2619
 
    def test_add_file_missing_in_active_state(self):
2620
 
        state = self.assertUpdate(
2621
 
            active=[],
2622
 
            basis =[],
2623
 
            target=[('file', 'file-id')],
2624
 
            )
2625
 
 
2626
 
    def test_add_file_elsewhere_in_active_state(self):
2627
 
        state = self.assertUpdate(
2628
 
            active=[('other-file', 'file-id')],
2629
 
            basis =[],
2630
 
            target=[('file', 'file-id')],
2631
 
            )
2632
 
 
2633
 
    def test_add_file_active_state_has_diff_file_and_file_elsewhere(self):
2634
 
        state = self.assertUpdate(
2635
 
            active=[('other-file', 'file-id'),
2636
 
                    ('file', 'file-id-2')],
2637
 
            basis =[],
2638
 
            target=[('file', 'file-id')],
2639
 
            )
2640
 
 
2641
 
    def test_rename_file_matching_active_state(self):
2642
 
        state = self.assertUpdate(
2643
 
            active=[('other-file', 'file-id')],
2644
 
            basis =[('file', 'file-id')],
2645
 
            target=[('other-file', 'file-id')],
2646
 
            )
2647
 
 
2648
 
    def test_rename_file_missing_in_active_state(self):
2649
 
        state = self.assertUpdate(
2650
 
            active=[],
2651
 
            basis =[('file', 'file-id')],
2652
 
            target=[('other-file', 'file-id')],
2653
 
            )
2654
 
 
2655
 
    def test_rename_file_present_elsewhere_in_active_state(self):
2656
 
        state = self.assertUpdate(
2657
 
            active=[('third', 'file-id')],
2658
 
            basis =[('file', 'file-id')],
2659
 
            target=[('other-file', 'file-id')],
2660
 
            )
2661
 
 
2662
 
    def test_rename_file_active_state_has_diff_source_file(self):
2663
 
        state = self.assertUpdate(
2664
 
            active=[('file', 'file-id-2')],
2665
 
            basis =[('file', 'file-id')],
2666
 
            target=[('other-file', 'file-id')],
2667
 
            )
2668
 
 
2669
 
    def test_rename_file_active_state_has_diff_target_file(self):
2670
 
        state = self.assertUpdate(
2671
 
            active=[('other-file', 'file-id-2')],
2672
 
            basis =[('file', 'file-id')],
2673
 
            target=[('other-file', 'file-id')],
2674
 
            )
2675
 
 
2676
 
    def test_rename_file_active_has_swapped_files(self):
2677
 
        state = self.assertUpdate(
2678
 
            active=[('file', 'file-id'),
2679
 
                    ('other-file', 'file-id-2')],
2680
 
            basis= [('file', 'file-id'),
2681
 
                    ('other-file', 'file-id-2')],
2682
 
            target=[('file', 'file-id-2'),
2683
 
                    ('other-file', 'file-id')])
2684
 
 
2685
 
    def test_rename_file_basis_has_swapped_files(self):
2686
 
        state = self.assertUpdate(
2687
 
            active=[('file', 'file-id'),
2688
 
                    ('other-file', 'file-id-2')],
2689
 
            basis= [('file', 'file-id-2'),
2690
 
                    ('other-file', 'file-id')],
2691
 
            target=[('file', 'file-id'),
2692
 
                    ('other-file', 'file-id-2')])
2693
 
 
2694
 
    def test_rename_directory_with_contents(self):
2695
 
        state = self.assertUpdate( # active matches basis
2696
 
            active=[('dir1/', 'dir-id'),
2697
 
                    ('dir1/file', 'file-id')],
2698
 
            basis= [('dir1/', 'dir-id'),
2699
 
                    ('dir1/file', 'file-id')],
2700
 
            target=[('dir2/', 'dir-id'),
2701
 
                    ('dir2/file', 'file-id')])
2702
 
        state = self.assertUpdate( # active matches target
2703
 
            active=[('dir2/', 'dir-id'),
2704
 
                    ('dir2/file', 'file-id')],
2705
 
            basis= [('dir1/', 'dir-id'),
2706
 
                    ('dir1/file', 'file-id')],
2707
 
            target=[('dir2/', 'dir-id'),
2708
 
                    ('dir2/file', 'file-id')])
2709
 
        state = self.assertUpdate( # active empty
2710
 
            active=[],
2711
 
            basis= [('dir1/', 'dir-id'),
2712
 
                    ('dir1/file', 'file-id')],
2713
 
            target=[('dir2/', 'dir-id'),
2714
 
                    ('dir2/file', 'file-id')])
2715
 
        state = self.assertUpdate( # active present at other location
2716
 
            active=[('dir3/', 'dir-id'),
2717
 
                    ('dir3/file', 'file-id')],
2718
 
            basis= [('dir1/', 'dir-id'),
2719
 
                    ('dir1/file', 'file-id')],
2720
 
            target=[('dir2/', 'dir-id'),
2721
 
                    ('dir2/file', 'file-id')])
2722
 
        state = self.assertUpdate( # active has different ids
2723
 
            active=[('dir1/', 'dir1-id'),
2724
 
                    ('dir1/file', 'file1-id'),
2725
 
                    ('dir2/', 'dir2-id'),
2726
 
                    ('dir2/file', 'file2-id')],
2727
 
            basis= [('dir1/', 'dir-id'),
2728
 
                    ('dir1/file', 'file-id')],
2729
 
            target=[('dir2/', 'dir-id'),
2730
 
                    ('dir2/file', 'file-id')])
2731
 
 
2732
 
    def test_invalid_file_not_present(self):
2733
 
        state = self.assertBadDelta(
2734
 
            active=[('file', 'file-id')],
2735
 
            basis= [('file', 'file-id')],
2736
 
            delta=[('other-file', 'file', 'file-id')])
2737
 
 
2738
 
    def test_invalid_new_id_same_path(self):
2739
 
        # The bad entry comes after
2740
 
        state = self.assertBadDelta(
2741
 
            active=[('file', 'file-id')],
2742
 
            basis= [('file', 'file-id')],
2743
 
            delta=[(None, 'file', 'file-id-2')])
2744
 
        # The bad entry comes first
2745
 
        state = self.assertBadDelta(
2746
 
            active=[('file', 'file-id-2')],
2747
 
            basis=[('file', 'file-id-2')],
2748
 
            delta=[(None, 'file', 'file-id')])
2749
 
 
2750
 
    def test_invalid_existing_id(self):
2751
 
        state = self.assertBadDelta(
2752
 
            active=[('file', 'file-id')],
2753
 
            basis= [('file', 'file-id')],
2754
 
            delta=[(None, 'file', 'file-id')])
2755
 
 
2756
 
    def test_invalid_parent_missing(self):
2757
 
        state = self.assertBadDelta(
2758
 
            active=[],
2759
 
            basis= [],
2760
 
            delta=[(None, 'path/path2', 'file-id')])
2761
 
        # Note: we force the active tree to have the directory, by knowing how
2762
 
        #       path_to_ie handles entries with missing parents
2763
 
        state = self.assertBadDelta(
2764
 
            active=[('path/', 'path-id')],
2765
 
            basis= [],
2766
 
            delta=[(None, 'path/path2', 'file-id')])
2767
 
        state = self.assertBadDelta(
2768
 
            active=[('path/', 'path-id'),
2769
 
                    ('path/path2', 'file-id')],
2770
 
            basis= [],
2771
 
            delta=[(None, 'path/path2', 'file-id')])
2772
 
 
2773
 
    def test_renamed_dir_same_path(self):
2774
 
        # We replace the parent directory, with another parent dir. But the C
2775
 
        # file doesn't look like it has been moved.
2776
 
        state = self.assertUpdate(# Same as basis
2777
 
            active=[('dir/', 'A-id'),
2778
 
                    ('dir/B', 'B-id')],
2779
 
            basis= [('dir/', 'A-id'),
2780
 
                    ('dir/B', 'B-id')],
2781
 
            target=[('dir/', 'C-id'),
2782
 
                    ('dir/B', 'B-id')])
2783
 
        state = self.assertUpdate(# Same as target
2784
 
            active=[('dir/', 'C-id'),
2785
 
                    ('dir/B', 'B-id')],
2786
 
            basis= [('dir/', 'A-id'),
2787
 
                    ('dir/B', 'B-id')],
2788
 
            target=[('dir/', 'C-id'),
2789
 
                    ('dir/B', 'B-id')])
2790
 
        state = self.assertUpdate(# empty active
2791
 
            active=[],
2792
 
            basis= [('dir/', 'A-id'),
2793
 
                    ('dir/B', 'B-id')],
2794
 
            target=[('dir/', 'C-id'),
2795
 
                    ('dir/B', 'B-id')])
2796
 
        state = self.assertUpdate(# different active
2797
 
            active=[('dir/', 'D-id'),
2798
 
                    ('dir/B', 'B-id')],
2799
 
            basis= [('dir/', 'A-id'),
2800
 
                    ('dir/B', 'B-id')],
2801
 
            target=[('dir/', 'C-id'),
2802
 
                    ('dir/B', 'B-id')])
2803
 
 
2804
 
    def test_parent_child_swap(self):
2805
 
        state = self.assertUpdate(# Same as basis
2806
 
            active=[('A/', 'A-id'),
2807
 
                    ('A/B/', 'B-id'),
2808
 
                    ('A/B/C', 'C-id')],
2809
 
            basis= [('A/', 'A-id'),
2810
 
                    ('A/B/', 'B-id'),
2811
 
                    ('A/B/C', 'C-id')],
2812
 
            target=[('A/', 'B-id'),
2813
 
                    ('A/B/', 'A-id'),
2814
 
                    ('A/B/C', 'C-id')])
2815
 
        state = self.assertUpdate(# Same as target
2816
 
            active=[('A/', 'B-id'),
2817
 
                    ('A/B/', 'A-id'),
2818
 
                    ('A/B/C', 'C-id')],
2819
 
            basis= [('A/', 'A-id'),
2820
 
                    ('A/B/', 'B-id'),
2821
 
                    ('A/B/C', 'C-id')],
2822
 
            target=[('A/', 'B-id'),
2823
 
                    ('A/B/', 'A-id'),
2824
 
                    ('A/B/C', 'C-id')])
2825
 
        state = self.assertUpdate(# empty active
2826
 
            active=[],
2827
 
            basis= [('A/', 'A-id'),
2828
 
                    ('A/B/', 'B-id'),
2829
 
                    ('A/B/C', 'C-id')],
2830
 
            target=[('A/', 'B-id'),
2831
 
                    ('A/B/', 'A-id'),
2832
 
                    ('A/B/C', 'C-id')])
2833
 
        state = self.assertUpdate(# different active
2834
 
            active=[('D/', 'A-id'),
2835
 
                    ('D/E/', 'B-id'),
2836
 
                    ('F', 'C-id')],
2837
 
            basis= [('A/', 'A-id'),
2838
 
                    ('A/B/', 'B-id'),
2839
 
                    ('A/B/C', 'C-id')],
2840
 
            target=[('A/', 'B-id'),
2841
 
                    ('A/B/', 'A-id'),
2842
 
                    ('A/B/C', 'C-id')])
2843
 
 
2844
 
    def test_change_root_id(self):
2845
 
        state = self.assertUpdate( # same as basis
2846
 
            active=[('', 'root-id'),
2847
 
                    ('file', 'file-id')],
2848
 
            basis= [('', 'root-id'),
2849
 
                    ('file', 'file-id')],
2850
 
            target=[('', 'target-root-id'),
2851
 
                    ('file', 'file-id')])
2852
 
        state = self.assertUpdate( # same as target
2853
 
            active=[('', 'target-root-id'),
2854
 
                    ('file', 'file-id')],
2855
 
            basis= [('', 'root-id'),
2856
 
                    ('file', 'file-id')],
2857
 
            target=[('', 'target-root-id'),
2858
 
                    ('file', 'root-id')])
2859
 
        state = self.assertUpdate( # all different
2860
 
            active=[('', 'active-root-id'),
2861
 
                    ('file', 'file-id')],
2862
 
            basis= [('', 'root-id'),
2863
 
                    ('file', 'file-id')],
2864
 
            target=[('', 'target-root-id'),
2865
 
                    ('file', 'root-id')])
2866
 
 
2867
 
    def test_change_file_absent_in_active(self):
2868
 
        state = self.assertUpdate(
2869
 
            active=[],
2870
 
            basis= [('file', 'file-id')],
2871
 
            target=[('file', 'file-id')])
2872
 
 
2873
 
    def test_invalid_changed_file(self):
2874
 
        state = self.assertBadDelta( # Not present in basis
2875
 
            active=[('file', 'file-id')],
2876
 
            basis= [],
2877
 
            delta=[('file', 'file', 'file-id')])
2878
 
        state = self.assertBadDelta( # present at another location in basis
2879
 
            active=[('file', 'file-id')],
2880
 
            basis= [('other-file', 'file-id')],
2881
 
            delta=[('file', 'file', 'file-id')])