← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_ancestry.py

Update news and readme

- better explanation of dependencies

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_ancestry.py
19
19
 
20
20
from cStringIO import StringIO
21
21
 
22
 
from bzrlib.tests import TestCase, TestCaseInTempDir
 
22
from bzrlib.selftest import TestCase, TestCaseInTempDir
23
23
from bzrlib.branch import Branch
24
24
from bzrlib.revision import is_ancestor
25
25
 
28
28
 
29
29
    def test_straightline_ancestry(self):
30
30
        """Test ancestry file when just committing."""
31
 
        b = Branch.initialize(u'.')
32
 
        wt = b.working_tree()
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')
 
31
        b = Branch.initialize('.')
 
32
 
 
33
        b.commit(message='one',
 
34
                 allow_pointless=True,
 
35
                 rev_id='tester@foo--1')
 
36
 
 
37
        b.commit(message='two',
 
38
                 allow_pointless=True,
 
39
                 rev_id='tester@foo--2')
41
40
 
42
41
        ancs = b.get_ancestry('tester@foo--2')
43
42
        self.assertEqual([None, 'tester@foo--1', 'tester@foo--2'], ancs)
45
44
                         b.get_ancestry('tester@foo--1'))
46
45
 
47
46
    def test_none_is_always_an_ancestor(self):
48
 
        b = Branch.initialize(u'.')
 
47
        b = Branch.initialize('.')
49
48
        # note this is tested before any commits are done.
50
49
        self.assertEqual(True, is_ancestor(None, None, b))
51
 
        wt = b.working_tree()
52
 
        wt.commit(message='one',
53
 
                  allow_pointless=True,
54
 
                  rev_id='tester@foo--1')
 
50
        b.commit(message='one',
 
51
                 allow_pointless=True,
 
52
                 rev_id='tester@foo--1')
55
53
        self.assertEqual(True, is_ancestor(None, None, b))
56
54
        self.assertEqual(True, is_ancestor('tester@foo--1', None, b))
57
55
        self.assertEqual(False, is_ancestor(None, 'tester@foo--1', b))