← 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: Canonical.com Patch Queue Manager
  • Date: 2006-10-10 07:23:07 UTC
  • mfrom: (2067.1.1 urandom-56883)
  • Revision ID: pqm@pqm.ubuntu.com-20061010072307-037a6f63da8a1bdd
(John Arbash Meinel) Handle exceptions while opening /dev/urandom

Show diffs side-by-side

added added

removed removed

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