← 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: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_graph.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007-2010 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
22
22
    )
23
23
from bzrlib.revision import NULL_REVISION
24
24
from bzrlib.tests import TestCaseWithMemoryTransport
 
25
from bzrlib.symbol_versioning import deprecated_in
25
26
 
26
27
 
27
28
# Ancestry 1:
525
526
        graph = self.make_graph(history_shortcut)
526
527
        self.assertEqual(set(['rev2b']), graph.find_lca('rev3a', 'rev3b'))
527
528
 
 
529
    def test_lefthand_distance_smoke(self):
 
530
        """A simple does it work test for graph.lefthand_distance(keys)."""
 
531
        graph = self.make_graph(history_shortcut)
 
532
        distance_graph = graph.find_lefthand_distances(['rev3b', 'rev2a'])
 
533
        self.assertEqual({'rev2a': 2, 'rev3b': 3}, distance_graph)
 
534
 
 
535
    def test_lefthand_distance_ghosts(self):
 
536
        """A simple does it work test for graph.lefthand_distance(keys)."""
 
537
        nodes = {'nonghost':[NULL_REVISION], 'toghost':['ghost']}
 
538
        graph = self.make_graph(nodes)
 
539
        distance_graph = graph.find_lefthand_distances(['nonghost', 'toghost'])
 
540
        self.assertEqual({'nonghost': 1, 'toghost': -1}, distance_graph)
 
541
 
528
542
    def test_recursive_unique_lca(self):
529
543
        """Test finding a unique least common ancestor.
530
544
 
661
675
        self.assertEqual((set(['e']), set(['f', 'g'])),
662
676
                         graph.find_difference('e', 'f'))
663
677
 
 
678
 
664
679
    def test_stacked_parents_provider(self):
665
680
        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev3']})
666
681
        parents2 = _mod_graph.DictParentsProvider({'rev1': ['rev4']})
667
 
        stacked = _mod_graph._StackedParentsProvider([parents1, parents2])
 
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])
668
708
        self.assertEqual({'rev1':['rev4'], 'rev2':['rev3']},
669
709
                         stacked.get_parent_map(['rev1', 'rev2']))
670
710
        self.assertEqual({'rev2':['rev3'], 'rev1':['rev4']},
1542
1582
        self.assertCollapsed(d, d)
1543
1583
 
1544
1584
 
 
1585
class TestGraphThunkIdsToKeys(tests.TestCase):
 
1586
 
 
1587
    def test_heads(self):
 
1588
        # A
 
1589
        # |\
 
1590
        # B C
 
1591
        # |/
 
1592
        # D
 
1593
        d = {('D',): [('B',), ('C',)], ('C',):[('A',)],
 
1594
             ('B',): [('A',)], ('A',): []}
 
1595
        g = _mod_graph.Graph(_mod_graph.DictParentsProvider(d))
 
1596
        graph_thunk = _mod_graph.GraphThunkIdsToKeys(g)
 
1597
        self.assertEqual(['D'], sorted(graph_thunk.heads(['D', 'A'])))
 
1598
        self.assertEqual(['D'], sorted(graph_thunk.heads(['D', 'B'])))
 
1599
        self.assertEqual(['D'], sorted(graph_thunk.heads(['D', 'C'])))
 
1600
        self.assertEqual(['B', 'C'], sorted(graph_thunk.heads(['B', 'C'])))
 
1601
 
 
1602
 
1545
1603
class TestPendingAncestryResultGetKeys(TestCaseWithMemoryTransport):
1546
1604
    """Tests for bzrlib.graph.PendingAncestryResult."""
1547
1605
 
1558
1616
        result = _mod_graph.PendingAncestryResult(['rev-2'], repo)
1559
1617
        self.assertEqual(set(['rev-1', 'rev-2']), set(result.get_keys()))
1560
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
 
1561
1632
    def test_get_keys_excludes_null(self):
1562
1633
        # Make a 'graph' with an iter_ancestry that returns NULL_REVISION
1563
1634
        # somewhere other than the last element, which can happen in real