|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1 |
# (C) 2005 Canonical Ltd
|
2 |
||
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
||
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
||
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
from bzrlib.selftest import InTempDir |
|
18 |
||
19 |
||
20 |
def make_branches(): |
|
21 |
from bzrlib.branch import Branch |
|
22 |
from bzrlib.commit import commit |
|
|
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
23 |
from bzrlib.revision import validate_revision_id |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
24 |
import os |
25 |
os.mkdir("branch1") |
|
26 |
br1 = Branch("branch1", init=True) |
|
|
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
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") |
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
31 |
|
32 |
os.mkdir("branch2") |
|
33 |
br2 = Branch("branch2", init=True) |
|
34 |
br2.update_revisions(br1) |
|
|
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
35 |
commit(br2, "Commit four", rev_id="b@u-0-3") |
36 |
commit(br2, "Commit five", rev_id="b@u-0-4") |
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
37 |
revisions_2 = br2.revision_history() |
38 |
br1.add_pending_merge(revisions_2[4]) |
|
|
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
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") |
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
46 |
return br1, br2 |
47 |
||
48 |
||
49 |
class TestIsAncestor(InTempDir): |
|
|
1102
by Martin Pool
- merge test refactoring from robertc |
50 |
|
51 |
def test_is_ancestor(self): |
|
52 |
"""Test checking whether a revision is an ancestor of another revision"""
|
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
53 |
from bzrlib.revision import is_ancestor, MultipleRevisionSources |
54 |
from bzrlib.errors import NoSuchRevision |
|
55 |
br1, br2 = make_branches() |
|
56 |
revisions = br1.revision_history() |
|
57 |
revisions_2 = br2.revision_history() |
|
58 |
sources = MultipleRevisionSources(br1, br2) |
|
59 |
||
60 |
assert is_ancestor(revisions[0], revisions[0], sources) |
|
61 |
assert is_ancestor(revisions[1], revisions[0], sources) |
|
62 |
assert not is_ancestor(revisions[0], revisions[1], sources) |
|
63 |
assert is_ancestor(revisions_2[3], revisions[0], sources) |
|
64 |
self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3], |
|
65 |
revisions[0], br1) |
|
66 |
assert is_ancestor(revisions[3], revisions_2[4], sources) |
|
67 |
assert is_ancestor(revisions[3], revisions_2[4], br1) |
|
68 |
assert is_ancestor(revisions[3], revisions_2[3], sources) |
|
69 |
assert not is_ancestor(revisions[3], revisions_2[3], br1) |
|
70 |
||
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
71 |
class TestIntermediateRevisions(InTempDir): |
|
1092.1.42
by Robert Collins
merge from abentley |
72 |
|
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
73 |
def setUp(self): |
74 |
from bzrlib.commit import commit |
|
|
1092.1.42
by Robert Collins
merge from abentley |
75 |
InTempDir.setUp(self) |
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
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 |
||
|
1092.1.42
by Robert Collins
merge from abentley |
93 |
def test_intervene(self): |
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
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 |
||
|
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
134 |
class TestCommonAncestor(InTempDir): |
135 |
"""Test checking whether a revision is an ancestor of another revision"""
|
|
|
1092.1.39
by Robert Collins
merge from mpool |
136 |
|
137 |
def test_common_ancestor(self): |
|
|
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
138 |
from bzrlib.revision import find_present_ancestors, common_ancestor |
139 |
from bzrlib.revision import MultipleRevisionSources |
|
140 |
br1, br2 = make_branches() |
|
141 |
revisions = br1.revision_history() |
|
142 |
revisions_2 = br2.revision_history() |
|
143 |
sources = MultipleRevisionSources(br1, br2) |
|
144 |
||
145 |
expected_ancestors_list = {revisions[3]:(0, 0), |
|
146 |
revisions[2]:(1, 1), |
|
147 |
revisions_2[4]:(2, 1), |
|
148 |
revisions[1]:(3, 2), |
|
149 |
revisions_2[3]:(4, 2), |
|
150 |
revisions[0]:(5, 3) } |
|
151 |
ancestors_list = find_present_ancestors(revisions[3], sources) |
|
152 |
assert len(expected_ancestors_list) == len(ancestors_list) |
|
153 |
for key, value in expected_ancestors_list.iteritems(): |
|
154 |
self.assertEqual(ancestors_list[key], value, |
|
155 |
"key %r, %r != %r" % (key, ancestors_list[key], |
|
156 |
value)) |
|
157 |
||
158 |
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources), |
|
159 |
revisions[0]) |
|
160 |
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources), |
|
161 |
revisions[1]) |
|
162 |
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources), |
|
163 |
revisions[1]) |
|
164 |
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources), |
|
165 |
revisions[2]) |
|
166 |
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources), |
|
167 |
revisions_2[4]) |
|
168 |
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources), |
|
169 |
revisions_2[4]) |
|
170 |
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources), |
|
171 |
revisions[4]) |
|
172 |
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources), |
|
173 |
revisions_2[5]) |