← 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: Robert Collins
  • Date: 2007-06-04 00:51:54 UTC
  • mfrom: (2504 +trunk)
  • mto: (2507.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2505.
  • Revision ID: robertc@robertcollins.net-20070604005154-yvx2q8jnwiprw6du
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005, 2007 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
21
21
 
22
22
from bzrlib.tests import TestCaseWithMemoryTransport
23
23
from bzrlib.branch import Branch
 
24
from bzrlib.branchbuilder import BranchBuilder
24
25
from bzrlib.revision import is_ancestor
25
26
 
26
27
 
33
34
 
34
35
    def test_straightline_ancestry(self):
35
36
        """Test ancestry file when just committing."""
36
 
        tree = self.make_branch_and_memory_tree('.')
37
 
        branch = tree.branch
38
 
        tree.lock_write()
39
 
        tree.add('')
40
 
        rev_id_one = tree.commit('one')
41
 
        rev_id_two = tree.commit('two', allow_pointless=True)
42
 
        tree.unlock()
43
 
 
 
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()
44
41
        self.assertAncestryEqual([None, rev_id_one, rev_id_two],
45
42
            rev_id_two, branch)
46
43
        self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
47
44
 
48
 
    def test_none_is_always_an_ancestor(self):
49
 
        tree = self.make_branch_and_memory_tree('.')
50
 
        tree.lock_write()
51
 
        tree.add('')
52
 
        # note this is tested before any commits are done.
53
 
        self.assertTrue(is_ancestor(None, None, tree.branch))
54
 
        rev_id = tree.commit('one')
55
 
        tree.unlock()
56
 
        self.assertTrue(is_ancestor(None, None, tree.branch))
57
 
        self.assertTrue(is_ancestor(rev_id, None, tree.branch))
58
 
        self.assertFalse(is_ancestor(None, rev_id, tree.branch))
 
45
    def test_none_is_ancestor_empty_branch(self):
 
46
        branch = self.make_branch('.')
 
47
        self.assertTrue(is_ancestor(None, None, 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(None, None, branch))
 
54
        self.assertTrue(is_ancestor(rev_id, None, branch))
 
55
        self.assertFalse(is_ancestor(None, rev_id, branch))
59
56
 
60
57
 
61
58
# TODO: check that ancestry is updated to include indirectly merged revisions