← 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: Andrew Bennetts
  • Date: 2007-03-26 06:24:01 UTC
  • mto: This revision was merged to the branch mainline in revision 2376.
  • Revision ID: andrew.bennetts@canonical.com-20070326062401-k3nbefzje5332jaf
Deal with review comments from Robert:

  * Add my name to the NEWS file
  * Move the test case to a new module in branch_implementations
  * Remove revision_history cruft from identitymap and test_identitymap
  * Improve some docstrings

Also, this fixes a bug where revision_history was not returning a copy of the
cached data, allowing the cache to be corrupted.

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 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
from bzrlib.revision import is_ancestor
25
25
 
26
26
 
27
27
class TestAncestry(TestCaseWithMemoryTransport):
33
33
 
34
34
    def test_straightline_ancestry(self):
35
35
        """Test ancestry file when just committing."""
36
 
        builder = BranchBuilder(self.get_transport())
37
 
        rev_id_one = builder.build_commit()
38
 
        rev_id_two = builder.build_commit()
39
 
        branch = builder.get_branch()
 
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
 
40
44
        self.assertAncestryEqual([None, rev_id_one, rev_id_two],
41
45
            rev_id_two, branch)
42
46
        self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
43
47
 
 
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))
 
59
 
 
60
 
44
61
# TODO: check that ancestry is updated to include indirectly merged revisions