767
686
# This will unlock it
768
687
self.check_state_with_reopen(expected_result, state)
770
def test_set_state_from_scratch_no_parents(self):
771
tree1, revid1 = self.make_minimal_tree()
772
inv = tree1.inventory
773
root_id = inv.path2id('')
774
expected_result = [], [
775
(('', '', root_id), [
776
('d', '', 0, False, dirstate.DirState.NULLSTAT)])]
777
state = dirstate.DirState.initialize('dirstate')
779
state.set_state_from_scratch(inv, [], [])
780
self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
782
self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
783
state._dirblock_state)
788
# This will unlock it
789
self.check_state_with_reopen(expected_result, state)
791
def test_set_state_from_scratch_identical_parent(self):
792
tree1, revid1 = self.make_minimal_tree()
793
inv = tree1.inventory
794
root_id = inv.path2id('')
795
rev_tree1 = tree1.branch.repository.revision_tree(revid1)
796
d_entry = ('d', '', 0, False, dirstate.DirState.NULLSTAT)
797
parent_entry = ('d', '', 0, False, revid1)
798
expected_result = [revid1], [
799
(('', '', root_id), [d_entry, parent_entry])]
800
state = dirstate.DirState.initialize('dirstate')
802
state.set_state_from_scratch(inv, [(revid1, rev_tree1)], [])
803
self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
805
self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
806
state._dirblock_state)
811
# This will unlock it
812
self.check_state_with_reopen(expected_result, state)
814
def test_set_state_from_inventory_preserves_hashcache(self):
815
# https://bugs.launchpad.net/bzr/+bug/146176
816
# set_state_from_inventory should preserve the stat and hash value for
817
# workingtree files that are not changed by the inventory.
819
tree = self.make_branch_and_tree('.')
820
# depends on the default format using dirstate...
823
# make a dirstate with some valid hashcache data
824
# file on disk, but that's not needed for this test
825
foo_contents = 'contents of foo'
826
self.build_tree_contents([('foo', foo_contents)])
827
tree.add('foo', 'foo-id')
829
foo_stat = os.stat('foo')
830
foo_packed = dirstate.pack_stat(foo_stat)
831
foo_sha = osutils.sha_string(foo_contents)
832
foo_size = len(foo_contents)
834
# should not be cached yet, because the file's too fresh
836
(('', 'foo', 'foo-id',),
837
[('f', '', 0, False, dirstate.DirState.NULLSTAT)]),
838
tree._dirstate._get_entry(0, 'foo-id'))
839
# poke in some hashcache information - it wouldn't normally be
840
# stored because it's too fresh
841
tree._dirstate.update_minimal(
842
('', 'foo', 'foo-id'),
843
'f', False, foo_sha, foo_packed, foo_size, 'foo')
844
# now should be cached
846
(('', 'foo', 'foo-id',),
847
[('f', foo_sha, foo_size, False, foo_packed)]),
848
tree._dirstate._get_entry(0, 'foo-id'))
850
# extract the inventory, and add something to it
851
inv = tree._get_inventory()
852
# should see the file we poked in...
853
self.assertTrue(inv.has_id('foo-id'))
854
self.assertTrue(inv.has_filename('foo'))
855
inv.add_path('bar', 'file', 'bar-id')
856
tree._dirstate._validate()
857
# this used to cause it to lose its hashcache
858
tree._dirstate.set_state_from_inventory(inv)
859
tree._dirstate._validate()
865
# now check that the state still has the original hashcache value
866
state = tree._dirstate
868
foo_tuple = state._get_entry(0, path_utf8='foo')
870
(('', 'foo', 'foo-id',),
871
[('f', foo_sha, len(foo_contents), False,
872
dirstate.pack_stat(foo_stat))]),
877
def test_set_state_from_inventory_mixed_paths(self):
878
tree1 = self.make_branch_and_tree('tree1')
879
self.build_tree(['tree1/a/', 'tree1/a/b/', 'tree1/a-b/',
880
'tree1/a/b/foo', 'tree1/a-b/bar'])
883
tree1.add(['a', 'a/b', 'a-b', 'a/b/foo', 'a-b/bar'],
884
['a-id', 'b-id', 'a-b-id', 'foo-id', 'bar-id'])
885
tree1.commit('rev1', rev_id='rev1')
886
root_id = tree1.get_root_id()
887
inv = tree1.inventory
890
expected_result1 = [('', '', root_id, 'd'),
891
('', 'a', 'a-id', 'd'),
892
('', 'a-b', 'a-b-id', 'd'),
893
('a', 'b', 'b-id', 'd'),
894
('a/b', 'foo', 'foo-id', 'f'),
895
('a-b', 'bar', 'bar-id', 'f'),
897
expected_result2 = [('', '', root_id, 'd'),
898
('', 'a', 'a-id', 'd'),
899
('', 'a-b', 'a-b-id', 'd'),
900
('a-b', 'bar', 'bar-id', 'f'),
902
state = dirstate.DirState.initialize('dirstate')
904
state.set_state_from_inventory(inv)
906
for entry in state._iter_entries():
907
values.append(entry[0] + entry[1][0][:1])
908
self.assertEqual(expected_result1, values)
910
state.set_state_from_inventory(inv)
912
for entry in state._iter_entries():
913
values.append(entry[0] + entry[1][0][:1])
914
self.assertEqual(expected_result2, values)
918
689
def test_set_path_id_no_parents(self):
919
690
"""The id of a path can be changed trivally with no parents."""
920
691
state = dirstate.DirState.initialize('dirstate')
922
693
# check precondition to be sure the state does change appropriately.
923
root_entry = (('', '', 'TREE_ROOT'), [('d', '', 0, False, 'x'*32)])
924
self.assertEqual([root_entry], list(state._iter_entries()))
925
self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
926
self.assertEqual(root_entry,
927
state._get_entry(0, fileid_utf8='TREE_ROOT'))
928
self.assertEqual((None, None),
929
state._get_entry(0, fileid_utf8='second-root-id'))
930
state.set_path_id('', 'second-root-id')
931
new_root_entry = (('', '', 'second-root-id'),
932
[('d', '', 0, False, 'x'*32)])
933
expected_rows = [new_root_entry]
695
[(('', '', 'TREE_ROOT'), [('d', '', 0, False,
696
'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])],
697
list(state._iter_entries()))
698
state.set_path_id('', 'foobarbaz')
700
(('', '', 'foobarbaz'), [('d', '', 0, False,
701
'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])]
934
702
self.assertEqual(expected_rows, list(state._iter_entries()))
935
self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
936
self.assertEqual(new_root_entry,
937
state._get_entry(0, fileid_utf8='second-root-id'))
938
self.assertEqual((None, None),
939
state._get_entry(0, fileid_utf8='TREE_ROOT'))
940
703
# should work across save too
960
723
state._validate()
962
725
state.set_parent_trees([('parent-revid', rt)], ghosts=[])
963
root_entry = (('', '', 'TREE_ROOT'),
964
[('d', '', 0, False, 'x'*32),
965
('d', '', 0, False, 'parent-revid')])
966
self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
967
self.assertEqual(root_entry,
968
state._get_entry(0, fileid_utf8='TREE_ROOT'))
969
self.assertEqual((None, None),
970
state._get_entry(0, fileid_utf8='Asecond-root-id'))
971
state.set_path_id('', 'Asecond-root-id')
726
state.set_path_id('', 'foobarbaz')
972
727
state._validate()
973
728
# now see that it is what we expected
974
old_root_entry = (('', '', 'TREE_ROOT'),
975
[('a', '', 0, False, ''),
976
('d', '', 0, False, 'parent-revid')])
977
new_root_entry = (('', '', 'Asecond-root-id'),
978
[('d', '', 0, False, ''),
979
('a', '', 0, False, '')])
980
expected_rows = [new_root_entry, old_root_entry]
730
(('', '', 'TREE_ROOT'),
731
[('a', '', 0, False, ''),
732
('d', '', 0, False, 'parent-revid'),
734
(('', '', 'foobarbaz'),
735
[('d', '', 0, False, ''),
736
('a', '', 0, False, ''),
981
739
state._validate()
982
740
self.assertEqual(expected_rows, list(state._iter_entries()))
983
self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
984
self.assertEqual(old_root_entry, state._get_entry(1, path_utf8=''))
985
self.assertEqual((None, None),
986
state._get_entry(0, fileid_utf8='TREE_ROOT'))
987
self.assertEqual(old_root_entry,
988
state._get_entry(1, fileid_utf8='TREE_ROOT'))
989
self.assertEqual(new_root_entry,
990
state._get_entry(0, fileid_utf8='Asecond-root-id'))
991
self.assertEqual((None, None),
992
state._get_entry(1, fileid_utf8='Asecond-root-id'))
993
741
# should work across save too
1559
class TestIterChildEntries(TestCaseWithDirState):
1561
def create_dirstate_with_two_trees(self):
1562
"""This dirstate contains multiple files and directories.
1572
b/h\xc3\xa5 h-\xc3\xa5-file #This is u'\xe5' encoded into utf-8
1574
Notice that a/e is an empty directory.
1576
There is one parent tree, which has the same shape with the following variations:
1577
b/g in the parent is gone.
1578
b/h in the parent has a different id
1579
b/i is new in the parent
1580
c is renamed to b/j in the parent
1582
:return: The dirstate, still write-locked.
1584
packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
1585
null_sha = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
1586
NULL_PARENT_DETAILS = dirstate.DirState.NULL_PARENT_DETAILS
1587
root_entry = ('', '', 'a-root-value'), [
1588
('d', '', 0, False, packed_stat),
1589
('d', '', 0, False, 'parent-revid'),
1591
a_entry = ('', 'a', 'a-dir'), [
1592
('d', '', 0, False, packed_stat),
1593
('d', '', 0, False, 'parent-revid'),
1595
b_entry = ('', 'b', 'b-dir'), [
1596
('d', '', 0, False, packed_stat),
1597
('d', '', 0, False, 'parent-revid'),
1599
c_entry = ('', 'c', 'c-file'), [
1600
('f', null_sha, 10, False, packed_stat),
1601
('r', 'b/j', 0, False, ''),
1603
d_entry = ('', 'd', 'd-file'), [
1604
('f', null_sha, 20, False, packed_stat),
1605
('f', 'd', 20, False, 'parent-revid'),
1607
e_entry = ('a', 'e', 'e-dir'), [
1608
('d', '', 0, False, packed_stat),
1609
('d', '', 0, False, 'parent-revid'),
1611
f_entry = ('a', 'f', 'f-file'), [
1612
('f', null_sha, 30, False, packed_stat),
1613
('f', 'f', 20, False, 'parent-revid'),
1615
g_entry = ('b', 'g', 'g-file'), [
1616
('f', null_sha, 30, False, packed_stat),
1617
NULL_PARENT_DETAILS,
1619
h_entry1 = ('b', 'h\xc3\xa5', 'h-\xc3\xa5-file1'), [
1620
('f', null_sha, 40, False, packed_stat),
1621
NULL_PARENT_DETAILS,
1623
h_entry2 = ('b', 'h\xc3\xa5', 'h-\xc3\xa5-file2'), [
1624
NULL_PARENT_DETAILS,
1625
('f', 'h', 20, False, 'parent-revid'),
1627
i_entry = ('b', 'i', 'i-file'), [
1628
NULL_PARENT_DETAILS,
1629
('f', 'h', 20, False, 'parent-revid'),
1631
j_entry = ('b', 'j', 'c-file'), [
1632
('r', 'c', 0, False, ''),
1633
('f', 'j', 20, False, 'parent-revid'),
1636
dirblocks.append(('', [root_entry]))
1637
dirblocks.append(('', [a_entry, b_entry, c_entry, d_entry]))
1638
dirblocks.append(('a', [e_entry, f_entry]))
1639
dirblocks.append(('b', [g_entry, h_entry1, h_entry2, i_entry, j_entry]))
1640
state = dirstate.DirState.initialize('dirstate')
1643
state._set_data(['parent'], dirblocks)
1647
return state, dirblocks
1649
def test_iter_children_b(self):
1650
state, dirblocks = self.create_dirstate_with_two_trees()
1651
self.addCleanup(state.unlock)
1652
expected_result = []
1653
expected_result.append(dirblocks[3][1][2]) # h2
1654
expected_result.append(dirblocks[3][1][3]) # i
1655
expected_result.append(dirblocks[3][1][4]) # j
1656
self.assertEqual(expected_result,
1657
list(state._iter_child_entries(1, 'b')))
1659
def test_iter_child_root(self):
1660
state, dirblocks = self.create_dirstate_with_two_trees()
1661
self.addCleanup(state.unlock)
1662
expected_result = []
1663
expected_result.append(dirblocks[1][1][0]) # a
1664
expected_result.append(dirblocks[1][1][1]) # b
1665
expected_result.append(dirblocks[1][1][3]) # d
1666
expected_result.append(dirblocks[2][1][0]) # e
1667
expected_result.append(dirblocks[2][1][1]) # f
1668
expected_result.append(dirblocks[3][1][2]) # h2
1669
expected_result.append(dirblocks[3][1][3]) # i
1670
expected_result.append(dirblocks[3][1][4]) # j
1671
self.assertEqual(expected_result,
1672
list(state._iter_child_entries(1, '')))
1675
class TestDirstateSortOrder(tests.TestCaseWithTransport):
1278
class TestDirstateSortOrder(TestCaseWithTransport):
1676
1279
"""Test that DirState adds entries in the right order."""
1678
1281
def test_add_sorting(self):
1788
1388
self.st_ino = ino
1789
1389
self.st_mode = mode
1793
return _FakeStat(st.st_size, st.st_mtime, st.st_ctime, st.st_dev,
1794
st.st_ino, st.st_mode)
1797
class TestPackStat(tests.TestCaseWithTransport):
1392
class TestUpdateEntry(TestCaseWithDirState):
1393
"""Test the DirState.update_entry functions"""
1395
def get_state_with_a(self):
1396
"""Create a DirState tracking a single object named 'a'"""
1397
state = InstrumentedDirState.initialize('dirstate')
1398
self.addCleanup(state.unlock)
1399
state.add('a', 'a-id', 'file', None, '')
1400
entry = state._get_entry(0, path_utf8='a')
1403
def test_update_entry(self):
1404
state, entry = self.get_state_with_a()
1405
self.build_tree(['a'])
1406
# Add one where we don't provide the stat or sha already
1407
self.assertEqual(('', 'a', 'a-id'), entry[0])
1408
self.assertEqual([('f', '', 0, False, dirstate.DirState.NULLSTAT)],
1410
# Flush the buffers to disk
1412
self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1413
state._dirblock_state)
1415
stat_value = os.lstat('a')
1416
packed_stat = dirstate.pack_stat(stat_value)
1417
link_or_sha1 = state.update_entry(entry, abspath='a',
1418
stat_value=stat_value)
1419
self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
1422
# The dirblock entry should be updated with the new info
1423
self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
1425
self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
1426
state._dirblock_state)
1427
mode = stat_value.st_mode
1428
self.assertEqual([('sha1', 'a'), ('is_exec', mode, False)], state._log)
1431
self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1432
state._dirblock_state)
1434
# If we do it again right away, we don't know if the file has changed
1435
# so we will re-read the file. Roll the clock back so the file is
1436
# guaranteed to look too new.
1437
state.adjust_time(-10)
1439
link_or_sha1 = state.update_entry(entry, abspath='a',
1440
stat_value=stat_value)
1441
self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
1442
('sha1', 'a'), ('is_exec', mode, False),
1444
self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
1446
self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
1447
state._dirblock_state)
1450
# However, if we move the clock forward so the file is considered
1451
# "stable", it should just returned the cached value.
1452
state.adjust_time(20)
1453
link_or_sha1 = state.update_entry(entry, abspath='a',
1454
stat_value=stat_value)
1455
self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
1457
self.assertEqual([('sha1', 'a'), ('is_exec', mode, False),
1458
('sha1', 'a'), ('is_exec', mode, False),
1461
def test_update_entry_no_stat_value(self):
1462
"""Passing the stat_value is optional."""
1463
state, entry = self.get_state_with_a()
1464
state.adjust_time(-10) # Make sure the file looks new
1465
self.build_tree(['a'])
1466
# Add one where we don't provide the stat or sha already
1467
link_or_sha1 = state.update_entry(entry, abspath='a')
1468
self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
1470
stat_value = os.lstat('a')
1471
self.assertEqual([('lstat', 'a'), ('sha1', 'a'),
1472
('is_exec', stat_value.st_mode, False),
1475
def test_update_entry_symlink(self):
1476
"""Update entry should read symlinks."""
1477
if not osutils.has_symlinks():
1478
# PlatformDeficiency / TestSkipped
1479
raise TestSkipped("No symlink support")
1480
state, entry = self.get_state_with_a()
1482
self.assertEqual(dirstate.DirState.IN_MEMORY_UNMODIFIED,
1483
state._dirblock_state)
1484
os.symlink('target', 'a')
1486
state.adjust_time(-10) # Make the symlink look new
1487
stat_value = os.lstat('a')
1488
packed_stat = dirstate.pack_stat(stat_value)
1489
link_or_sha1 = state.update_entry(entry, abspath='a',
1490
stat_value=stat_value)
1491
self.assertEqual('target', link_or_sha1)
1492
self.assertEqual([('read_link', 'a', '')], state._log)
1493
# Dirblock is updated
1494
self.assertEqual([('l', link_or_sha1, 6, False, packed_stat)],
1496
self.assertEqual(dirstate.DirState.IN_MEMORY_MODIFIED,
1497
state._dirblock_state)
1499
# Because the stat_value looks new, we should re-read the target
1500
link_or_sha1 = state.update_entry(entry, abspath='a',
1501
stat_value=stat_value)
1502
self.assertEqual('target', link_or_sha1)
1503
self.assertEqual([('read_link', 'a', ''),
1504
('read_link', 'a', 'target'),
1506
state.adjust_time(+20) # Skip into the future, all files look old
1507
link_or_sha1 = state.update_entry(entry, abspath='a',
1508
stat_value=stat_value)
1509
self.assertEqual('target', link_or_sha1)
1510
# There should not be a new read_link call.
1511
# (this is a weak assertion, because read_link is fairly inexpensive,
1512
# versus the number of symlinks that we would have)
1513
self.assertEqual([('read_link', 'a', ''),
1514
('read_link', 'a', 'target'),
1517
def test_update_entry_dir(self):
1518
state, entry = self.get_state_with_a()
1519
self.build_tree(['a/'])
1520
self.assertIs(None, state.update_entry(entry, 'a'))
1522
def create_and_test_file(self, state, entry):
1523
"""Create a file at 'a' and verify the state finds it.
1525
The state should already be versioning *something* at 'a'. This makes
1526
sure that state.update_entry recognizes it as a file.
1528
self.build_tree(['a'])
1529
stat_value = os.lstat('a')
1530
packed_stat = dirstate.pack_stat(stat_value)
1532
link_or_sha1 = state.update_entry(entry, abspath='a')
1533
self.assertEqual('b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6',
1535
self.assertEqual([('f', link_or_sha1, 14, False, packed_stat)],
1539
def create_and_test_dir(self, state, entry):
1540
"""Create a directory at 'a' and verify the state finds it.
1542
The state should already be versioning *something* at 'a'. This makes
1543
sure that state.update_entry recognizes it as a directory.
1545
self.build_tree(['a/'])
1546
stat_value = os.lstat('a')
1547
packed_stat = dirstate.pack_stat(stat_value)
1549
link_or_sha1 = state.update_entry(entry, abspath='a')
1550
self.assertIs(None, link_or_sha1)
1551
self.assertEqual([('d', '', 0, False, packed_stat)], entry[1])
1555
def create_and_test_symlink(self, state, entry):
1556
"""Create a symlink at 'a' and verify the state finds it.
1558
The state should already be versioning *something* at 'a'. This makes
1559
sure that state.update_entry recognizes it as a symlink.
1561
This should not be called if this platform does not have symlink
1564
# caller should care about skipping test on platforms without symlinks
1565
os.symlink('path/to/foo', 'a')
1567
stat_value = os.lstat('a')
1568
packed_stat = dirstate.pack_stat(stat_value)
1570
link_or_sha1 = state.update_entry(entry, abspath='a')
1571
self.assertEqual('path/to/foo', link_or_sha1)
1572
self.assertEqual([('l', 'path/to/foo', 11, False, packed_stat)],
1576
def test_update_missing_file(self):
1577
state, entry = self.get_state_with_a()
1578
packed_stat = self.create_and_test_file(state, entry)
1579
# Now if we delete the file, update_entry should recover and
1582
self.assertIs(None, state.update_entry(entry, abspath='a'))
1583
# And the record shouldn't be changed.
1584
digest = 'b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6'
1585
self.assertEqual([('f', digest, 14, False, packed_stat)],
1588
def test_update_missing_dir(self):
1589
state, entry = self.get_state_with_a()
1590
packed_stat = self.create_and_test_dir(state, entry)
1591
# Now if we delete the directory, update_entry should recover and
1594
self.assertIs(None, state.update_entry(entry, abspath='a'))
1595
self.assertEqual([('d', '', 0, False, packed_stat)], entry[1])
1597
def test_update_missing_symlink(self):
1598
if not osutils.has_symlinks():
1599
# PlatformDeficiency / TestSkipped
1600
raise TestSkipped("No symlink support")
1601
state, entry = self.get_state_with_a()
1602
packed_stat = self.create_and_test_symlink(state, entry)
1604
self.assertIs(None, state.update_entry(entry, abspath='a'))
1605
# And the record shouldn't be changed.
1606
self.assertEqual([('l', 'path/to/foo', 11, False, packed_stat)],
1609
def test_update_file_to_dir(self):
1610
"""If a file changes to a directory we return None for the sha.
1611
We also update the inventory record.
1613
state, entry = self.get_state_with_a()
1614
self.create_and_test_file(state, entry)
1616
self.create_and_test_dir(state, entry)
1618
def test_update_file_to_symlink(self):
1619
"""File becomes a symlink"""
1620
if not osutils.has_symlinks():
1621
# PlatformDeficiency / TestSkipped
1622
raise TestSkipped("No symlink support")
1623
state, entry = self.get_state_with_a()
1624
self.create_and_test_file(state, entry)
1626
self.create_and_test_symlink(state, entry)
1628
def test_update_dir_to_file(self):
1629
"""Directory becoming a file updates the entry."""
1630
state, entry = self.get_state_with_a()
1631
self.create_and_test_dir(state, entry)
1633
self.create_and_test_file(state, entry)
1635
def test_update_dir_to_symlink(self):
1636
"""Directory becomes a symlink"""
1637
if not osutils.has_symlinks():
1638
# PlatformDeficiency / TestSkipped
1639
raise TestSkipped("No symlink support")
1640
state, entry = self.get_state_with_a()
1641
self.create_and_test_dir(state, entry)
1643
self.create_and_test_symlink(state, entry)
1645
def test_update_symlink_to_file(self):
1646
"""Symlink becomes a file"""
1647
if not has_symlinks():
1648
raise TestSkipped("No symlink support")
1649
state, entry = self.get_state_with_a()
1650
self.create_and_test_symlink(state, entry)
1652
self.create_and_test_file(state, entry)
1654
def test_update_symlink_to_dir(self):
1655
"""Symlink becomes a directory"""
1656
if not has_symlinks():
1657
raise TestSkipped("No symlink support")
1658
state, entry = self.get_state_with_a()
1659
self.create_and_test_symlink(state, entry)
1661
self.create_and_test_dir(state, entry)
1663
def test__is_executable_win32(self):
1664
state, entry = self.get_state_with_a()
1665
self.build_tree(['a'])
1667
# Make sure we are using the win32 implementation of _is_executable
1668
state._is_executable = state._is_executable_win32
1670
# The file on disk is not executable, but we are marking it as though
1671
# it is. With _is_executable_win32 we ignore what is on disk.
1672
entry[1][0] = ('f', '', 0, True, dirstate.DirState.NULLSTAT)
1674
stat_value = os.lstat('a')
1675
packed_stat = dirstate.pack_stat(stat_value)
1677
state.adjust_time(-10) # Make sure everything is new
1678
# Make sure it wants to kkkkkkkk
1679
state.update_entry(entry, abspath='a', stat_value=stat_value)
1681
# The row is updated, but the executable bit stays set.
1682
digest = 'b50e5406bb5e153ebbeb20268fcf37c87e1ecfb6'
1683
self.assertEqual([('f', digest, 14, True, packed_stat)], entry[1])
1686
class TestPackStat(TestCaseWithTransport):
1799
1688
def assertPackStat(self, expected, stat_value):
1800
1689
"""Check the packed and serialized form of a stat value."""
1970
class TestBisectDirblock(TestCase):
1971
"""Test that bisect_dirblock() returns the expected values.
1973
bisect_dirblock is intended to work like bisect.bisect_left() except it
1974
knows it is working on dirblocks and that dirblocks are sorted by ('path',
1975
'to', 'foo') chunks rather than by raw 'path/to/foo'.
1978
def assertBisect(self, dirblocks, split_dirblocks, path, *args, **kwargs):
1979
"""Assert that bisect_split works like bisect_left on the split paths.
1981
:param dirblocks: A list of (path, [info]) pairs.
1982
:param split_dirblocks: A list of ((split, path), [info]) pairs.
1983
:param path: The path we are indexing.
1985
All other arguments will be passed along.
1987
bisect_split_idx = dirstate.bisect_dirblock(dirblocks, path,
1989
split_dirblock = (path.split('/'), [])
1990
bisect_left_idx = bisect.bisect_left(split_dirblocks, split_dirblock,
1992
self.assertEqual(bisect_left_idx, bisect_split_idx,
1993
'bisect_split disagreed. %s != %s'
1995
% (bisect_left_idx, bisect_split_idx, path)
1998
def paths_to_dirblocks(self, paths):
1999
"""Convert a list of paths into dirblock form.
2001
Also, ensure that the paths are in proper sorted order.
2003
dirblocks = [(path, []) for path in paths]
2004
split_dirblocks = [(path.split('/'), []) for path in paths]
2005
self.assertEqual(sorted(split_dirblocks), split_dirblocks)
2006
return dirblocks, split_dirblocks
2008
def test_simple(self):
2009
"""In the simple case it works just like bisect_left"""
2010
paths = ['', 'a', 'b', 'c', 'd']
2011
dirblocks, split_dirblocks = self.paths_to_dirblocks(paths)
2013
self.assertBisect(dirblocks, split_dirblocks, path)
2014
self.assertBisect(dirblocks, split_dirblocks, '_')
2015
self.assertBisect(dirblocks, split_dirblocks, 'aa')
2016
self.assertBisect(dirblocks, split_dirblocks, 'bb')
2017
self.assertBisect(dirblocks, split_dirblocks, 'cc')
2018
self.assertBisect(dirblocks, split_dirblocks, 'dd')
2019
self.assertBisect(dirblocks, split_dirblocks, 'a/a')
2020
self.assertBisect(dirblocks, split_dirblocks, 'b/b')
2021
self.assertBisect(dirblocks, split_dirblocks, 'c/c')
2022
self.assertBisect(dirblocks, split_dirblocks, 'd/d')
2024
def test_involved(self):
2025
"""This is where bisect_left diverges slightly."""
2027
'a/a', 'a/a/a', 'a/a/z', 'a/a-a', 'a/a-z',
2028
'a/z', 'a/z/a', 'a/z/z', 'a/z-a', 'a/z-z',
2030
'z', 'z/a/a', 'z/a/z', 'z/a-a', 'z/a-z',
2031
'z/z', 'z/z/a', 'z/z/z', 'z/z-a', 'z/z-z',
2034
dirblocks, split_dirblocks = self.paths_to_dirblocks(paths)
2036
self.assertBisect(dirblocks, split_dirblocks, path)
2038
def test_involved_cached(self):
2039
"""This is where bisect_left diverges slightly."""
2041
'a/a', 'a/a/a', 'a/a/z', 'a/a-a', 'a/a-z',
2042
'a/z', 'a/z/a', 'a/z/z', 'a/z-a', 'a/z-z',
2044
'z', 'z/a/a', 'z/a/z', 'z/a-a', 'z/a-z',
2045
'z/z', 'z/z/a', 'z/z/z', 'z/z-a', 'z/z-z',
2049
dirblocks, split_dirblocks = self.paths_to_dirblocks(paths)
2051
self.assertBisect(dirblocks, split_dirblocks, path, cache=cache)
2088
2054
class TestDirstateValidation(TestCaseWithDirState):
2090
2056
def test_validate_correct_dirstate(self):
2140
2106
state._validate)
2141
2107
self.assertContainsRe(str(e),
2142
2108
'file a-id is absent in row')
2145
class TestDirstateTreeReference(TestCaseWithDirState):
2147
def test_reference_revision_is_none(self):
2148
tree = self.make_branch_and_tree('tree', format='dirstate-with-subtree')
2149
subtree = self.make_branch_and_tree('tree/subtree',
2150
format='dirstate-with-subtree')
2151
subtree.set_root_id('subtree')
2152
tree.add_reference(subtree)
2154
state = dirstate.DirState.from_tree(tree, 'dirstate')
2155
key = ('', 'subtree', 'subtree')
2156
expected = ('', [(key,
2157
[('t', '', 0, False, 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])])
2160
self.assertEqual(expected, state._find_block(key))
2165
class TestDiscardMergeParents(TestCaseWithDirState):
2167
def test_discard_no_parents(self):
2168
# This should be a no-op
2169
state = self.create_empty_dirstate()
2170
self.addCleanup(state.unlock)
2171
state._discard_merge_parents()
2174
def test_discard_one_parent(self):
2176
packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
2177
root_entry_direntry = ('', '', 'a-root-value'), [
2178
('d', '', 0, False, packed_stat),
2179
('d', '', 0, False, packed_stat),
2182
dirblocks.append(('', [root_entry_direntry]))
2183
dirblocks.append(('', []))
2185
state = self.create_empty_dirstate()
2186
self.addCleanup(state.unlock)
2187
state._set_data(['parent-id'], dirblocks[:])
2190
state._discard_merge_parents()
2192
self.assertEqual(dirblocks, state._dirblocks)
2194
def test_discard_simple(self):
2196
packed_stat = 'AAAAREUHaIpFB2iKAAADAQAtkqUAAIGk'
2197
root_entry_direntry = ('', '', 'a-root-value'), [
2198
('d', '', 0, False, packed_stat),
2199
('d', '', 0, False, packed_stat),
2200
('d', '', 0, False, packed_stat),
2202
expected_root_entry_direntry = ('', '', 'a-root-value'), [
2203
('d', '', 0, False, packed_stat),
2204
('d', '', 0, False, packed_stat),
2207
dirblocks.append(('', [root_entry_direntry]))
2208
dirblocks.append(('', []))
2210
state = self.create_empty_dirstate()
2211
self.addCleanup(state.unlock)
2212
state._set_data(['parent-id', 'merged-id'], dirblocks[:])
2215
# This should strip of the extra column
2216
state._discard_merge_parents()
2218
expected_dirblocks = [('', [expected_root_entry_direntry]), ('', [])]
2219
self.assertEqual(expected_dirblocks, state._dirblocks)
2221
def test_discard_absent(self):
2222
"""If entries are only in a merge, discard should remove the entries"""
2223
null_stat = dirstate.DirState.NULLSTAT
2224
present_dir = ('d', '', 0, False, null_stat)
2225
present_file = ('f', '', 0, False, null_stat)
2226
absent = dirstate.DirState.NULL_PARENT_DETAILS
2227
root_key = ('', '', 'a-root-value')
2228
file_in_root_key = ('', 'file-in-root', 'a-file-id')
2229
file_in_merged_key = ('', 'file-in-merged', 'b-file-id')
2230
dirblocks = [('', [(root_key, [present_dir, present_dir, present_dir])]),
2231
('', [(file_in_merged_key,
2232
[absent, absent, present_file]),
2234
[present_file, present_file, present_file]),
2238
state = self.create_empty_dirstate()
2239
self.addCleanup(state.unlock)
2240
state._set_data(['parent-id', 'merged-id'], dirblocks[:])
2243
exp_dirblocks = [('', [(root_key, [present_dir, present_dir])]),
2244
('', [(file_in_root_key,
2245
[present_file, present_file]),
2248
state._discard_merge_parents()
2250
self.assertEqual(exp_dirblocks, state._dirblocks)
2252
def test_discard_renamed(self):
2253
null_stat = dirstate.DirState.NULLSTAT
2254
present_dir = ('d', '', 0, False, null_stat)
2255
present_file = ('f', '', 0, False, null_stat)
2256
absent = dirstate.DirState.NULL_PARENT_DETAILS
2257
root_key = ('', '', 'a-root-value')
2258
file_in_root_key = ('', 'file-in-root', 'a-file-id')
2259
# Renamed relative to parent
2260
file_rename_s_key = ('', 'file-s', 'b-file-id')
2261
file_rename_t_key = ('', 'file-t', 'b-file-id')
2262
# And one that is renamed between the parents, but absent in this
2263
key_in_1 = ('', 'file-in-1', 'c-file-id')
2264
key_in_2 = ('', 'file-in-2', 'c-file-id')
2267
('', [(root_key, [present_dir, present_dir, present_dir])]),
2269
[absent, present_file, ('r', 'file-in-2', 'c-file-id')]),
2271
[absent, ('r', 'file-in-1', 'c-file-id'), present_file]),
2273
[present_file, present_file, present_file]),
2275
[('r', 'file-t', 'b-file-id'), absent, present_file]),
2277
[present_file, absent, ('r', 'file-s', 'b-file-id')]),
2281
('', [(root_key, [present_dir, present_dir])]),
2282
('', [(key_in_1, [absent, present_file]),
2283
(file_in_root_key, [present_file, present_file]),
2284
(file_rename_t_key, [present_file, absent]),
2287
state = self.create_empty_dirstate()
2288
self.addCleanup(state.unlock)
2289
state._set_data(['parent-id', 'merged-id'], dirblocks[:])
2292
state._discard_merge_parents()
2294
self.assertEqual(exp_dirblocks, state._dirblocks)
2296
def test_discard_all_subdir(self):
2297
null_stat = dirstate.DirState.NULLSTAT
2298
present_dir = ('d', '', 0, False, null_stat)
2299
present_file = ('f', '', 0, False, null_stat)
2300
absent = dirstate.DirState.NULL_PARENT_DETAILS
2301
root_key = ('', '', 'a-root-value')
2302
subdir_key = ('', 'sub', 'dir-id')
2303
child1_key = ('sub', 'child1', 'child1-id')
2304
child2_key = ('sub', 'child2', 'child2-id')
2305
child3_key = ('sub', 'child3', 'child3-id')
2308
('', [(root_key, [present_dir, present_dir, present_dir])]),
2309
('', [(subdir_key, [present_dir, present_dir, present_dir])]),
2310
('sub', [(child1_key, [absent, absent, present_file]),
2311
(child2_key, [absent, absent, present_file]),
2312
(child3_key, [absent, absent, present_file]),
2316
('', [(root_key, [present_dir, present_dir])]),
2317
('', [(subdir_key, [present_dir, present_dir])]),
2320
state = self.create_empty_dirstate()
2321
self.addCleanup(state.unlock)
2322
state._set_data(['parent-id', 'merged-id'], dirblocks[:])
2325
state._discard_merge_parents()
2327
self.assertEqual(exp_dirblocks, state._dirblocks)
2330
class Test_InvEntryToDetails(tests.TestCase):
2332
def assertDetails(self, expected, inv_entry):
2333
details = dirstate.DirState._inv_entry_to_details(inv_entry)
2334
self.assertEqual(expected, details)
2335
# details should always allow join() and always be a plain str when
2337
(minikind, fingerprint, size, executable, tree_data) = details
2338
self.assertIsInstance(minikind, str)
2339
self.assertIsInstance(fingerprint, str)
2340
self.assertIsInstance(tree_data, str)
2342
def test_unicode_symlink(self):
2343
inv_entry = inventory.InventoryLink('link-file-id',
2344
u'nam\N{Euro Sign}e',
2346
inv_entry.revision = 'link-revision-id'
2347
target = u'link-targ\N{Euro Sign}t'
2348
inv_entry.symlink_target = target
2349
self.assertDetails(('l', target.encode('UTF-8'), 0, False,
2350
'link-revision-id'), inv_entry)
2353
class TestSHA1Provider(tests.TestCaseInTempDir):
2355
def test_sha1provider_is_an_interface(self):
2356
p = dirstate.SHA1Provider()
2357
self.assertRaises(NotImplementedError, p.sha1, "foo")
2358
self.assertRaises(NotImplementedError, p.stat_and_sha1, "foo")
2360
def test_defaultsha1provider_sha1(self):
2361
text = 'test\r\nwith\nall\rpossible line endings\r\n'
2362
self.build_tree_contents([('foo', text)])
2363
expected_sha = osutils.sha_string(text)
2364
p = dirstate.DefaultSHA1Provider()
2365
self.assertEqual(expected_sha, p.sha1('foo'))
2367
def test_defaultsha1provider_stat_and_sha1(self):
2368
text = 'test\r\nwith\nall\rpossible line endings\r\n'
2369
self.build_tree_contents([('foo', text)])
2370
expected_sha = osutils.sha_string(text)
2371
p = dirstate.DefaultSHA1Provider()
2372
statvalue, sha1 = p.stat_and_sha1('foo')
2373
self.assertTrue(len(statvalue) >= 10)
2374
self.assertEqual(len(text), statvalue.st_size)
2375
self.assertEqual(expected_sha, sha1)
added
removed
bzrlib/tests/test_dirstate.py
