← 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: 2005-07-22 18:49:46 UTC
  • Revision ID: mbp@sourcefrog.net-20050722184946-4bd334f8c0d75957
- separate out code that just scans the hash cache to find files that are possibly
  changed; don't actually re-read them unless the content has changed

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
 
 
27
 
 
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)
34
 
 
35
 
    def test_straightline_ancestry(self):
36
 
        """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(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))
56
 
 
57
 
 
58
 
# TODO: check that ancestry is updated to include indirectly merged revisions