← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_graph.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-05 14:12:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6348.
  • Revision ID: jelmer@samba.org-20111205141223-8qxae4h37satlzgq
Move more functionality to vf_search.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_graph.py
1
 
# Copyright (C) 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2007-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
from bzrlib import (
18
18
    errors,
19
19
    graph as _mod_graph,
20
 
    symbol_versioning,
21
20
    tests,
22
21
    )
23
22
from bzrlib.revision import NULL_REVISION
24
23
from bzrlib.tests import TestCaseWithMemoryTransport
25
 
from bzrlib.symbol_versioning import deprecated_in
26
24
 
27
25
 
28
26
# Ancestry 1:
426
424
    def __init__(self, parents_provider):
427
425
        self.calls = []
428
426
        self._real_parents_provider = parents_provider
 
427
        get_cached = getattr(parents_provider, 'get_cached_parent_map', None)
 
428
        if get_cached is not None:
 
429
            # Only expose the underlying 'get_cached_parent_map' function if
 
430
            # the wrapped provider has it.
 
431
            self.get_cached_parent_map = self._get_cached_parent_map
429
432
 
430
433
    def get_parent_map(self, nodes):
431
434
        self.calls.extend(nodes)
432
435
        return self._real_parents_provider.get_parent_map(nodes)
433
436
 
 
437
    def _get_cached_parent_map(self, nodes):
 
438
        self.calls.append(('cached', sorted(nodes)))
 
439
        return self._real_parents_provider.get_cached_parent_map(nodes)
 
440
 
 
441
 
 
442
class SharedInstrumentedParentsProvider(object):
 
443
 
 
444
    def __init__(self, parents_provider, calls, info):
 
445
        self.calls = calls
 
446
        self.info = info
 
447
        self._real_parents_provider = parents_provider
 
448
        get_cached = getattr(parents_provider, 'get_cached_parent_map', None)
 
449
        if get_cached is not None:
 
450
            # Only expose the underlying 'get_cached_parent_map' function if
 
451
            # the wrapped provider has it.
 
452
            self.get_cached_parent_map = self._get_cached_parent_map
 
453
 
 
454
    def get_parent_map(self, nodes):
 
455
        self.calls.append((self.info, sorted(nodes)))
 
456
        return self._real_parents_provider.get_parent_map(nodes)
 
457
 
 
458
    def _get_cached_parent_map(self, nodes):
 
459
        self.calls.append((self.info, 'cached', sorted(nodes)))
 
460
        return self._real_parents_provider.get_cached_parent_map(nodes)
 
461
 
434
462
 
435
463
class TestGraphBase(tests.TestCase):
436
464
 
675
703
        self.assertEqual((set(['e']), set(['f', 'g'])),
676
704
                         graph.find_difference('e', 'f'))
677
705
 
678
 
 
679
 
    def test_stacked_parents_provider(self):
680
 
        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev3']})
681
 
        parents2 = _mod_graph.DictParentsProvider({'rev1': ['rev4']})
682
 
        stacked = _mod_graph.StackedParentsProvider([parents1, parents2])
683
 
        self.assertEqual({'rev1':['rev4'], 'rev2':['rev3']},
684
 
                         stacked.get_parent_map(['rev1', 'rev2']))
685
 
        self.assertEqual({'rev2':['rev3'], 'rev1':['rev4']},
686
 
                         stacked.get_parent_map(['rev2', 'rev1']))
687
 
        self.assertEqual({'rev2':['rev3']},
688
 
                         stacked.get_parent_map(['rev2', 'rev2']))
689
 
        self.assertEqual({'rev1':['rev4']},
690
 
                         stacked.get_parent_map(['rev1', 'rev1']))
691
 
    
692
 
    def test_stacked_parents_provider_overlapping(self):
693
 
        # rev2 is availible in both providers.
694
 
        # 1
695
 
        # |
696
 
        # 2
697
 
        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev1']})
698
 
        parents2 = _mod_graph.DictParentsProvider({'rev2': ['rev1']})
699
 
        stacked = _mod_graph.StackedParentsProvider([parents1, parents2])
700
 
        self.assertEqual({'rev2': ['rev1']},
701
 
                         stacked.get_parent_map(['rev2']))
702
 
 
703
 
    def test__stacked_parents_provider_deprecated(self):
704
 
        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev3']})
705
 
        parents2 = _mod_graph.DictParentsProvider({'rev1': ['rev4']})
706
 
        stacked = self.applyDeprecated(deprecated_in((1, 16, 0)),
707
 
                    _mod_graph._StackedParentsProvider, [parents1, parents2])
708
 
        self.assertEqual({'rev1':['rev4'], 'rev2':['rev3']},
709
 
                         stacked.get_parent_map(['rev1', 'rev2']))
710
 
        self.assertEqual({'rev2':['rev3'], 'rev1':['rev4']},
711
 
                         stacked.get_parent_map(['rev2', 'rev1']))
712
 
        self.assertEqual({'rev2':['rev3']},
713
 
                         stacked.get_parent_map(['rev2', 'rev2']))
714
 
        self.assertEqual({'rev1':['rev4']},
715
 
                         stacked.get_parent_map(['rev1', 'rev1']))
716
 
 
717
706
    def test_iter_topo_order(self):
718
707
        graph = self.make_graph(ancestry_1)
719
708
        args = ['rev2a', 'rev3', 'rev1']
1424
1413
        self.assertMergeOrder(['rev3', 'rev1'], graph, 'rev4', ['rev1', 'rev3'])
1425
1414
 
1426
1415
 
 
1416
class TestFindDescendants(TestGraphBase):
 
1417
 
 
1418
    def test_find_descendants_rev1_rev3(self):
 
1419
        graph = self.make_graph(ancestry_1)
 
1420
        descendants = graph.find_descendants('rev1', 'rev3')
 
1421
        self.assertEqual(set(['rev1', 'rev2a', 'rev3']), descendants)
 
1422
 
 
1423
    def test_find_descendants_rev1_rev4(self):
 
1424
        graph = self.make_graph(ancestry_1)
 
1425
        descendants = graph.find_descendants('rev1', 'rev4')
 
1426
        self.assertEqual(set(['rev1', 'rev2a', 'rev2b', 'rev3', 'rev4']),
 
1427
                         descendants)
 
1428
 
 
1429
    def test_find_descendants_rev2a_rev4(self):
 
1430
        graph = self.make_graph(ancestry_1)
 
1431
        descendants = graph.find_descendants('rev2a', 'rev4')
 
1432
        self.assertEqual(set(['rev2a', 'rev3', 'rev4']), descendants)
 
1433
 
 
1434
class TestFindLefthandMerger(TestGraphBase):
 
1435
 
 
1436
    def check_merger(self, result, ancestry, merged, tip):
 
1437
        graph = self.make_graph(ancestry)
 
1438
        self.assertEqual(result, graph.find_lefthand_merger(merged, tip))
 
1439
 
 
1440
    def test_find_lefthand_merger_rev2b(self):
 
1441
        self.check_merger('rev4', ancestry_1, 'rev2b', 'rev4')
 
1442
 
 
1443
    def test_find_lefthand_merger_rev2a(self):
 
1444
        self.check_merger('rev2a', ancestry_1, 'rev2a', 'rev4')
 
1445
 
 
1446
    def test_find_lefthand_merger_rev4(self):
 
1447
        self.check_merger(None, ancestry_1, 'rev4', 'rev2a')
 
1448
 
 
1449
    def test_find_lefthand_merger_f(self):
 
1450
        self.check_merger('i', complex_shortcut, 'f', 'm')
 
1451
 
 
1452
    def test_find_lefthand_merger_g(self):
 
1453
        self.check_merger('i', complex_shortcut, 'g', 'm')
 
1454
 
 
1455
    def test_find_lefthand_merger_h(self):
 
1456
        self.check_merger('n', complex_shortcut, 'h', 'n')
 
1457
 
 
1458
 
 
1459
class TestGetChildMap(TestGraphBase):
 
1460
 
 
1461
    def test_get_child_map(self):
 
1462
        graph = self.make_graph(ancestry_1)
 
1463
        child_map = graph.get_child_map(['rev4', 'rev3', 'rev2a', 'rev2b'])
 
1464
        self.assertEqual({'rev1': ['rev2a', 'rev2b'],
 
1465
                          'rev2a': ['rev3'],
 
1466
                          'rev2b': ['rev4'],
 
1467
                          'rev3': ['rev4']},
 
1468
                          child_map)
 
1469
 
 
1470
 
1427
1471
class TestCachingParentsProvider(tests.TestCase):
1428
1472
    """These tests run with:
1429
1473
 
1434
1478
 
1435
1479
    def setUp(self):
1436
1480
        super(TestCachingParentsProvider, self).setUp()
1437
 
        dict_pp = _mod_graph.DictParentsProvider({'a':('b',)})
 
1481
        dict_pp = _mod_graph.DictParentsProvider({'a': ('b',)})
1438
1482
        self.inst_pp = InstrumentedParentsProvider(dict_pp)
1439
1483
        self.caching_pp = _mod_graph.CachingParentsProvider(self.inst_pp)
1440
1484
 
1479
1523
        self.assertEqual([], self.inst_pp.calls)
1480
1524
        self.assertEqual(set(['b']), self.caching_pp.missing_keys)
1481
1525
 
 
1526
    def test_get_cached_parent_map(self):
 
1527
        self.assertEqual({}, self.caching_pp.get_cached_parent_map(['a']))
 
1528
        self.assertEqual([], self.inst_pp.calls)
 
1529
        self.assertEqual({'a': ('b',)}, self.caching_pp.get_parent_map(['a']))
 
1530
        self.assertEqual(['a'], self.inst_pp.calls)
 
1531
        self.assertEqual({'a': ('b',)},
 
1532
                         self.caching_pp.get_cached_parent_map(['a']))
 
1533
 
1482
1534
 
1483
1535
class TestCachingParentsProviderExtras(tests.TestCaseWithTransport):
1484
1536
    """Test the behaviour when parents are provided that were not requested."""
1543
1595
                         self.caching_pp.get_parent_map(['rev2']))
1544
1596
        self.assertEqual(['rev3'], self.inst_pp.calls)
1545
1597
 
 
1598
    def test_extras_using_cached(self):
 
1599
        self.assertEqual({}, self.caching_pp.get_cached_parent_map(['rev3']))
 
1600
        self.assertEqual({}, self.caching_pp.get_parent_map(['rev3']))
 
1601
        self.assertEqual({'rev2': ['rev1']},
 
1602
                         self.caching_pp.get_cached_parent_map(['rev2']))
 
1603
        self.assertEqual(['rev3'], self.inst_pp.calls)
 
1604
 
 
1605
 
1546
1606
 
1547
1607
class TestCollapseLinearRegions(tests.TestCase):
1548
1608
 
1599
1659
        self.assertEqual(['D'], sorted(graph_thunk.heads(['D', 'C'])))
1600
1660
        self.assertEqual(['B', 'C'], sorted(graph_thunk.heads(['B', 'C'])))
1601
1661
 
1602
 
 
1603
 
class TestPendingAncestryResultGetKeys(TestCaseWithMemoryTransport):
1604
 
    """Tests for bzrlib.graph.PendingAncestryResult."""
1605
 
 
1606
 
    def test_get_keys(self):
1607
 
        builder = self.make_branch_builder('b')
1608
 
        builder.start_series()
1609
 
        builder.build_snapshot('rev-1', None, [
1610
 
            ('add', ('', 'root-id', 'directory', ''))])
1611
 
        builder.build_snapshot('rev-2', ['rev-1'], [])
1612
 
        builder.finish_series()
1613
 
        repo = builder.get_branch().repository
1614
 
        repo.lock_read()
1615
 
        self.addCleanup(repo.unlock)
1616
 
        result = _mod_graph.PendingAncestryResult(['rev-2'], repo)
1617
 
        self.assertEqual(set(['rev-1', 'rev-2']), set(result.get_keys()))
1618
 
 
1619
 
    def test_get_keys_excludes_ghosts(self):
1620
 
        builder = self.make_branch_builder('b')
1621
 
        builder.start_series()
1622
 
        builder.build_snapshot('rev-1', None, [
1623
 
            ('add', ('', 'root-id', 'directory', ''))])
1624
 
        builder.build_snapshot('rev-2', ['rev-1', 'ghost'], [])
1625
 
        builder.finish_series()
1626
 
        repo = builder.get_branch().repository
1627
 
        repo.lock_read()
1628
 
        self.addCleanup(repo.unlock)
1629
 
        result = _mod_graph.PendingAncestryResult(['rev-2'], repo)
1630
 
        self.assertEqual(sorted(['rev-1', 'rev-2']), sorted(result.get_keys()))
1631
 
 
1632
 
    def test_get_keys_excludes_null(self):
1633
 
        # Make a 'graph' with an iter_ancestry that returns NULL_REVISION
1634
 
        # somewhere other than the last element, which can happen in real
1635
 
        # ancestries.
1636
 
        class StubGraph(object):
1637
 
            def iter_ancestry(self, keys):
1638
 
                return [(NULL_REVISION, ()), ('foo', (NULL_REVISION,))]
1639
 
        result = _mod_graph.PendingAncestryResult(['rev-3'], None)
1640
 
        result_keys = result._get_keys(StubGraph())
1641
 
        # Only the non-null keys from the ancestry appear.
1642
 
        self.assertEqual(set(['foo']), set(result_keys))
1643
 
 
1644
 
 
1645
 
class TestPendingAncestryResultRefine(TestGraphBase):
1646
 
 
1647
 
    def test_refine(self):
1648
 
        # Used when pulling from a stacked repository, so test some revisions
1649
 
        # being satisfied from the stacking branch.
1650
 
        g = self.make_graph(
1651
 
            {"tip":["mid"], "mid":["base"], "tag":["base"],
1652
 
             "base":[NULL_REVISION], NULL_REVISION:[]})
1653
 
        result = _mod_graph.PendingAncestryResult(['tip', 'tag'], None)
1654
 
        result = result.refine(set(['tip']), set(['mid']))
1655
 
        self.assertEqual(set(['mid', 'tag']), result.heads)
1656
 
        result = result.refine(set(['mid', 'tag', 'base']),
1657
 
            set([NULL_REVISION]))
1658
 
        self.assertEqual(set([NULL_REVISION]), result.heads)
1659
 
        self.assertTrue(result.is_empty())
1660
 
 
1661
 
 
1662
 
class TestSearchResultRefine(TestGraphBase):
1663
 
 
1664
 
    def test_refine(self):
1665
 
        # Used when pulling from a stacked repository, so test some revisions
1666
 
        # being satisfied from the stacking branch.
1667
 
        g = self.make_graph(
1668
 
            {"tip":["mid"], "mid":["base"], "tag":["base"],
1669
 
             "base":[NULL_REVISION], NULL_REVISION:[]})
1670
 
        result = _mod_graph.SearchResult(set(['tip', 'tag']),
1671
 
            set([NULL_REVISION]), 4, set(['tip', 'mid', 'tag', 'base']))
1672
 
        result = result.refine(set(['tip']), set(['mid']))
1673
 
        recipe = result.get_recipe()
1674
 
        # We should be starting from tag (original head) and mid (seen ref)
1675
 
        self.assertEqual(set(['mid', 'tag']), recipe[1])
1676
 
        # We should be stopping at NULL (original stop) and tip (seen head)
1677
 
        self.assertEqual(set([NULL_REVISION, 'tip']), recipe[2])
1678
 
        self.assertEqual(3, recipe[3])
1679
 
        result = result.refine(set(['mid', 'tag', 'base']),
1680
 
            set([NULL_REVISION]))
1681
 
        recipe = result.get_recipe()
1682
 
        # We should be starting from nothing (NULL was known as a cut point)
1683
 
        self.assertEqual(set([]), recipe[1])
1684
 
        # We should be stopping at NULL (original stop) and tip (seen head) and
1685
 
        # tag (seen head) and mid(seen mid-point head). We could come back and
1686
 
        # define this as not including mid, for minimal results, but it is
1687
 
        # still 'correct' to include mid, and simpler/easier.
1688
 
        self.assertEqual(set([NULL_REVISION, 'tip', 'tag', 'mid']), recipe[2])
1689
 
        self.assertEqual(0, recipe[3])
1690
 
        self.assertTrue(result.is_empty())
 
1662
    def test_add_node(self):
 
1663
        d = {('C',):[('A',)], ('B',): [('A',)], ('A',): []}
 
1664
        g = _mod_graph.KnownGraph(d)
 
1665
        graph_thunk = _mod_graph.GraphThunkIdsToKeys(g)
 
1666
        graph_thunk.add_node("D", ["A", "C"])
 
1667
        self.assertEqual(['B', 'D'],
 
1668
            sorted(graph_thunk.heads(['D', 'B', 'A'])))
 
1669
 
 
1670
    def test_merge_sort(self):
 
1671
        d = {('C',):[('A',)], ('B',): [('A',)], ('A',): []}
 
1672
        g = _mod_graph.KnownGraph(d)
 
1673
        graph_thunk = _mod_graph.GraphThunkIdsToKeys(g)
 
1674
        graph_thunk.add_node("D", ["A", "C"])
 
1675
        self.assertEqual([('C', 0, (2,), False), ('A', 0, (1,), True)],
 
1676
            [(n.key, n.merge_depth, n.revno, n.end_of_merge)
 
1677
                 for n in graph_thunk.merge_sort('C')])
 
1678
 
 
1679
 
 
1680
class TestStackedParentsProvider(tests.TestCase):
 
1681
 
 
1682
    def setUp(self):
 
1683
        super(TestStackedParentsProvider, self).setUp()
 
1684
        self.calls = []
 
1685
 
 
1686
    def get_shared_provider(self, info, ancestry, has_cached):
 
1687
        pp = _mod_graph.DictParentsProvider(ancestry)
 
1688
        if has_cached:
 
1689
            pp.get_cached_parent_map = pp.get_parent_map
 
1690
        return SharedInstrumentedParentsProvider(pp, self.calls, info)
 
1691
 
 
1692
    def test_stacked_parents_provider(self):
 
1693
        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev3']})
 
1694
        parents2 = _mod_graph.DictParentsProvider({'rev1': ['rev4']})
 
1695
        stacked = _mod_graph.StackedParentsProvider([parents1, parents2])
 
1696
        self.assertEqual({'rev1':['rev4'], 'rev2':['rev3']},
 
1697
                         stacked.get_parent_map(['rev1', 'rev2']))
 
1698
        self.assertEqual({'rev2':['rev3'], 'rev1':['rev4']},
 
1699
                         stacked.get_parent_map(['rev2', 'rev1']))
 
1700
        self.assertEqual({'rev2':['rev3']},
 
1701
                         stacked.get_parent_map(['rev2', 'rev2']))
 
1702
        self.assertEqual({'rev1':['rev4']},
 
1703
                         stacked.get_parent_map(['rev1', 'rev1']))
 
1704
 
 
1705
    def test_stacked_parents_provider_overlapping(self):
 
1706
        # rev2 is availible in both providers.
 
1707
        # 1
 
1708
        # |
 
1709
        # 2
 
1710
        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev1']})
 
1711
        parents2 = _mod_graph.DictParentsProvider({'rev2': ['rev1']})
 
1712
        stacked = _mod_graph.StackedParentsProvider([parents1, parents2])
 
1713
        self.assertEqual({'rev2': ['rev1']},
 
1714
                         stacked.get_parent_map(['rev2']))
 
1715
 
 
1716
    def test_handles_no_get_cached_parent_map(self):
 
1717
        # this shows that we both handle when a provider doesn't implement
 
1718
        # get_cached_parent_map
 
1719
        pp1 = self.get_shared_provider('pp1', {'rev2': ('rev1',)},
 
1720
                                       has_cached=False)
 
1721
        pp2 = self.get_shared_provider('pp2', {'rev2': ('rev1',)},
 
1722
                                       has_cached=True)
 
1723
        stacked = _mod_graph.StackedParentsProvider([pp1, pp2])
 
1724
        self.assertEqual({'rev2': ('rev1',)}, stacked.get_parent_map(['rev2']))
 
1725
        # No call on 'pp1' because it doesn't provide get_cached_parent_map
 
1726
        self.assertEqual([('pp2', 'cached', ['rev2'])], self.calls)
 
1727
 
 
1728
    def test_query_order(self):
 
1729
        # We should call get_cached_parent_map on all providers before we call
 
1730
        # get_parent_map. Further, we should track what entries we have found,
 
1731
        # and not re-try them.
 
1732
        pp1 = self.get_shared_provider('pp1', {'a': ()}, has_cached=True)
 
1733
        pp2 = self.get_shared_provider('pp2', {'c': ('b',)}, has_cached=False)
 
1734
        pp3 = self.get_shared_provider('pp3', {'b': ('a',)}, has_cached=True)
 
1735
        stacked = _mod_graph.StackedParentsProvider([pp1, pp2, pp3])
 
1736
        self.assertEqual({'a': (), 'b': ('a',), 'c': ('b',)},
 
1737
                         stacked.get_parent_map(['a', 'b', 'c', 'd']))
 
1738
        self.assertEqual([('pp1', 'cached', ['a', 'b', 'c', 'd']),
 
1739
                          # No call to pp2, because it doesn't have cached
 
1740
                          ('pp3', 'cached', ['b', 'c', 'd']),
 
1741
                          ('pp1', ['c', 'd']),
 
1742
                          ('pp2', ['c', 'd']),
 
1743
                          ('pp3', ['d']),
 
1744
                         ], self.calls)