← 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: Aaron Bentley
  • Date: 2008-03-11 14:29:08 UTC
  • mto: This revision was merged to the branch mainline in revision 3264.
  • Revision ID: aaron@aaronbentley.com-20080311142908-yyrvcpn2mldt0fnn
Update documentation to reflect conflict-handling difference

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
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
from cStringIO import StringIO
 
19
import os
 
20
import sys
 
21
 
 
22
from bzrlib.tests import TestCaseWithMemoryTransport
 
23
from bzrlib.branch import Branch
 
24
from bzrlib.branchbuilder import BranchBuilder
 
25
from bzrlib.revision import is_ancestor
 
26
from bzrlib.symbol_versioning import one_zero
 
27
 
 
28
 
 
29
class TestAncestry(TestCaseWithMemoryTransport):
 
30
 
 
31
    def assertAncestryEqual(self, expected, revision_id, branch):
 
32
        """Assert that the ancestry of revision_id in branch is as expected."""
 
33
        ancestry = branch.repository.get_ancestry(revision_id)
 
34
        self.assertEqual(expected, ancestry)
 
35
 
 
36
    def test_straightline_ancestry(self):
 
37
        """Test ancestry file when just committing."""
 
38
        builder = BranchBuilder(self.get_transport())
 
39
        rev_id_one = builder.build_commit()
 
40
        rev_id_two = builder.build_commit()
 
41
        branch = builder.get_branch()
 
42
        self.assertAncestryEqual([None, rev_id_one, rev_id_two],
 
43
            rev_id_two, branch)
 
44
        self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
 
45
 
 
46
    def test_none_is_ancestor_empty_branch(self):
 
47
        branch = self.make_branch('.')
 
48
        self.assertTrue(self.applyDeprecated(one_zero,
 
49
                        is_ancestor, 'null:', 'null:', branch))
 
50
 
 
51
    def test_none_is_ancestor_non_empty_branch(self):
 
52
        builder = BranchBuilder(self.get_transport())
 
53
        rev_id = builder.build_commit()
 
54
        branch = builder.get_branch()
 
55
        branch.lock_read()
 
56
        self.addCleanup(branch.unlock)
 
57
        self.assertTrue(self.applyDeprecated(one_zero,
 
58
                        is_ancestor, 'null:', 'null:', branch))
 
59
        self.assertTrue(self.applyDeprecated(one_zero,
 
60
                        is_ancestor, rev_id, 'null:',  branch))
 
61
        self.assertFalse(self.applyDeprecated(one_zero,
 
62
                         is_ancestor, 'null:', rev_id, branch))
 
63
 
 
64
 
 
65
# TODO: check that ancestry is updated to include indirectly merged revisions