« back to all changes in this revision
Viewing changes to bzrlib/tests/test_missing.py
- browse files at revision 3441
- compare with another revision
- compare with revision 3655
- download diff
- download tarball
- view history from revision 3441
- Committer: Canonical.com Patch Queue Manager
- Date: 2008-05-20 21:00:27 UTC
- mfrom: (3427.3.8 missing)
- Revision ID: pqm@pqm.ubuntu.com-20080520210027-wetfxldz1ggc5u2a
(jam) 'bzr missing' uses Graph.find* rather than using whole ancestry
comparisons (bug #174625)
comparisons (bug #174625)
added
removed
bzrlib/tests/test_missing.py
17
17
import os
18
18
19
19
20
from bzrlib import (
21
missing,
22
tests,
23
)
20
24
from bzrlib.missing import (
21
find_unmerged,
22
25
iter_log_revisions,
23
26
)
24
27
from bzrlib.tests import TestCaseWithTransport
27
30
28
31
class TestMissing(TestCaseWithTransport):
29
32
33
def assertUnmerged(self, expected, source, target, restrict='all'):
34
unmerged = missing.find_unmerged(source, target, restrict=restrict)
35
self.assertEqual(expected, unmerged)
36
30
37
def test_find_unmerged(self):
31
38
original_tree = self.make_branch_and_tree('original')
32
39
original = original_tree.branch
34
41
puller = puller_tree.branch
35
42
merger_tree = self.make_branch_and_tree('merger')
36
43
merger = merger_tree.branch
37
self.assertEqual(find_unmerged(original, puller), ([], []))
44
self.assertUnmerged(([], []), original, puller)
38
45
original_tree.commit('a', rev_id='a')
39
self.assertEqual(find_unmerged(original, puller), ([(1, u'a')], []))
46
self.assertUnmerged(([(1, 'a')], []), original, puller)
40
47
puller_tree.pull(original)
41
self.assertEqual(find_unmerged(original, puller), ([], []))
48
self.assertUnmerged(([], []), original, puller)
42
49
merger_tree.pull(original)
43
50
original_tree.commit('b', rev_id='b')
44
51
original_tree.commit('c', rev_id='c')
45
self.assertEqual(find_unmerged(original, puller), ([(2, u'b'),
46
(3, u'c')], []))
52
self.assertUnmerged(([(2, 'b'), (3, 'c')], []),
53
original, puller)
47
54
48
55
puller_tree.pull(original)
49
self.assertEqual(find_unmerged(original, puller), ([], []))
50
self.assertEqual(find_unmerged(original, merger), ([(2, u'b'),
51
(3, u'c')], []))
56
self.assertUnmerged(([], []), original, puller)
57
self.assertUnmerged(([(2, 'b'), (3, 'c')], []),
58
original, merger)
52
59
merger_tree.merge_from_branch(original)
53
self.assertEqual(find_unmerged(original, merger), ([(2, u'b'),
54
(3, u'c')], []))
60
self.assertUnmerged(([(2, 'b'), (3, 'c')], []),
61
original, merger)
55
62
merger_tree.commit('d', rev_id='d')
56
self.assertEqual(find_unmerged(original, merger), ([], [(2, 'd')]))
63
self.assertUnmerged(([], [(2, 'd')]), original, merger)
57
64
58
65
def test_iter_log_revisions(self):
59
66
base_tree = self.make_branch_and_tree('base')
76
83
child_tree.rename_one('b', 'c')
77
84
child_tree.commit('rename b=>c', rev_id='c-5')
78
85
79
base_extra, child_extra = find_unmerged(base_tree.branch,
80
child_tree.branch)
86
base_extra, child_extra = missing.find_unmerged(base_tree.branch,
87
child_tree.branch)
81
88
results = list(iter_log_revisions(base_extra,
82
89
base_tree.branch.repository,
83
90
verbose=True))
123
130
self.assertEqual([('b', 'c', 'b-id', 'file', False, False)],
124
131
delta3.renamed)
125
132
self.assertEqual([], delta3.modified)
133
134
135
class TestFindUnmerged(tests.TestCaseWithTransport):
136
137
def assertUnmerged(self, local, remote, local_branch, remote_branch,
138
restrict):
139
"""Check the output of find_unmerged_mainline_revisions"""
140
local_extra, remote_extra = missing.find_unmerged(
141
local_branch, remote_branch, restrict)
142
self.assertEqual(local, local_extra)
143
self.assertEqual(remote, remote_extra)
144
145
def test_same_branch(self):
146
tree = self.make_branch_and_tree('tree')
147
rev1 = tree.commit('one')
148
tree.lock_read()
149
self.addCleanup(tree.unlock)
150
self.assertUnmerged([], [], tree.branch, tree.branch, 'all')
151
152
def test_one_ahead(self):
153
tree = self.make_branch_and_tree('tree')
154
rev1 = tree.commit('one')
155
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
156
rev2 = tree2.commit('two')
157
tree.lock_read()
158
self.addCleanup(tree.unlock)
159
tree2.lock_read()
160
self.addCleanup(tree2.unlock)
161
self.assertUnmerged([], [(2, rev2)], tree.branch, tree2.branch, 'all')
162
self.assertUnmerged([(2, rev2)], [], tree2.branch, tree.branch, 'all')
163
164
def test_restrict(self):
165
tree = self.make_branch_and_tree('tree')
166
rev1 = tree.commit('one')
167
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
168
rev2 = tree2.commit('two')
169
tree.lock_read()
170
self.addCleanup(tree.unlock)
171
tree2.lock_read()
172
self.addCleanup(tree2.unlock)
173
self.assertUnmerged([], [(2, rev2)], tree.branch, tree2.branch, 'all')
174
self.assertUnmerged([], None, tree.branch, tree2.branch, 'local')
175
self.assertUnmerged(None, [(2, rev2)], tree.branch, tree2.branch,
176
'remote')
177
178
def test_merged(self):
179
tree = self.make_branch_and_tree('tree')
180
rev1 = tree.commit('one')
181
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
182
rev2 = tree2.commit('two')
183
rev3 = tree2.commit('three')
184
tree.merge_from_branch(tree2.branch)
185
rev4 = tree.commit('four')
186
187
tree.lock_read()
188
self.addCleanup(tree.unlock)
189
tree2.lock_read()
190
self.addCleanup(tree2.unlock)
191
192
self.assertUnmerged([(2, rev4)], [], tree.branch, tree2.branch, 'all')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1