~bzr-pqm/bzr/bzr.dev

# (C) 2005 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

import os

from bzrlib.tests import TestCaseWithTransport

from bzrlib.branch import Branch

from bzrlib.commit import commit

from bzrlib.fetch import fetch

from bzrlib.revision import (find_present_ancestors, combined_graph,

                             is_ancestor, MultipleRevisionSources)

from bzrlib.trace import mutter

from bzrlib.errors import NoSuchRevision

# XXX: Make this a method of a merge base case

def make_branches(self):

    """Create two branches

    branch 1 has 6 commits, branch 2 has 3 commits

    commit 10 was a psuedo merge from branch 1

    but has been disabled until ghost support is

    implemented.

    the object graph is

    B:     A:

    a..0   a..0 

    a..1   a..1

    a..2   a..2

    b..3   a..3 merges b..4

    b..4   a..4

    b..5   a..5 merges b..5

    b..6 merges a4

    so A is missing b6 at the start

    and B is missing a3, a4, a5

    """

    tree1 = self.make_branch_and_tree("branch1")

    br1 = tree1.branch

    tree1.commit("Commit one", rev_id="a@u-0-0")

    tree1.commit("Commit two", rev_id="a@u-0-1")

    tree1.commit("Commit three", rev_id="a@u-0-2")

    tree2 = self.make_branch_and_tree("branch2")

    br2 = tree2.branch

    br2.update_revisions(br1)

    tree2.commit("Commit four", rev_id="b@u-0-3")

    tree2.commit("Commit five", rev_id="b@u-0-4")

    revisions_2 = br2.revision_history()

    fetch(from_branch=br2, to_branch=br1)

    tree1.add_pending_merge(revisions_2[4])

    self.assertEquals(revisions_2[4], 'b@u-0-4')

    tree1.commit("Commit six", rev_id="a@u-0-3")

    tree1.commit("Commit seven", rev_id="a@u-0-4")

    tree2.commit("Commit eight", rev_id="b@u-0-5")

    fetch(from_branch=br2, to_branch=br1)

    tree1.add_pending_merge(br2.revision_history()[5])

    tree1.commit("Commit nine", rev_id="a@u-0-5")

    # DO NOT FETCH HERE - we WANT a GHOST.

    #fetch(from_branch=br1, to_branch=br2)

    tree2.add_pending_merge(br1.revision_history()[4])

    tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")

    return br1, br2

class TestIsAncestor(TestCaseWithTransport):

    def test_recorded_ancestry(self):

        """Test that commit records all ancestors"""

        br1, br2 = make_branches(self)

        d = [('a@u-0-0', ['a@u-0-0']),

             ('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),

             ('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),

             ('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),

             ('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',

                          'b@u-0-4']),

             ('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',

                          'a@u-0-3']),

             ('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',

                          'a@u-0-3', 'a@u-0-4']),

             ('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',

                          'b@u-0-5']),

             ('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',

                          'b@u-0-3', 'b@u-0-4',

                          'b@u-0-5', 'a@u-0-5']),

             ('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',

                          'b@u-0-3', 'b@u-0-4',

                          'b@u-0-5', 'b@u-0-6']),

             ]

        br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')

        br2_only = ('b@u-0-6',)

        for branch in br1, br2:

            for rev_id, anc in d:

                if rev_id in br1_only and not branch is br1:

                    continue

                if rev_id in br2_only and not branch is br2:

                    continue

                mutter('ancestry of {%s}: %r',

                       rev_id, branch.repository.get_ancestry(rev_id))

                result = sorted(branch.repository.get_ancestry(rev_id))

                self.assertEquals(result, [None] + sorted(anc))

    def test_is_ancestor(self):

        """Test checking whether a revision is an ancestor of another revision"""

        br1, br2 = make_branches(self)

        revisions = br1.revision_history()

        revisions_2 = br2.revision_history()

        sources = br1

        self.assert_(is_ancestor(revisions[0], revisions[0], br1))

        self.assert_(is_ancestor(revisions[1], revisions[0], sources))

        self.assert_(not is_ancestor(revisions[0], revisions[1], sources))

        self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))

        # disabled mbp 20050914, doesn't seem to happen anymore

        ## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],

        ##                  revisions[0], br1)        

        self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))

        self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))

        self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))

        ## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))

class TestIntermediateRevisions(TestCaseWithTransport):

    def setUp(self):

        from bzrlib.commit import commit

        TestCaseWithTransport.setUp(self)

        self.br1, self.br2 = make_branches(self)

        self.br2.working_tree().commit("Commit eleven", rev_id="b@u-0-7")

        self.br2.working_tree().commit("Commit twelve", rev_id="b@u-0-8")

        self.br2.working_tree().commit("Commit thirtteen", rev_id="b@u-0-9")

        fetch(from_branch=self.br2, to_branch=self.br1)

        self.br1.working_tree().add_pending_merge(self.br2.revision_history()[6])

        self.br1.working_tree().commit("Commit fourtten", rev_id="a@u-0-6")

        fetch(from_branch=self.br1, to_branch=self.br2)

        self.br2.working_tree().add_pending_merge(self.br1.revision_history()[6])

        self.br2.working_tree().commit("Commit fifteen", rev_id="b@u-0-10")

        from bzrlib.revision import MultipleRevisionSources

        self.sources = MultipleRevisionSources(self.br1.repository,

                                               self.br2.repository)

    def intervene(self, ancestor, revision, revision_history=None):

        from bzrlib.revision import get_intervening_revisions

        return get_intervening_revisions(ancestor,revision, self.sources, 

                                         revision_history)

    def test_intervene(self):

        """Find intermediate revisions, without requiring history"""

        from bzrlib.errors import NotAncestor, NoSuchRevision

        self.assertEquals(len(self.intervene('a@u-0-0', 'a@u-0-0')), 0)

        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])

        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'), 

                         ['a@u-0-1', 'a@u-0-2'])

        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'), 

                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])

        self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'), 

                         ['b@u-0-4', 'a@u-0-3'])

        self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3', 

                                        self.br1.revision_history()), 

                         ['a@u-0-3'])

        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5', 

                                        self.br1.revision_history()), 

                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 

                          'a@u-0-5'])

        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6', 

                         self.br1.revision_history()), 

                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 

                          'b@u-0-6'])

        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'), 

                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4', 

                          'b@u-0-5'])

        self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6', 

                         self.br2.revision_history()), 

                         ['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])

        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'), 

                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])

        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10', 

                                        self.br2.revision_history()), 

                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])

        self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6', 

                          self.br2.revision_history())

        self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10', 

                          'b@u-0-6', self.br2.revision_history())

        self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10', 

                          'c@u-0-6', self.br2.revision_history())

class TestCommonAncestor(TestCaseWithTransport):

    """Test checking whether a revision is an ancestor of another revision"""

    def test_old_common_ancestor(self):

        """Pick a resonable merge base using the old functionality"""

        from bzrlib.revision import old_common_ancestor as common_ancestor

        br1, br2 = make_branches(self)

        revisions = br1.revision_history()

        revisions_2 = br2.revision_history()

        sources = br1.repository

        expected_ancestors_list = {revisions[3]:(0, 0), 

                                   revisions[2]:(1, 1),

                                   revisions_2[4]:(2, 1), 

                                   revisions[1]:(3, 2),

                                   revisions_2[3]:(4, 2),

                                   revisions[0]:(5, 3) }

        ancestors_list = find_present_ancestors(revisions[3], sources)

        self.assertEquals(len(expected_ancestors_list), len(ancestors_list))

        for key, value in expected_ancestors_list.iteritems():

            self.assertEqual(ancestors_list[key], value, 

                              "key %r, %r != %r" % (key, ancestors_list[key],

                                                    value))

        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),

                          revisions[0])

        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),

                          revisions[1])

        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),

                          revisions[1])

        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),

                          revisions[2])

        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),

                          revisions_2[4])

        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),

                          revisions_2[4])

        fetch(from_branch=br2, to_branch=br1)

        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),

                          revisions[4]) # revisions_2[5] is equally valid

        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),

                          revisions_2[5])

    def test_common_ancestor(self):

        """Pick a reasonable merge base"""

        from bzrlib.revision import common_ancestor

        br1, br2 = make_branches(self)

        revisions = br1.revision_history()

        revisions_2 = br2.revision_history()

        sources = MultipleRevisionSources(br1.repository, br2.repository)

        expected_ancestors_list = {revisions[3]:(0, 0), 

                                   revisions[2]:(1, 1),

                                   revisions_2[4]:(2, 1), 

                                   revisions[1]:(3, 2),

                                   revisions_2[3]:(4, 2),

                                   revisions[0]:(5, 3) }

        ancestors_list = find_present_ancestors(revisions[3], sources)

        self.assertEquals(len(expected_ancestors_list), len(ancestors_list))

        for key, value in expected_ancestors_list.iteritems():

            self.assertEqual(ancestors_list[key], value, 

                              "key %r, %r != %r" % (key, ancestors_list[key],

                                                    value))

        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),

                          revisions[0])

        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),

                          revisions[1])

        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),

                          revisions[1])

        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),

                          revisions[2])

        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),

                          revisions_2[4])

        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),

                          revisions_2[4])

        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),

                          revisions[4]) # revisions_2[5] is equally valid

        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),

                          revisions[4]) # revisions_2[5] is equally valid

    def test_combined(self):

        """combined_graph

        Ensure it's not order-sensitive

        """

        br1, br2 = make_branches(self)

        source = MultipleRevisionSources(br1.repository, br2.repository)

        combined_1 = combined_graph(br1.last_revision(), 

                                    br2.last_revision(), source)

        combined_2 = combined_graph(br2.last_revision(),

                                    br1.last_revision(), source)

        self.assertEquals(combined_1[1], combined_2[1])

        self.assertEquals(combined_1[2], combined_2[2])

        self.assertEquals(combined_1[3], combined_2[3])

        self.assertEquals(combined_1, combined_2)