« back to all changes in this revision
Viewing changes to bzrlib/selftest/testrevision.py
- browse files at revision 1092.1.42
- compare with another revision
- compare with revision 1092.1.42
- download diff
- download tarball
- view history from revision 1092.1.42
- Committer: Robert Collins
- Date: 2005-08-25 22:58:34 UTC
- mfrom: (974.1.43)
- mto: (974.1.50) (1185.1.10) (1092.3.1)
- mto: This revision was merged to the branch mainline in revision 1178.
- Revision ID: robertc@robertcollins.net-20050825225833-56355a1d8940c76e
merge from abentley
added
removed
bzrlib/selftest/testrevision.py
68
68
assert is_ancestor(revisions[3], revisions_2[3], sources)
69
69
assert not is_ancestor(revisions[3], revisions_2[3], br1)
70
70
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
71
133
72
134
class TestCommonAncestor(InTempDir):
73
135
"""Test checking whether a revision is an ancestor of another revision"""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1