← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.py

  • Committer: Martin Pool
  • Date: 2006-03-21 12:26:54 UTC
  • mto: This revision was merged to the branch mainline in revision 1621.
  • Revision ID: mbp@sourcefrog.net-20060321122654-514047ed65795a17
New developer commands 'weave-list' and 'weave-join'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
1
 
# Copyright (C) 2005, 2007 Canonical Ltd
2
 
#
 
1
# Copyright (C) 2005 by Canonical Ltd
 
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
#
 
12
 
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19
19
import os
20
20
import sys
21
21
 
22
 
from bzrlib.tests import TestCaseWithMemoryTransport
 
22
from bzrlib.tests import TestCase, TestCaseWithTransport
23
23
from bzrlib.branch import Branch
24
 
from bzrlib.branchbuilder import BranchBuilder
25
24
from bzrlib.revision import is_ancestor
26
25
 
27
26
 
28
 
class TestAncestry(TestCaseWithMemoryTransport):
29
 
 
30
 
    def assertAncestryEqual(self, expected, revision_id, branch):
31
 
        """Assert that the ancestry of revision_id in branch is as expected."""
32
 
        ancestry = branch.repository.get_ancestry(revision_id)
33
 
        self.assertEqual(expected, ancestry)
 
27
class TestAncestry(TestCaseWithTransport):
34
28
 
35
29
    def test_straightline_ancestry(self):
36
30
        """Test ancestry file when just committing."""
37
 
        builder = BranchBuilder(self.get_transport())
38
 
        rev_id_one = builder.build_commit()
39
 
        rev_id_two = builder.build_commit()
40
 
        branch = builder.get_branch()
41
 
        self.assertAncestryEqual([None, rev_id_one, rev_id_two],
42
 
            rev_id_two, branch)
43
 
        self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
44
 
 
45
 
    def test_none_is_ancestor_empty_branch(self):
46
 
        branch = self.make_branch('.')
47
 
        self.assertTrue(is_ancestor('null:', 'null:', branch))
48
 
 
49
 
    def test_none_is_ancestor_non_empty_branch(self):
50
 
        builder = BranchBuilder(self.get_transport())
51
 
        rev_id = builder.build_commit()
52
 
        branch = builder.get_branch()
53
 
        self.assertTrue(is_ancestor('null:', 'null:', branch))
54
 
        self.assertTrue(is_ancestor(rev_id, 'null:',  branch))
55
 
        self.assertFalse(is_ancestor('null:', rev_id, branch))
 
31
        wt = self.make_branch_and_tree('.')
 
32
        b = wt.branch
 
33
 
 
34
        wt.commit(message='one',
 
35
                  allow_pointless=True,
 
36
                  rev_id='tester@foo--1')
 
37
 
 
38
        wt.commit(message='two',
 
39
                  allow_pointless=True,
 
40
                  rev_id='tester@foo--2')
 
41
 
 
42
        ancs = b.repository.get_ancestry('tester@foo--2')
 
43
        self.assertEqual([None, 'tester@foo--1', 'tester@foo--2'], ancs)
 
44
        self.assertEqual([None, 'tester@foo--1'], 
 
45
                         b.repository.get_ancestry('tester@foo--1'))
 
46
 
 
47
    def test_none_is_always_an_ancestor(self):
 
48
        wt = self.make_branch_and_tree('.')
 
49
        b = wt.branch
 
50
        # note this is tested before any commits are done.
 
51
        self.assertEqual(True, is_ancestor(None, None, b))
 
52
        wt.commit(message='one',
 
53
                  allow_pointless=True,
 
54
                  rev_id='tester@foo--1')
 
55
        self.assertEqual(True, is_ancestor(None, None, b))
 
56
        self.assertEqual(True, is_ancestor('tester@foo--1', None, b))
 
57
        self.assertEqual(False, is_ancestor(None, 'tester@foo--1', b))
56
58
 
57
59
 
58
60
# TODO: check that ancestry is updated to include indirectly merged revisions