/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_missing.py

  • Committer: John Arbash Meinel
  • Date: 2008-05-19 21:35:52 UTC
  • mto: This revision was merged to the branch mainline in revision 3441.
  • Revision ID: john@arbash-meinel.com-20080519213552-8jc1yc4w8rqhgzri
switch find_unmerged to use the new function

The api is very compatible, so we don't really need to expose a new function.
So make it hidden, and leave find_unmerged to take out the write lock and call it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_missing.py
22
22
    tests,
23
23
    )
24
24
from bzrlib.missing import (
25
 
    find_unmerged,
26
25
    iter_log_revisions,
27
26
    )
28
27
from bzrlib.tests import TestCaseWithTransport
31
30
 
32
31
class TestMissing(TestCaseWithTransport):
33
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
            
34
37
    def test_find_unmerged(self):
35
38
        original_tree = self.make_branch_and_tree('original')
36
39
        original = original_tree.branch
38
41
        puller = puller_tree.branch
39
42
        merger_tree = self.make_branch_and_tree('merger')
40
43
        merger = merger_tree.branch
41
 
        self.assertEqual(find_unmerged(original, puller), ([], []))
 
44
        self.assertUnmerged(([], []), original, puller)
42
45
        original_tree.commit('a', rev_id='a')
43
 
        self.assertEqual(find_unmerged(original, puller), ([(1, u'a')], []))
 
46
        self.assertUnmerged(([(1, 'a')], []), original, puller)
44
47
        puller_tree.pull(original)
45
 
        self.assertEqual(find_unmerged(original, puller), ([], []))
 
48
        self.assertUnmerged(([], []), original, puller)
46
49
        merger_tree.pull(original)
47
50
        original_tree.commit('b', rev_id='b')
48
51
        original_tree.commit('c', rev_id='c')
49
 
        self.assertEqual(find_unmerged(original, puller), ([(2, u'b'), 
50
 
                                                            (3, u'c')], []))
 
52
        self.assertUnmerged(([(2, 'b'), (3, 'c')], []),
 
53
                            original, puller)
51
54
 
52
55
        puller_tree.pull(original)
53
 
        self.assertEqual(find_unmerged(original, puller), ([], []))
54
 
        self.assertEqual(find_unmerged(original, merger), ([(2, u'b'), 
55
 
                                                            (3, u'c')], []))
 
56
        self.assertUnmerged(([], []), original, puller)
 
57
        self.assertUnmerged(([(2, 'b'), (3, 'c')], []),
 
58
                            original, merger)
56
59
        merger_tree.merge_from_branch(original)
57
 
        self.assertEqual(find_unmerged(original, merger), ([(2, u'b'), 
58
 
                                                            (3, u'c')], []))
 
60
        self.assertUnmerged(([(2, 'b'), (3, 'c')], []),
 
61
                            original, merger)
59
62
        merger_tree.commit('d', rev_id='d')
60
 
        self.assertEqual(find_unmerged(original, merger), ([], [(2, 'd')]))
 
63
        self.assertUnmerged(([], [(2, 'd')]), original, merger)
61
64
 
62
65
    def test_iter_log_revisions(self):
63
66
        base_tree = self.make_branch_and_tree('base')
80
83
        child_tree.rename_one('b', 'c')
81
84
        child_tree.commit('rename b=>c', rev_id='c-5')
82
85
 
83
 
        base_extra, child_extra = find_unmerged(base_tree.branch,
84
 
                                                child_tree.branch)
 
86
        base_extra, child_extra = missing.find_unmerged(base_tree.branch,
 
87
                                                        child_tree.branch)
85
88
        results = list(iter_log_revisions(base_extra, 
86
89
                            base_tree.branch.repository,
87
90
                            verbose=True))
129
132
        self.assertEqual([], delta3.modified)
130
133
 
131
134
 
132
 
class TestFindUnmergedMainlineRevisions(tests.TestCaseWithTransport):
 
135
class TestFindUnmerged(tests.TestCaseWithTransport):
133
136
 
134
137
    def assertUnmerged(self, local, remote, local_branch, remote_branch,
135
138
                       restrict):
136
139
        """Check the output of find_unmerged_mainline_revisions"""
137
 
        local_extra, remote_extra = missing.find_unmerged_mainline_revisions(
 
140
        local_extra, remote_extra = missing.find_unmerged(
138
141
                                        local_branch, remote_branch, restrict)
139
142
        self.assertEqual(local, local_extra)
140
143
        self.assertEqual(remote, remote_extra)
172
175
        self.assertUnmerged(None, [(2, rev2)], tree.branch, tree2.branch,
173
176
                                               'remote')
174
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')