← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevision.py

  • Committer: Aaron Bentley
  • Date: 2005-08-26 12:38:57 UTC
  • mfrom: (974.1.45)
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: abentley@panoramicfeedback.com-20050826123857-06b8856e0fa2d374
Fixed ancestor-picking when -r is specified

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
23
24
    import os
24
25
    os.mkdir("branch1")
25
26
    br1 = Branch("branch1", init=True)
26
 
    commit(br1, "Commit one")
27
 
    commit(br1, "Commit two")
28
 
    commit(br1, "Commit three")
 
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")
29
31
 
30
32
    os.mkdir("branch2")
31
33
    br2 = Branch("branch2", init=True)
32
34
    br2.update_revisions(br1)
33
 
    commit(br2, "Commit four")
34
 
    commit(br2, "Commit five")
 
35
    commit(br2, "Commit four", rev_id="b@u-0-3")
 
36
    commit(br2, "Commit five", rev_id="b@u-0-4")
35
37
    revisions_2 = br2.revision_history()
36
38
    br1.add_pending_merge(revisions_2[4])
37
 
    commit(br1, "Commit six")
 
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")
38
46
    return br1, br2
39
47
 
40
48
 
59
67
        assert is_ancestor(revisions[3], revisions_2[3], sources)
60
68
        assert not is_ancestor(revisions[3], revisions_2[3], br1)
61
69
 
 
70
class TestIntermediateRevisions(InTempDir):
 
71
    def setUp(self):
 
72
        from bzrlib.commit import commit
 
73
        self.br1, self.br2 = make_branches()
 
74
        commit(self.br2, "Commit eleven", rev_id="b@u-0-7")
 
75
        commit(self.br2, "Commit twelve", rev_id="b@u-0-8")
 
76
        commit(self.br2, "Commit thirtteen", rev_id="b@u-0-9")
 
77
        self.br1.add_pending_merge(self.br2.revision_history()[6])
 
78
        commit(self.br1, "Commit fourtten", rev_id="a@u-0-6")
 
79
        self.br2.add_pending_merge(self.br1.revision_history()[6])
 
80
        commit(self.br2, "Commit fifteen", rev_id="b@u-0-10")
 
81
 
 
82
        from bzrlib.revision import MultipleRevisionSources
 
83
        self.sources = MultipleRevisionSources(self.br1, self.br2)
 
84
 
 
85
    def intervene(self, ancestor, revision, revision_history=None):
 
86
        from bzrlib.revision import get_intervening_revisions
 
87
        return get_intervening_revisions(ancestor,revision, self.sources, 
 
88
                                         revision_history)
 
89
 
 
90
    def runTest(self):
 
91
        """Find intermediate revisions, without requiring history"""
 
92
        from bzrlib.errors import NotAncestor, NoSuchRevision
 
93
        assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
 
94
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
 
95
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'), 
 
96
                         ['a@u-0-1', 'a@u-0-2'])
 
97
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'), 
 
98
                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
 
99
        self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'), 
 
100
                         ['b@u-0-4', 'a@u-0-3'])
 
101
        self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3', 
 
102
                                        self.br1.revision_history()), 
 
103
                         ['a@u-0-3'])
 
104
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5', 
 
105
                                        self.br1.revision_history()), 
 
106
                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 
 
107
                          'a@u-0-5'])
 
108
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6', 
 
109
                         self.br1.revision_history()), 
 
110
                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 
 
111
                          'b@u-0-6'])
 
112
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'), 
 
113
                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4', 
 
114
                          'b@u-0-5'])
 
115
        self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6', 
 
116
                         self.br2.revision_history()), 
 
117
                         ['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
 
118
        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'), 
 
119
                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
 
120
        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10', 
 
121
                                        self.br2.revision_history()), 
 
122
                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
 
123
        self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6', 
 
124
                          self.br2.revision_history())
 
125
        self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10', 
 
126
                          'b@u-0-6', self.br2.revision_history())
 
127
        self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10', 
 
128
                          'c@u-0-6', self.br2.revision_history())
 
129
 
 
130
 
 
131
class TestCommonAncestor(InTempDir):
 
132
    """Test checking whether a revision is an ancestor of another revision"""
 
133
    def runTest(self):
 
134
        from bzrlib.revision import find_present_ancestors, common_ancestor
 
135
        from bzrlib.revision import MultipleRevisionSources
 
136
        br1, br2 = make_branches()
 
137
        revisions = br1.revision_history()
 
138
        revisions_2 = br2.revision_history()
 
139
        sources = MultipleRevisionSources(br1, br2)
 
140
 
 
141
        expected_ancestors_list = {revisions[3]:(0, 0), 
 
142
                                   revisions[2]:(1, 1),
 
143
                                   revisions_2[4]:(2, 1), 
 
144
                                   revisions[1]:(3, 2),
 
145
                                   revisions_2[3]:(4, 2),
 
146
                                   revisions[0]:(5, 3) }
 
147
        ancestors_list = find_present_ancestors(revisions[3], sources)
 
148
        assert len(expected_ancestors_list) == len(ancestors_list)
 
149
        for key, value in expected_ancestors_list.iteritems():
 
150
            self.assertEqual(ancestors_list[key], value, 
 
151
                              "key %r, %r != %r" % (key, ancestors_list[key],
 
152
                                                    value))
 
153
 
 
154
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
 
155
                          revisions[0])
 
156
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
 
157
                          revisions[1])
 
158
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
 
159
                          revisions[1])
 
160
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
 
161
                          revisions[2])
 
162
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
 
163
                          revisions_2[4])
 
164
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
 
165
                          revisions_2[4])
 
166
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
 
167
                          revisions[4])
 
168
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
 
169
                          revisions_2[5])
62
170
 
63
171
TEST_CLASSES = [
64
172
    TestIsAncestor,
 
173
    TestCommonAncestor,
 
174
    TestIntermediateRevisions,
65
175
    ]