~bzr-pqm/bzr/bzr.dev

# Copyright (C) 2007 Canonical Ltd

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

#

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with this program; if not, write to the Free Software

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

from bzrlib import (

    errors,

    graph as _mod_graph,

    symbol_versioning,

    tests,

    )

from bzrlib.revision import NULL_REVISION

from bzrlib.tests import TestCaseWithMemoryTransport

from bzrlib.symbol_versioning import deprecated_in 

# Ancestry 1:

#

#  NULL_REVISION

#       |

#     rev1

#      /\

#  rev2a rev2b

#     |    |

#   rev3  /

#     |  /

#   rev4

ancestry_1 = {'rev1': [NULL_REVISION], 'rev2a': ['rev1'], 'rev2b': ['rev1'],

              'rev3': ['rev2a'], 'rev4': ['rev3', 'rev2b']}

# Ancestry 2:

#

#  NULL_REVISION

#    /    \

# rev1a  rev1b

#   |

# rev2a

#   |

# rev3a

#   |

# rev4a

ancestry_2 = {'rev1a': [NULL_REVISION], 'rev2a': ['rev1a'],

              'rev1b': [NULL_REVISION], 'rev3a': ['rev2a'], 'rev4a': ['rev3a']}

# Criss cross ancestry

#

#     NULL_REVISION

#         |

#        rev1

#        /  \

#    rev2a  rev2b

#       |\  /|

#       |  X |

#       |/  \|

#    rev3a  rev3b

criss_cross = {'rev1': [NULL_REVISION], 'rev2a': ['rev1'], 'rev2b': ['rev1'],

               'rev3a': ['rev2a', 'rev2b'], 'rev3b': ['rev2b', 'rev2a']}

# Criss-cross 2

#

#  NULL_REVISION

#    /   \

# rev1a  rev1b

#   |\   /|

#   | \ / |

#   |  X  |

#   | / \ |

#   |/   \|

# rev2a  rev2b

criss_cross2 = {'rev1a': [NULL_REVISION], 'rev1b': [NULL_REVISION],

                'rev2a': ['rev1a', 'rev1b'], 'rev2b': ['rev1b', 'rev1a']}

# Mainline:

#

#  NULL_REVISION

#       |

#      rev1

#      /  \

#      | rev2b

#      |  /

#     rev2a

mainline = {'rev1': [NULL_REVISION], 'rev2a': ['rev1', 'rev2b'],

            'rev2b': ['rev1']}

# feature branch:

#

#  NULL_REVISION

#       |

#      rev1

#       |

#     rev2b

#       |

#     rev3b

feature_branch = {'rev1': [NULL_REVISION],

                  'rev2b': ['rev1'], 'rev3b': ['rev2b']}

# History shortcut

#  NULL_REVISION

#       |

#     rev1------

#     /  \      \

#  rev2a rev2b rev2c

#    |  /   \   /

#  rev3a    rev3b

history_shortcut = {'rev1': [NULL_REVISION], 'rev2a': ['rev1'],

                    'rev2b': ['rev1'], 'rev2c': ['rev1'],

                    'rev3a': ['rev2a', 'rev2b'], 'rev3b': ['rev2b', 'rev2c']}

# Extended history shortcut

#  NULL_REVISION

#       |

#       a

#       |\

#       b |

#       | |

#       c |

#       | |

#       d |

#       |\|

#       e f

extended_history_shortcut = {'a': [NULL_REVISION],

                             'b': ['a'],

                             'c': ['b'],

                             'd': ['c'],

                             'e': ['d'],

                             'f': ['a', 'd'],

                            }

# Double shortcut

# Both sides will see 'A' first, even though it is actually a decendent of a

# different common revision.

#

#  NULL_REVISION

#       |

#       a

#      /|\

#     / b \

#    /  |  \

#   |   c   |

#   |  / \  |

#   | d   e |

#   |/     \|

#   f       g

double_shortcut = {'a':[NULL_REVISION], 'b':['a'], 'c':['b'],

                   'd':['c'], 'e':['c'], 'f':['a', 'd'],

                   'g':['a', 'e']}

# Complex shortcut

# This has a failure mode in that a shortcut will find some nodes in common,

# but the common searcher won't have time to find that one branch is actually

# in common. The extra nodes at the beginning are because we want to avoid

# walking off the graph. Specifically, node G should be considered common, but

# is likely to be seen by M long before the common searcher finds it.

#

# NULL_REVISION

#     |

#     a

#     |

#     b

#     |

#     c

#     |

#     d

#     |\

#     e f

#     | |\

#     | g h

#     |/| |

#     i j |

#     | | |

#     | k |

#     | | |

#     | l |

#     |/|/

#     m n

complex_shortcut = {'a':[NULL_REVISION], 'b':['a'], 'c':['b'], 'd':['c'],

                    'e':['d'], 'f':['d'], 'g':['f'], 'h':['f'],

                    'i':['e', 'g'], 'j':['g'], 'k':['j'],

                    'l':['k'], 'm':['i', 'l'], 'n':['l', 'h']}

# NULL_REVISION

#     |

#     a

#     |

#     b

#     |

#     c

#     |

#     d

#     |\

#     e |

#     | |

#     f |

#     | |

#     g h

#     | |\

#     i | j

#     |\| |

#     | k |

#     | | |

#     | l |

#     | | |

#     | m |

#     | | |

#     | n |

#     | | |

#     | o |

#     | | |

#     | p |

#     | | |

#     | q |

#     | | |

#     | r |

#     | | |

#     | s |

#     | | |

#     |/|/

#     t u

complex_shortcut2 = {'a':[NULL_REVISION], 'b':['a'], 'c':['b'], 'd':['c'],

                    'e':['d'], 'f':['e'], 'g':['f'], 'h':['d'], 'i':['g'],

                    'j':['h'], 'k':['h', 'i'], 'l':['k'], 'm':['l'], 'n':['m'],

                    'o':['n'], 'p':['o'], 'q':['p'], 'r':['q'], 's':['r'],

                    't':['i', 's'], 'u':['s', 'j'],

                    }

# Graph where different walkers will race to find the common and uncommon

# nodes.

#

# NULL_REVISION

#     |

#     a

#     |

#     b

#     |

#     c

#     |

#     d

#     |\

#     e k

#     | |

#     f-+-p

#     | | |

#     | l |

#     | | |

#     | m |

#     | |\|

#     g n q

#     |\| |

#     h o |

#     |/| |

#     i r |

#     | | |

#     | s |

#     | | |

#     | t |

#     | | |

#     | u |

#     | | |

#     | v |

#     | | |

#     | w |

#     | | |

#     | x |

#     | |\|

#     | y z

#     |/

#     j

#

# x is found to be common right away, but is the start of a long series of

# common commits.

# o is actually common, but the i-j shortcut makes it look like it is actually

# unique to j at first, you have to traverse all of x->o to find it.

# q,m gives the walker from j a common point to stop searching, as does p,f.

# k-n exists so that the second pass still has nodes that are worth searching,

# rather than instantly cancelling the extra walker.

racing_shortcuts = {'a':[NULL_REVISION], 'b':['a'], 'c':['b'], 'd':['c'],

    'e':['d'], 'f':['e'], 'g':['f'], 'h':['g'], 'i':['h', 'o'], 'j':['i', 'y'],

    'k':['d'], 'l':['k'], 'm':['l'], 'n':['m'], 'o':['n', 'g'], 'p':['f'],

    'q':['p', 'm'], 'r':['o'], 's':['r'], 't':['s'], 'u':['t'], 'v':['u'],

    'w':['v'], 'x':['w'], 'y':['x'], 'z':['x', 'q']}

# A graph with multiple nodes unique to one side.

#

# NULL_REVISION

#     |

#     a

#     |

#     b

#     |

#     c

#     |

#     d

#     |\

#     e f

#     |\ \

#     g h i

#     |\ \ \

#     j k l m

#     | |/ x|

#     | n o p

#     | |/  |

#     | q   |

#     | |   |

#     | r   |

#     | |   |

#     | s   |

#     | |   |

#     | t   |

#     | |   |

#     | u   |

#     | |   |

#     | v   |

#     | |   |

#     | w   |

#     | |   |

#     | x   |

#     |/ \ /

#     y   z

#

multiple_interesting_unique = {'a':[NULL_REVISION], 'b':['a'], 'c':['b'],

    'd':['c'], 'e':['d'], 'f':['d'], 'g':['e'], 'h':['e'], 'i':['f'],

    'j':['g'], 'k':['g'], 'l':['h'], 'm':['i'], 'n':['k', 'l'],

    'o':['m'], 'p':['m', 'l'], 'q':['n', 'o'], 'r':['q'], 's':['r'],

    't':['s'], 'u':['t'], 'v':['u'], 'w':['v'], 'x':['w'],

    'y':['j', 'x'], 'z':['x', 'p']}

# Shortcut with extra root

# We have a long history shortcut, and an extra root, which is why we can't

# stop searchers based on seeing NULL_REVISION

#  NULL_REVISION

#       |   |

#       a   |

#       |\  |

#       b | |

#       | | |

#       c | |

#       | | |

#       d | g

#       |\|/

#       e f

shortcut_extra_root = {'a': [NULL_REVISION],

                       'b': ['a'],

                       'c': ['b'],

                       'd': ['c'],

                       'e': ['d'],

                       'f': ['a', 'd', 'g'],

                       'g': [NULL_REVISION],

                      }

#  NULL_REVISION

#       |

#       f

#       |

#       e

#      / \

#     b   d

#     | \ |

#     a   c

boundary = {'a': ['b'], 'c': ['b', 'd'], 'b':['e'], 'd':['e'], 'e': ['f'],

            'f':[NULL_REVISION]}

# A graph that contains a ghost

#  NULL_REVISION

#       |

#       f

#       |

#       e   g

#      / \ /

#     b   d

#     | \ |

#     a   c

with_ghost = {'a': ['b'], 'c': ['b', 'd'], 'b':['e'], 'd':['e', 'g'],

              'e': ['f'], 'f':[NULL_REVISION], NULL_REVISION:()}

# A graph that shows we can shortcut finding revnos when reaching them from the

# side.

#  NULL_REVISION

#       |

#       a

#       |

#       b

#       |

#       c

#       |

#       d

#       |

#       e

#      / \

#     f   g

#     |

#     h

#     |

#     i

with_tail = {'a':[NULL_REVISION], 'b':['a'], 'c':['b'], 'd':['c'], 'e':['d'],

             'f':['e'], 'g':['e'], 'h':['f'], 'i':['h']}

class InstrumentedParentsProvider(object):

    def __init__(self, parents_provider):

        self.calls = []

        self._real_parents_provider = parents_provider

    def get_parent_map(self, nodes):

        self.calls.extend(nodes)

        return self._real_parents_provider.get_parent_map(nodes)

class TestGraphBase(tests.TestCase):

    def make_graph(self, ancestors):

        return _mod_graph.Graph(_mod_graph.DictParentsProvider(ancestors))

    def make_breaking_graph(self, ancestors, break_on):

        """Make a Graph that raises an exception if we hit a node."""

        g = self.make_graph(ancestors)

        orig_parent_map = g.get_parent_map

        def get_parent_map(keys):

            bad_keys = set(keys).intersection(break_on)

            if bad_keys:

                self.fail('key(s) %s was accessed' % (sorted(bad_keys),))

            return orig_parent_map(keys)

        g.get_parent_map = get_parent_map

        return g

class TestGraph(TestCaseWithMemoryTransport):

    def make_graph(self, ancestors):

        return _mod_graph.Graph(_mod_graph.DictParentsProvider(ancestors))

    def prepare_memory_tree(self, location):

        tree = self.make_branch_and_memory_tree(location)

        tree.lock_write()

        tree.add('.')

        return tree

    def build_ancestry(self, tree, ancestors):

        """Create an ancestry as specified by a graph dict

        :param tree: A tree to use

        :param ancestors: a dict of {node: [node_parent, ...]}

        """

        pending = [NULL_REVISION]

        descendants = {}

        for descendant, parents in ancestors.iteritems():

            for parent in parents:

                descendants.setdefault(parent, []).append(descendant)

        while len(pending) > 0:

            cur_node = pending.pop()

            for descendant in descendants.get(cur_node, []):

                if tree.branch.repository.has_revision(descendant):

                    continue

                parents = [p for p in ancestors[descendant] if p is not

                           NULL_REVISION]

                if len([p for p in parents if not

                    tree.branch.repository.has_revision(p)]) > 0:

                    continue

                tree.set_parent_ids(parents)

                if len(parents) > 0:

                    left_parent = parents[0]

                else:

                    left_parent = NULL_REVISION

                tree.branch.set_last_revision_info(

                    len(tree.branch._lefthand_history(left_parent)),

                    left_parent)

                tree.commit(descendant, rev_id=descendant)

                pending.append(descendant)

    def test_lca(self):

        """Test finding least common ancestor.

        ancestry_1 should always have a single common ancestor

        """

        graph = self.make_graph(ancestry_1)

        self.assertRaises(errors.InvalidRevisionId, graph.find_lca, None)

        self.assertEqual(set([NULL_REVISION]),

                         graph.find_lca(NULL_REVISION, NULL_REVISION))

        self.assertEqual(set([NULL_REVISION]),

                         graph.find_lca(NULL_REVISION, 'rev1'))

        self.assertEqual(set(['rev1']), graph.find_lca('rev1', 'rev1'))

        self.assertEqual(set(['rev1']), graph.find_lca('rev2a', 'rev2b'))

    def test_no_unique_lca(self):

        """Test error when one revision is not in the graph"""

        graph = self.make_graph(ancestry_1)

        self.assertRaises(errors.NoCommonAncestor, graph.find_unique_lca,

                          'rev1', '1rev')

    def test_lca_criss_cross(self):

        """Test least-common-ancestor after a criss-cross merge."""

        graph = self.make_graph(criss_cross)

        self.assertEqual(set(['rev2a', 'rev2b']),

                         graph.find_lca('rev3a', 'rev3b'))

        self.assertEqual(set(['rev2b']),

                         graph.find_lca('rev3a', 'rev3b', 'rev2b'))

    def test_lca_shortcut(self):

        """Test least-common ancestor on this history shortcut"""

        graph = self.make_graph(history_shortcut)

        self.assertEqual(set(['rev2b']), graph.find_lca('rev3a', 'rev3b'))

    def test_recursive_unique_lca(self):

        """Test finding a unique least common ancestor.

        ancestry_1 should always have a single common ancestor

        """

        graph = self.make_graph(ancestry_1)

        self.assertEqual(NULL_REVISION,

                         graph.find_unique_lca(NULL_REVISION, NULL_REVISION))

        self.assertEqual(NULL_REVISION,

                         graph.find_unique_lca(NULL_REVISION, 'rev1'))

        self.assertEqual('rev1', graph.find_unique_lca('rev1', 'rev1'))

        self.assertEqual('rev1', graph.find_unique_lca('rev2a', 'rev2b'))

        self.assertEqual(('rev1', 1,),

                         graph.find_unique_lca('rev2a', 'rev2b',

                         count_steps=True))

    def assertRemoveDescendants(self, expected, graph, revisions):

        parents = graph.get_parent_map(revisions)

        self.assertEqual(expected,

                         graph._remove_simple_descendants(revisions, parents))

    def test__remove_simple_descendants(self):

        graph = self.make_graph(ancestry_1)

        self.assertRemoveDescendants(set(['rev1']), graph,

            set(['rev1', 'rev2a', 'rev2b', 'rev3', 'rev4']))

    def test__remove_simple_descendants_disjoint(self):

        graph = self.make_graph(ancestry_1)

        self.assertRemoveDescendants(set(['rev1', 'rev3']), graph,

            set(['rev1', 'rev3']))

    def test__remove_simple_descendants_chain(self):

        graph = self.make_graph(ancestry_1)

        self.assertRemoveDescendants(set(['rev1']), graph,

            set(['rev1', 'rev2a', 'rev3']))

    def test__remove_simple_descendants_siblings(self):

        graph = self.make_graph(ancestry_1)

        self.assertRemoveDescendants(set(['rev2a', 'rev2b']), graph,

            set(['rev2a', 'rev2b', 'rev3']))

    def test_unique_lca_criss_cross(self):

        """Ensure we don't pick non-unique lcas in a criss-cross"""

        graph = self.make_graph(criss_cross)

        self.assertEqual('rev1', graph.find_unique_lca('rev3a', 'rev3b'))

        lca, steps = graph.find_unique_lca('rev3a', 'rev3b', count_steps=True)

        self.assertEqual('rev1', lca)

        self.assertEqual(2, steps)

    def test_unique_lca_null_revision(self):

        """Ensure we pick NULL_REVISION when necessary"""

        graph = self.make_graph(criss_cross2)

        self.assertEqual('rev1b', graph.find_unique_lca('rev2a', 'rev1b'))

        self.assertEqual(NULL_REVISION,

                         graph.find_unique_lca('rev2a', 'rev2b'))

    def test_unique_lca_null_revision2(self):

        """Ensure we pick NULL_REVISION when necessary"""

        graph = self.make_graph(ancestry_2)

        self.assertEqual(NULL_REVISION,

                         graph.find_unique_lca('rev4a', 'rev1b'))

    def test_lca_double_shortcut(self):

        graph = self.make_graph(double_shortcut)

        self.assertEqual('c', graph.find_unique_lca('f', 'g'))

    def test_common_ancestor_two_repos(self):

        """Ensure we do unique_lca using data from two repos"""

        mainline_tree = self.prepare_memory_tree('mainline')

        self.build_ancestry(mainline_tree, mainline)

        self.addCleanup(mainline_tree.unlock)

        # This is cheating, because the revisions in the graph are actually

        # different revisions, despite having the same revision-id.

        feature_tree = self.prepare_memory_tree('feature')

        self.build_ancestry(feature_tree, feature_branch)

        self.addCleanup(feature_tree.unlock)

        graph = mainline_tree.branch.repository.get_graph(

            feature_tree.branch.repository)

        self.assertEqual('rev2b', graph.find_unique_lca('rev2a', 'rev3b'))

    def test_graph_difference(self):

        graph = self.make_graph(ancestry_1)

        self.assertEqual((set(), set()), graph.find_difference('rev1', 'rev1'))

        self.assertEqual((set(), set(['rev1'])),

                         graph.find_difference(NULL_REVISION, 'rev1'))

        self.assertEqual((set(['rev1']), set()),

                         graph.find_difference('rev1', NULL_REVISION))

        self.assertEqual((set(['rev2a', 'rev3']), set(['rev2b'])),

                         graph.find_difference('rev3', 'rev2b'))

        self.assertEqual((set(['rev4', 'rev3', 'rev2a']), set()),

                         graph.find_difference('rev4', 'rev2b'))

    def test_graph_difference_separate_ancestry(self):

        graph = self.make_graph(ancestry_2)

        self.assertEqual((set(['rev1a']), set(['rev1b'])),

                         graph.find_difference('rev1a', 'rev1b'))

        self.assertEqual((set(['rev1a', 'rev2a', 'rev3a', 'rev4a']),

                          set(['rev1b'])),

                         graph.find_difference('rev4a', 'rev1b'))

    def test_graph_difference_criss_cross(self):

        graph = self.make_graph(criss_cross)

        self.assertEqual((set(['rev3a']), set(['rev3b'])),

                         graph.find_difference('rev3a', 'rev3b'))

        self.assertEqual((set([]), set(['rev3b', 'rev2b'])),

                         graph.find_difference('rev2a', 'rev3b'))

    def test_graph_difference_extended_history(self):

        graph = self.make_graph(extended_history_shortcut)

        self.assertEqual((set(['e']), set(['f'])),

                         graph.find_difference('e', 'f'))

        self.assertEqual((set(['f']), set(['e'])),

                         graph.find_difference('f', 'e'))

    def test_graph_difference_double_shortcut(self):

        graph = self.make_graph(double_shortcut)

        self.assertEqual((set(['d', 'f']), set(['e', 'g'])),

                         graph.find_difference('f', 'g'))

    def test_graph_difference_complex_shortcut(self):

        graph = self.make_graph(complex_shortcut)

        self.assertEqual((set(['m', 'i', 'e']), set(['n', 'h'])),

                         graph.find_difference('m', 'n'))

    def test_graph_difference_complex_shortcut2(self):

        graph = self.make_graph(complex_shortcut2)

        self.assertEqual((set(['t']), set(['j', 'u'])),

                         graph.find_difference('t', 'u'))

    def test_graph_difference_shortcut_extra_root(self):

        graph = self.make_graph(shortcut_extra_root)

        self.assertEqual((set(['e']), set(['f', 'g'])),

                         graph.find_difference('e', 'f'))

    def test_stacked_parents_provider(self):

        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev3']})

        parents2 = _mod_graph.DictParentsProvider({'rev1': ['rev4']})

        stacked = _mod_graph.StackedParentsProvider([parents1, parents2])

        self.assertEqual({'rev1':['rev4'], 'rev2':['rev3']},

                         stacked.get_parent_map(['rev1', 'rev2']))

        self.assertEqual({'rev2':['rev3'], 'rev1':['rev4']},

                         stacked.get_parent_map(['rev2', 'rev1']))

        self.assertEqual({'rev2':['rev3']},

                         stacked.get_parent_map(['rev2', 'rev2']))

        self.assertEqual({'rev1':['rev4']},

                         stacked.get_parent_map(['rev1', 'rev1']))

    def test_stacked_parents_provider_overlapping(self):

        # rev2 is availible in both providers.

        # 1

        # |

        # 2

        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev1']})

        parents2 = _mod_graph.DictParentsProvider({'rev2': ['rev1']})

        stacked = _mod_graph.StackedParentsProvider([parents1, parents2])

        self.assertEqual({'rev2': ['rev1']},

                         stacked.get_parent_map(['rev2']))

    def test__stacked_parents_provider_deprecated(self):

        parents1 = _mod_graph.DictParentsProvider({'rev2': ['rev3']})

        parents2 = _mod_graph.DictParentsProvider({'rev1': ['rev4']})

        stacked = self.applyDeprecated(deprecated_in((1, 16, 0)),

                    _mod_graph._StackedParentsProvider, [parents1, parents2])

        self.assertEqual({'rev1':['rev4'], 'rev2':['rev3']},

                         stacked.get_parent_map(['rev1', 'rev2']))

        self.assertEqual({'rev2':['rev3'], 'rev1':['rev4']},

                         stacked.get_parent_map(['rev2', 'rev1']))

        self.assertEqual({'rev2':['rev3']},

                         stacked.get_parent_map(['rev2', 'rev2']))

        self.assertEqual({'rev1':['rev4']},

                         stacked.get_parent_map(['rev1', 'rev1']))

    def test_iter_topo_order(self):

        graph = self.make_graph(ancestry_1)

        args = ['rev2a', 'rev3', 'rev1']

        topo_args = list(graph.iter_topo_order(args))

        self.assertEqual(set(args), set(topo_args))