~bzr-pqm/bzr/bzr.dev
» Revision
974.1.91
(compared to revision 974.1.50)
: bzrlib/selftest/testrevision.py
« back to all changes in this revision
Viewing changes to bzrlib/selftest/testrevision.py
- browse files at revision 974.1.91
- compare with another revision
- download diff
- download tarball
- view history from revision 974.1.91
- Committer: Aaron Bentley
- Date: 2005-09-19 02:33:09 UTC
- mfrom: (1185.3.27)
- mto: (1185.1.29)
- mto: This revision was merged to the branch mainline in revision 1390.
- Revision ID: aaron.bentley@utoronto.ca-20050919023309-24e8871f7f8b31cf
Merged latest from mpool
- files added:
- bzrlib/builtins.py
- files removed:
- bzrlib/plugins/checkperms
- files modified:
- .bzrignore
added
removed
bzrlib/selftest/testrevision.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
from bzrlib.selftest import InTempDir
17
from bzrlib.selftest import TestCaseInTempDir
18
18
19
19
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
br1 = Branch("branch1", init=True)
25
br1 = Branch.initialize("branch1")
27
26
28
27
commit(br1, "Commit one", rev_id="a@u-0-0")
29
28
commit(br1, "Commit two", rev_id="a@u-0-1")
30
29
commit(br1, "Commit three", rev_id="a@u-0-2")
31
30
32
31
os.mkdir("branch2")
33
br2 = Branch("branch2", init=True)
32
br2 = Branch.initialize("branch2")
34
33
br2.update_revisions(br1)
35
34
commit(br2, "Commit four", rev_id="b@u-0-3")
36
35
commit(br2, "Commit five", rev_id="b@u-0-4")
46
45
return br1, br2
47
46
48
47
49
class TestIsAncestor(InTempDir):
50
48
class TestIsAncestor(TestCaseInTempDir):
51
49
def test_is_ancestor(self):
52
50
"""Test checking whether a revision is an ancestor of another revision"""
53
51
from bzrlib.revision import is_ancestor, MultipleRevisionSources
68
66
assert is_ancestor(revisions[3], revisions_2[3], sources)
69
67
assert not is_ancestor(revisions[3], revisions_2[3], br1)
70
68
71
class TestIntermediateRevisions(InTempDir):
72
73
def setUp(self):
74
from bzrlib.commit import commit
75
InTempDir.setUp(self)
76
self.br1, self.br2 = make_branches()
77
commit(self.br2, "Commit eleven", rev_id="b@u-0-7")
78
commit(self.br2, "Commit twelve", rev_id="b@u-0-8")
79
commit(self.br2, "Commit thirtteen", rev_id="b@u-0-9")
80
self.br1.add_pending_merge(self.br2.revision_history()[6])
81
commit(self.br1, "Commit fourtten", rev_id="a@u-0-6")
82
self.br2.add_pending_merge(self.br1.revision_history()[6])
83
commit(self.br2, "Commit fifteen", rev_id="b@u-0-10")
84
85
from bzrlib.revision import MultipleRevisionSources
86
self.sources = MultipleRevisionSources(self.br1, self.br2)
87
88
def intervene(self, ancestor, revision, revision_history=None):
89
from bzrlib.revision import get_intervening_revisions
90
return get_intervening_revisions(ancestor,revision, self.sources,
91
revision_history)
92
93
def test_intervene(self):
94
"""Find intermediate revisions, without requiring history"""
95
from bzrlib.errors import NotAncestor, NoSuchRevision
96
assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
97
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
98
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
99
['a@u-0-1', 'a@u-0-2'])
100
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
101
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
102
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
103
['b@u-0-4', 'a@u-0-3'])
104
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
105
self.br1.revision_history()),
106
['a@u-0-3'])
107
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
108
self.br1.revision_history()),
109
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
110
'a@u-0-5'])
111
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
112
self.br1.revision_history()),
113
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
114
'b@u-0-6'])
115
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
116
['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
117
'b@u-0-5'])
118
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
119
self.br2.revision_history()),
120
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
121
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
122
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
123
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
124
self.br2.revision_history()),
125
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
126
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
127
self.br2.revision_history())
128
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
129
'b@u-0-6', self.br2.revision_history())
130
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
131
'c@u-0-6', self.br2.revision_history())
132
133
134
class TestCommonAncestor(InTempDir):
69
class TestIntermediateRevisions(TestCaseInTempDir):
70
71
def setUp(self):
72
from bzrlib.commit import commit
73
TestCaseInTempDir.setUp(self)
74
self.br1, self.br2 = make_branches()
75
commit(self.br2, "Commit eleven", rev_id="b@u-0-7")
76
commit(self.br2, "Commit twelve", rev_id="b@u-0-8")
77
commit(self.br2, "Commit thirtteen", rev_id="b@u-0-9")
78
self.br1.add_pending_merge(self.br2.revision_history()[6])
79
commit(self.br1, "Commit fourtten", rev_id="a@u-0-6")
80
self.br2.add_pending_merge(self.br1.revision_history()[6])
81
commit(self.br2, "Commit fifteen", rev_id="b@u-0-10")
82
83
from bzrlib.revision import MultipleRevisionSources
84
self.sources = MultipleRevisionSources(self.br1, self.br2)
85
86
def intervene(self, ancestor, revision, revision_history=None):
87
from bzrlib.revision import get_intervening_revisions
88
return get_intervening_revisions(ancestor,revision, self.sources,
89
revision_history)
90
91
def test_intervene(self):
92
"""Find intermediate revisions, without requiring history"""
93
from bzrlib.errors import NotAncestor, NoSuchRevision
94
assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
95
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
96
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
97
['a@u-0-1', 'a@u-0-2'])
98
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
99
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
100
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
101
['b@u-0-4', 'a@u-0-3'])
102
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
103
self.br1.revision_history()),
104
['a@u-0-3'])
105
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
106
self.br1.revision_history()),
107
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
108
'a@u-0-5'])
109
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
110
self.br1.revision_history()),
111
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
112
'b@u-0-6'])
113
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
114
['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
115
'b@u-0-5'])
116
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
117
self.br2.revision_history()),
118
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
119
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
120
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
121
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
122
self.br2.revision_history()),
123
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
124
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
125
self.br2.revision_history())
126
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
127
'b@u-0-6', self.br2.revision_history())
128
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
129
'c@u-0-6', self.br2.revision_history())
130
131
class TestIntermediateRevisions(TestCaseInTempDir):
132
133
def setUp(self):
134
from bzrlib.commit import commit
135
TestCaseInTempDir.setUp(self)
136
self.br1, self.br2 = make_branches()
137
commit(self.br2, "Commit eleven", rev_id="b@u-0-7")
138
commit(self.br2, "Commit twelve", rev_id="b@u-0-8")
139
commit(self.br2, "Commit thirtteen", rev_id="b@u-0-9")
140
self.br1.add_pending_merge(self.br2.revision_history()[6])
141
commit(self.br1, "Commit fourtten", rev_id="a@u-0-6")
142
self.br2.add_pending_merge(self.br1.revision_history()[6])
143
commit(self.br2, "Commit fifteen", rev_id="b@u-0-10")
144
145
from bzrlib.revision import MultipleRevisionSources
146
self.sources = MultipleRevisionSources(self.br1, self.br2)
147
148
def intervene(self, ancestor, revision, revision_history=None):
149
from bzrlib.revision import get_intervening_revisions
150
return get_intervening_revisions(ancestor,revision, self.sources,
151
revision_history)
152
153
def test_intervene(self):
154
"""Find intermediate revisions, without requiring history"""
155
from bzrlib.errors import NotAncestor, NoSuchRevision
156
assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
157
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
158
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
159
['a@u-0-1', 'a@u-0-2'])
160
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
161
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
162
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
163
['b@u-0-4', 'a@u-0-3'])
164
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
165
self.br1.revision_history()),
166
['a@u-0-3'])
167
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
168
self.br1.revision_history()),
169
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
170
'a@u-0-5'])
171
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
172
self.br1.revision_history()),
173
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
174
'b@u-0-6'])
175
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
176
['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
177
'b@u-0-5'])
178
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
179
self.br2.revision_history()),
180
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
181
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
182
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
183
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
184
self.br2.revision_history()),
185
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
186
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
187
self.br2.revision_history())
188
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
189
'b@u-0-6', self.br2.revision_history())
190
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
191
'c@u-0-6', self.br2.revision_history())
192
193
194
class TestCommonAncestor(TestCaseInTempDir):
135
195
"""Test checking whether a revision is an ancestor of another revision"""
136
196
197
def test_old_common_ancestor(self):
198
"""Pick a resonable merge base using the old functionality"""
199
from bzrlib.revision import find_present_ancestors
200
from bzrlib.revision import old_common_ancestor as common_ancestor
201
from bzrlib.revision import MultipleRevisionSources
202
br1, br2 = make_branches()
203
revisions = br1.revision_history()
204
revisions_2 = br2.revision_history()
205
sources = MultipleRevisionSources(br1, br2)
206
207
expected_ancestors_list = {revisions[3]:(0, 0),
208
revisions[2]:(1, 1),
209
revisions_2[4]:(2, 1),
210
revisions[1]:(3, 2),
211
revisions_2[3]:(4, 2),
212
revisions[0]:(5, 3) }
213
ancestors_list = find_present_ancestors(revisions[3], sources)
214
assert len(expected_ancestors_list) == len(ancestors_list)
215
for key, value in expected_ancestors_list.iteritems():
216
self.assertEqual(ancestors_list[key], value,
217
"key %r, %r != %r" % (key, ancestors_list[key],
218
value))
219
220
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
221
revisions[0])
222
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
223
revisions[1])
224
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
225
revisions[1])
226
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
227
revisions[2])
228
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
229
revisions_2[4])
230
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
231
revisions_2[4])
232
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
233
revisions[4])
234
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
235
revisions_2[5])
236
137
237
def test_common_ancestor(self):
138
from bzrlib.revision import find_present_ancestors, common_ancestor
238
"""Pick a reasonable merge base"""
239
from bzrlib.revision import find_present_ancestors
240
from bzrlib.revision import common_ancestor
139
241
from bzrlib.revision import MultipleRevisionSources
140
242
br1, br2 = make_branches()
141
243
revisions = br1.revision_history()
170
272
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
171
273
revisions[4])
172
274
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
173
revisions_2[5])
275
revisions[4])
276
Loggerhead is a web-based interface for Breezy
Version: 2.0.1