bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
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  | 
||
| 
1141
by Martin Pool
 - rename FunctionalTest to TestCaseInTempDir  | 
17  | 
from bzrlib.selftest import TestCaseInTempDir  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
18  | 
|
19  | 
||
20  | 
def make_branches():  | 
|
21  | 
from bzrlib.branch import Branch  | 
|
22  | 
from bzrlib.commit import commit  | 
|
23  | 
import os  | 
|
24  | 
os.mkdir("branch1")  | 
|
25  | 
br1 = Branch("branch1", init=True)  | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
26  | 
|
27  | 
commit(br1, "Commit one", rev_id="a@u-0-0")  | 
|
28  | 
commit(br1, "Commit two", rev_id="a@u-0-1")  | 
|
29  | 
commit(br1, "Commit three", rev_id="a@u-0-2")  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
30  | 
|
31  | 
os.mkdir("branch2")  | 
|
32  | 
br2 = Branch("branch2", init=True)  | 
|
33  | 
br2.update_revisions(br1)  | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
34  | 
commit(br2, "Commit four", rev_id="b@u-0-3")  | 
35  | 
commit(br2, "Commit five", rev_id="b@u-0-4")  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
36  | 
revisions_2 = br2.revision_history()  | 
37  | 
br1.add_pending_merge(revisions_2[4])  | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
38  | 
commit(br1, "Commit six", rev_id="a@u-0-3")  | 
39  | 
commit(br1, "Commit seven", rev_id="a@u-0-4")  | 
|
40  | 
commit(br2, "Commit eight", rev_id="b@u-0-5")  | 
|
41  | 
br1.add_pending_merge(br2.revision_history()[5])  | 
|
42  | 
commit(br1, "Commit nine", rev_id="a@u-0-5")  | 
|
43  | 
br2.add_pending_merge(br1.revision_history()[4])  | 
|
44  | 
commit(br2, "Commit ten", rev_id="b@u-0-6")  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
45  | 
return br1, br2  | 
46  | 
||
47  | 
||
| 
1141
by Martin Pool
 - rename FunctionalTest to TestCaseInTempDir  | 
48  | 
class TestIsAncestor(TestCaseInTempDir):  | 
| 
1102
by Martin Pool
 - merge test refactoring from robertc  | 
49  | 
def test_is_ancestor(self):  | 
50  | 
"""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  | 
51  | 
from bzrlib.revision import is_ancestor, MultipleRevisionSources  | 
52  | 
from bzrlib.errors import NoSuchRevision  | 
|
53  | 
br1, br2 = make_branches()  | 
|
54  | 
revisions = br1.revision_history()  | 
|
55  | 
revisions_2 = br2.revision_history()  | 
|
56  | 
sources = MultipleRevisionSources(br1, br2)  | 
|
57  | 
||
58  | 
assert is_ancestor(revisions[0], revisions[0], sources)  | 
|
59  | 
assert is_ancestor(revisions[1], revisions[0], sources)  | 
|
60  | 
assert not is_ancestor(revisions[0], revisions[1], sources)  | 
|
61  | 
assert is_ancestor(revisions_2[3], revisions[0], sources)  | 
|
62  | 
self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],  | 
|
63  | 
revisions[0], br1)  | 
|
64  | 
assert is_ancestor(revisions[3], revisions_2[4], sources)  | 
|
65  | 
assert is_ancestor(revisions[3], revisions_2[4], br1)  | 
|
66  | 
assert is_ancestor(revisions[3], revisions_2[3], sources)  | 
|
67  | 
assert not is_ancestor(revisions[3], revisions_2[3], br1)  | 
|
68  | 
||
69  | 
||
| 
1141
by Martin Pool
 - rename FunctionalTest to TestCaseInTempDir  | 
70  | 
class TestCommonAncestor(TestCaseInTempDir):  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
71  | 
"""Test checking whether a revision is an ancestor of another revision"""  | 
| 
1092.1.39
by Robert Collins
 merge from mpool  | 
72  | 
|
73  | 
def test_common_ancestor(self):  | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
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])  |