← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevision.py

  • Committer: Martin Pool
  • Date: 2005-08-12 15:41:44 UTC
  • Revision ID: mbp@sourcefrog.net-20050812154144-bc98570a78b8f633
- merge in deferred revfile work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevision.py
20
20
def make_branches():
21
21
    from bzrlib.branch import Branch
22
22
    from bzrlib.commit import commit
23
 
    from bzrlib.revision import validate_revision_id
24
23
    import os
25
24
    os.mkdir("branch1")
26
25
    br1 = Branch("branch1", init=True)
27
 
    
28
 
    commit(br1, "Commit one", rev_id="a@u-0-0")
29
 
    commit(br1, "Commit two", rev_id="a@u-0-1")
30
 
    commit(br1, "Commit three", rev_id="a@u-0-2")
 
26
    commit(br1, "Commit one")
 
27
    commit(br1, "Commit two")
 
28
    commit(br1, "Commit three")
31
29
 
32
30
    os.mkdir("branch2")
33
31
    br2 = Branch("branch2", init=True)
34
32
    br2.update_revisions(br1)
35
 
    commit(br2, "Commit four", rev_id="b@u-0-3")
36
 
    commit(br2, "Commit five", rev_id="b@u-0-4")
 
33
    commit(br2, "Commit four")
 
34
    commit(br2, "Commit five")
37
35
    revisions_2 = br2.revision_history()
38
36
    br1.add_pending_merge(revisions_2[4])
39
 
    commit(br1, "Commit six", rev_id="a@u-0-3")
40
 
    commit(br1, "Commit seven", rev_id="a@u-0-4")
41
 
    commit(br2, "Commit eight", rev_id="b@u-0-5")
42
 
    br1.add_pending_merge(br2.revision_history()[5])
43
 
    commit(br1, "Commit nine", rev_id="a@u-0-5")
44
 
    br2.add_pending_merge(br1.revision_history()[4])
45
 
    commit(br2, "Commit ten", rev_id="b@u-0-6")
 
37
    commit(br1, "Commit six")
46
38
    return br1, br2
47
39
 
48
40
 
68
60
        assert not is_ancestor(revisions[3], revisions_2[3], br1)
69
61
 
70
62
 
71
 
class TestCommonAncestor(InTempDir):
72
 
    """Test checking whether a revision is an ancestor of another revision"""
73
 
    def runTest(self):
74
 
        from bzrlib.revision import find_present_ancestors, common_ancestor
75
 
        from bzrlib.revision import MultipleRevisionSources
76
 
        br1, br2 = make_branches()
77
 
        revisions = br1.revision_history()
78
 
        revisions_2 = br2.revision_history()
79
 
        sources = MultipleRevisionSources(br1, br2)
80
 
 
81
 
        expected_ancestors_list = {revisions[3]:(0, 0), 
82
 
                                   revisions[2]:(1, 1),
83
 
                                   revisions_2[4]:(2, 1), 
84
 
                                   revisions[1]:(3, 2),
85
 
                                   revisions_2[3]:(4, 2),
86
 
                                   revisions[0]:(5, 3) }
87
 
        ancestors_list = find_present_ancestors(revisions[3], sources)
88
 
        assert len(expected_ancestors_list) == len(ancestors_list)
89
 
        for key, value in expected_ancestors_list.iteritems():
90
 
            self.assertEqual(ancestors_list[key], value, 
91
 
                              "key %r, %r != %r" % (key, ancestors_list[key],
92
 
                                                    value))
93
 
 
94
 
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
95
 
                          revisions[0])
96
 
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
97
 
                          revisions[1])
98
 
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
99
 
                          revisions[1])
100
 
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
101
 
                          revisions[2])
102
 
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
103
 
                          revisions_2[4])
104
 
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
105
 
                          revisions_2[4])
106
 
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
107
 
                          revisions[4])
108
 
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
109
 
                          revisions_2[5])
110
 
 
111
63
TEST_CLASSES = [
112
64
    TestIsAncestor,
113
 
    TestCommonAncestor,
114
65
    ]