← 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: John Arbash Meinel
  • Date: 2006-07-30 13:54:37 UTC
  • mto: (1946.2.6 reduce-knit-churn)
  • mto: This revision was merged to the branch mainline in revision 1898.
  • Revision ID: john@arbash-meinel.com-20060730135437-1d722abdb14bff76
(jelmer) Install new intertree tests

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 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
19
19
import os
20
20
import sys
21
21
 
22
 
from bzrlib.tests import TestCaseWithMemoryTransport
 
22
from bzrlib.tests import TestCase, TestCaseWithTransport
23
23
from bzrlib.branch import Branch
24
24
from bzrlib.revision import is_ancestor
25
25
 
26
26
 
27
 
class TestAncestry(TestCaseWithMemoryTransport):
28
 
 
29
 
    def assertAncestryEqual(self, expected, revision_id, branch):
30
 
        """Assert that the ancestry of revision_id in branch is as expected."""
31
 
        ancestry = branch.repository.get_ancestry(revision_id)
32
 
        self.assertEqual(expected, ancestry)
 
27
class TestAncestry(TestCaseWithTransport):
33
28
 
34
29
    def test_straightline_ancestry(self):
35
30
        """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
 
 
44
 
        self.assertAncestryEqual([None, rev_id_one, rev_id_two],
45
 
            rev_id_two, branch)
46
 
        self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
 
31
        wt = self.make_branch_and_tree('.')
 
32
        b = wt.branch
 
33
 
 
34
        wt.commit(message='one',
 
35
                  allow_pointless=True,
 
36
                  rev_id='tester@foo--1')
 
37
 
 
38
        wt.commit(message='two',
 
39
                  allow_pointless=True,
 
40
                  rev_id='tester@foo--2')
 
41
 
 
42
        ancs = b.repository.get_ancestry('tester@foo--2')
 
43
        self.assertEqual([None, 'tester@foo--1', 'tester@foo--2'], ancs)
 
44
        self.assertEqual([None, 'tester@foo--1'], 
 
45
                         b.repository.get_ancestry('tester@foo--1'))
47
46
 
48
47
    def test_none_is_always_an_ancestor(self):
49
 
        tree = self.make_branch_and_memory_tree('.')
50
 
        tree.lock_write()
51
 
        tree.add('')
 
48
        wt = self.make_branch_and_tree('.')
 
49
        b = wt.branch
52
50
        # 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))
 
51
        self.assertEqual(True, is_ancestor(None, None, b))
 
52
        wt.commit(message='one',
 
53
                  allow_pointless=True,
 
54
                  rev_id='tester@foo--1')
 
55
        self.assertEqual(True, is_ancestor(None, None, b))
 
56
        self.assertEqual(True, is_ancestor('tester@foo--1', None, b))
 
57
        self.assertEqual(False, is_ancestor(None, 'tester@foo--1', b))
59
58
 
60
59
 
61
60
# TODO: check that ancestry is updated to include indirectly merged revisions