← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_ancestry.py

Exclude more files from dumb-rsync upload

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_ancestry.py
29
29
    def test_straightline_ancestry(self):
30
30
        """Test ancestry file when just committing."""
31
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')
 
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')
40
41
 
41
42
        ancs = b.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.get_ancestry('tester@foo--1'))
42
46
 
43
47
    def test_none_is_always_an_ancestor(self):
44
48
        b = Branch.initialize('.')
45
49
        # note this is tested before any commits are done.
46
50
        self.assertEqual(True, is_ancestor(None, None, b))
47
 
        b.commit(message='one',
48
 
                 allow_pointless=True,
49
 
                 rev_id='tester@foo--1')
 
51
        wt = b.working_tree()
 
52
        wt.commit(message='one',
 
53
                  allow_pointless=True,
 
54
                  rev_id='tester@foo--1')
50
55
        self.assertEqual(True, is_ancestor(None, None, b))
51
56
        self.assertEqual(True, is_ancestor('tester@foo--1', None, b))
52
57
        self.assertEqual(False, is_ancestor(None, 'tester@foo--1', b))