← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_missing.py

  • Committer: Andrew Bennetts
  • Date: 2008-09-05 10:48:03 UTC
  • mto: This revision was merged to the branch mainline in revision 3693.
  • Revision ID: andrew.bennetts@canonical.com-20080905104803-6g72dz6wcldosfs2
Remove monkey-patching of branch._ensure_real from test_remote.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_missing.py
1
 
# Copyright (C) 2005 by Canonical Ltd
 
1
# Copyright (C) 2005 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
import os
18
18
 
19
19
 
20
 
from bzrlib.builtins import merge
21
 
from bzrlib.missing import find_unmerged
 
20
from bzrlib import (
 
21
    missing,
 
22
    tests,
 
23
    )
 
24
from bzrlib.missing import (
 
25
    iter_log_revisions,
 
26
    )
22
27
from bzrlib.tests import TestCaseWithTransport
23
28
from bzrlib.workingtree import WorkingTree
24
29
 
25
30
 
26
31
class TestMissing(TestCaseWithTransport):
27
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
            
28
37
    def test_find_unmerged(self):
29
38
        original_tree = self.make_branch_and_tree('original')
30
39
        original = original_tree.branch
32
41
        puller = puller_tree.branch
33
42
        merger_tree = self.make_branch_and_tree('merger')
34
43
        merger = merger_tree.branch
35
 
        self.assertEqual(find_unmerged(original, puller), ([], []))
 
44
        self.assertUnmerged(([], []), original, puller)
36
45
        original_tree.commit('a', rev_id='a')
37
 
        self.assertEqual(find_unmerged(original, puller), ([(1, u'a')], []))
 
46
        self.assertUnmerged(([(1, 'a')], []), original, puller)
38
47
        puller_tree.pull(original)
39
 
        self.assertEqual(find_unmerged(original, puller), ([], []))
 
48
        self.assertUnmerged(([], []), original, puller)
40
49
        merger_tree.pull(original)
41
50
        original_tree.commit('b', rev_id='b')
42
51
        original_tree.commit('c', rev_id='c')
43
 
        self.assertEqual(find_unmerged(original, puller), ([(2, u'b'), 
44
 
                                                            (3, u'c')], []))
 
52
        self.assertUnmerged(([(2, 'b'), (3, 'c')], []),
 
53
                            original, puller)
45
54
 
46
55
        puller_tree.pull(original)
47
 
        self.assertEqual(find_unmerged(original, puller), ([], []))
48
 
        self.assertEqual(find_unmerged(original, merger), ([(2, u'b'), 
49
 
                                                            (3, u'c')], []))
50
 
        merge(['original', -1], [None, None], this_dir='merger')
51
 
        self.assertEqual(find_unmerged(original, merger), ([(2, u'b'), 
52
 
                                                            (3, u'c')], []))
 
56
        self.assertUnmerged(([], []), original, puller)
 
57
        self.assertUnmerged(([(2, 'b'), (3, 'c')], []),
 
58
                            original, merger)
 
59
        merger_tree.merge_from_branch(original)
 
60
        self.assertUnmerged(([(2, 'b'), (3, 'c')], []),
 
61
                            original, merger)
53
62
        merger_tree.commit('d', rev_id='d')
54
 
        self.assertEqual(find_unmerged(original, merger), ([], [(2, 'd')]))
 
63
        self.assertUnmerged(([], [(2, 'd')]), original, merger)
 
64
 
 
65
    def test_iter_log_revisions(self):
 
66
        base_tree = self.make_branch_and_tree('base')
 
67
        self.build_tree(['base/a'])
 
68
        base_tree.add(['a'], ['a-id'])
 
69
        base_tree.commit('add a', rev_id='b-1')
 
70
 
 
71
        child_tree = base_tree.bzrdir.sprout('child').open_workingtree()
 
72
 
 
73
        self.build_tree(['child/b'])
 
74
        child_tree.add(['b'], ['b-id'])
 
75
        child_tree.commit('adding b', rev_id='c-2')
 
76
 
 
77
        child_tree.remove(['a'])
 
78
        child_tree.commit('removing a', rev_id='c-3')
 
79
 
 
80
        self.build_tree_contents([('child/b', 'new contents for b\n')])
 
81
        child_tree.commit('modifying b', rev_id='c-4')
 
82
 
 
83
        child_tree.rename_one('b', 'c')
 
84
        child_tree.commit('rename b=>c', rev_id='c-5')
 
85
 
 
86
        base_extra, child_extra = missing.find_unmerged(base_tree.branch,
 
87
                                                        child_tree.branch)
 
88
        results = list(iter_log_revisions(base_extra, 
 
89
                            base_tree.branch.repository,
 
90
                            verbose=True))
 
91
        self.assertEqual([], results)
 
92
 
 
93
        results = list(iter_log_revisions(child_extra,
 
94
                            child_tree.branch.repository,
 
95
                            verbose=True))
 
96
        self.assertEqual(4, len(results))
 
97
 
 
98
        r0,r1,r2,r3 = results
 
99
 
 
100
        self.assertEqual((2, 'c-2'), (r0.revno, r0.rev.revision_id))
 
101
        self.assertEqual((3, 'c-3'), (r1.revno, r1.rev.revision_id))
 
102
        self.assertEqual((4, 'c-4'), (r2.revno, r2.rev.revision_id))
 
103
        self.assertEqual((5, 'c-5'), (r3.revno, r3.rev.revision_id))
 
104
 
 
105
        delta0 = r0.delta
 
106
        self.assertNotEqual(None, delta0)
 
107
        self.assertEqual([('b', 'b-id', 'file')], delta0.added)
 
108
        self.assertEqual([], delta0.removed)
 
109
        self.assertEqual([], delta0.renamed)
 
110
        self.assertEqual([], delta0.modified)
 
111
 
 
112
        delta1 = r1.delta
 
113
        self.assertNotEqual(None, delta1)
 
114
        self.assertEqual([], delta1.added)
 
115
        self.assertEqual([('a', 'a-id', 'file')], delta1.removed)
 
116
        self.assertEqual([], delta1.renamed)
 
117
        self.assertEqual([], delta1.modified)
 
118
 
 
119
        delta2 = r2.delta
 
120
        self.assertNotEqual(None, delta2)
 
121
        self.assertEqual([], delta2.added)
 
122
        self.assertEqual([], delta2.removed)
 
123
        self.assertEqual([], delta2.renamed)
 
124
        self.assertEqual([('b', 'b-id', 'file', True, False)], delta2.modified)
 
125
 
 
126
        delta3 = r3.delta
 
127
        self.assertNotEqual(None, delta3)
 
128
        self.assertEqual([], delta3.added)
 
129
        self.assertEqual([], delta3.removed)
 
130
        self.assertEqual([('b', 'c', 'b-id', 'file', False, False)],
 
131
                         delta3.renamed)
 
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')