/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 breezy/tests/test_missing.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-23 23:51:34 UTC
  • mto: This revision was merged to the branch mainline in revision 7219.
  • Revision ID: jelmer@jelmer.uk-20181123235134-rbvofmn792ogx2ix
Move location_to_url to its own module.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_missing.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
 
 
1
# Copyright (C) 2005-2009, 2011 Canonical Ltd
 
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
import os
18
 
 
19
 
 
20
 
from bzrlib.builtins import merge
21
 
from bzrlib.missing import find_unmerged
22
 
from bzrlib.tests import TestCaseWithTransport
23
 
from bzrlib.workingtree import WorkingTree
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
from .. import (
 
18
    missing,
 
19
    tests,
 
20
    )
 
21
from ..missing import (
 
22
    iter_log_revisions,
 
23
    )
 
24
from . import TestCaseWithTransport
24
25
 
25
26
 
26
27
class TestMissing(TestCaseWithTransport):
27
28
 
 
29
    def assertUnmerged(self, expected, source, target, restrict='all',
 
30
                       backward=False):
 
31
        unmerged = missing.find_unmerged(source, target, restrict=restrict,
 
32
                                         backward=backward)
 
33
        self.assertEqual(expected, unmerged)
 
34
 
28
35
    def test_find_unmerged(self):
29
36
        original_tree = self.make_branch_and_tree('original')
30
37
        original = original_tree.branch
32
39
        puller = puller_tree.branch
33
40
        merger_tree = self.make_branch_and_tree('merger')
34
41
        merger = merger_tree.branch
35
 
        self.assertEqual(find_unmerged(original, puller), ([], []))
36
 
        original_tree.commit('a', rev_id='a')
37
 
        self.assertEqual(find_unmerged(original, puller), ([(1, u'a')], []))
38
 
        puller.pull(original)
39
 
        self.assertEqual(find_unmerged(original, puller), ([], []))
40
 
        merger.pull(original)
41
 
        original_tree.commit('b', rev_id='b')
42
 
        original_tree.commit('c', rev_id='c')
43
 
        self.assertEqual(find_unmerged(original, puller), ([(2, u'b'), 
44
 
                                                            (3, u'c')], []))
45
 
 
46
 
        puller.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')], []))
53
 
        merger_tree.commit('d', rev_id='d')
54
 
        self.assertEqual(find_unmerged(original, merger), ([], [(2, 'd')]))
 
42
        self.assertUnmerged(([], []), original, puller)
 
43
        original_tree.commit('a', rev_id=b'a')
 
44
        self.assertUnmerged(([('1', b'a', 0)], []), original, puller)
 
45
        puller_tree.pull(original)
 
46
        self.assertUnmerged(([], []), original, puller)
 
47
        merger_tree.pull(original)
 
48
        original_tree.commit('b', rev_id=b'b')
 
49
        original_tree.commit('c', rev_id=b'c')
 
50
        self.assertUnmerged(([('2', b'b', 0), ('3', b'c', 0)], []),
 
51
                            original, puller)
 
52
        self.assertUnmerged(([('3', b'c', 0), ('2', b'b', 0)], []),
 
53
                            original, puller, backward=True)
 
54
 
 
55
        puller_tree.pull(original)
 
56
        self.assertUnmerged(([], []), original, puller)
 
57
        self.assertUnmerged(([('2', b'b', 0), ('3', b'c', 0)], []),
 
58
                            original, merger)
 
59
        merger_tree.merge_from_branch(original)
 
60
        self.assertUnmerged(([('2', b'b', 0), ('3', b'c', 0)], []),
 
61
                            original, merger)
 
62
        merger_tree.commit('d', rev_id=b'd')
 
63
        self.assertUnmerged(([], [('2', b'd', 0)]), 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'], [b'a-id'])
 
69
        base_tree.commit('add a', rev_id=b'b-1')
 
70
 
 
71
        child_tree = base_tree.controldir.sprout('child').open_workingtree()
 
72
 
 
73
        self.build_tree(['child/b'])
 
74
        child_tree.add(['b'], [b'b-id'])
 
75
        child_tree.commit('adding b', rev_id=b'c-2')
 
76
 
 
77
        child_tree.remove(['a'])
 
78
        child_tree.commit('removing a', rev_id=b'c-3')
 
79
 
 
80
        self.build_tree_contents([('child/b', b'new contents for b\n')])
 
81
        child_tree.commit('modifying b', rev_id=b'c-4')
 
82
 
 
83
        child_tree.rename_one('b', 'c')
 
84
        child_tree.commit('rename b=>c', rev_id=b'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', b'c-2'), ('3', b'c-3'),
 
101
                          ('4', b'c-4'), ('5', b'c-5'), ],
 
102
                         [(r.revno, r.rev.revision_id) for r in results])
 
103
 
 
104
        delta0 = r0.delta
 
105
        self.assertNotEqual(None, delta0)
 
106
        self.assertEqual([('b', b'b-id', 'file')], delta0.added)
 
107
        self.assertEqual([], delta0.removed)
 
108
        self.assertEqual([], delta0.renamed)
 
109
        self.assertEqual([], delta0.modified)
 
110
 
 
111
        delta1 = r1.delta
 
112
        self.assertNotEqual(None, delta1)
 
113
        self.assertEqual([], delta1.added)
 
114
        self.assertEqual([('a', b'a-id', 'file')], delta1.removed)
 
115
        self.assertEqual([], delta1.renamed)
 
116
        self.assertEqual([], delta1.modified)
 
117
 
 
118
        delta2 = r2.delta
 
119
        self.assertNotEqual(None, delta2)
 
120
        self.assertEqual([], delta2.added)
 
121
        self.assertEqual([], delta2.removed)
 
122
        self.assertEqual([], delta2.renamed)
 
123
        self.assertEqual(
 
124
            [('b', 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'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='all', include_merged=False, backward=False,
 
139
                       local_revid_range=None, remote_revid_range=None):
 
140
        """Check the output of find_unmerged_mainline_revisions"""
 
141
        local_extra, remote_extra = missing.find_unmerged(
 
142
            local_branch, remote_branch, restrict,
 
143
            include_merged=include_merged, backward=backward,
 
144
            local_revid_range=local_revid_range,
 
145
            remote_revid_range=remote_revid_range)
 
146
        self.assertEqual(local, local_extra)
 
147
        self.assertEqual(remote, remote_extra)
 
148
 
 
149
    def test_same_branch(self):
 
150
        tree = self.make_branch_and_tree('tree')
 
151
        rev1 = tree.commit('one')
 
152
        tree.lock_read()
 
153
        self.addCleanup(tree.unlock)
 
154
        self.assertUnmerged([], [], tree.branch, tree.branch)
 
155
        self.assertUnmerged([], [], tree.branch, tree.branch,
 
156
                            local_revid_range=(rev1, rev1))
 
157
 
 
158
    def test_one_ahead(self):
 
159
        tree = self.make_branch_and_tree('tree')
 
160
        tree.commit('one')
 
161
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
 
162
        rev2 = tree2.commit('two')
 
163
        self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch)
 
164
        self.assertUnmerged([('2', rev2, 0)], [], tree2.branch, tree.branch)
 
165
 
 
166
    def test_restrict(self):
 
167
        tree = self.make_branch_and_tree('tree')
 
168
        tree.commit('one')
 
169
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
 
170
        rev2 = tree2.commit('two')
 
171
        self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch)
 
172
        self.assertUnmerged([], None, tree.branch, tree2.branch, 'local')
 
173
        self.assertUnmerged(None, [('2', rev2, 0)], tree.branch, tree2.branch,
 
174
                            'remote')
 
175
 
 
176
    def test_merged(self):
 
177
        tree = self.make_branch_and_tree('tree')
 
178
        rev1 = tree.commit('one')
 
179
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
 
180
        tree2.commit('two')
 
181
        tree2.commit('three')
 
182
        tree.merge_from_branch(tree2.branch)
 
183
        rev4 = tree.commit('four')
 
184
 
 
185
        self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch)
 
186
        self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch,
 
187
                            local_revid_range=(rev4, rev4))
 
188
        self.assertUnmerged([], [], tree.branch, tree2.branch,
 
189
                            local_revid_range=(rev1, rev1))
 
190
 
 
191
    def test_include_merged(self):
 
192
        tree = self.make_branch_and_tree('tree')
 
193
        tree.commit('one', rev_id=b'rev1')
 
194
 
 
195
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
 
196
        tree2.commit('two', rev_id=b'rev2')
 
197
        rev3 = tree2.commit('three', rev_id=b'rev3')
 
198
 
 
199
        tree3 = tree2.controldir.sprout('tree3').open_workingtree()
 
200
        rev4 = tree3.commit('four', rev_id=b'rev4')
 
201
        rev5 = tree3.commit('five', rev_id=b'rev5')
 
202
 
 
203
        tree2.merge_from_branch(tree3.branch)
 
204
        rev6 = tree2.commit('six', rev_id=b'rev6')
 
205
 
 
206
        self.assertUnmerged([], [('2', b'rev2', 0), ('3', b'rev3', 0),
 
207
                                 ('4', b'rev6', 0),
 
208
                                 ('3.1.1', b'rev4', 1), ('3.1.2', b'rev5', 1),
 
209
                                 ],
 
210
                            tree.branch, tree2.branch,
 
211
                            include_merged=True)
 
212
 
 
213
        self.assertUnmerged([], [('4', b'rev6', 0),
 
214
                                 ('3.1.2', b'rev5', 1), ('3.1.1', b'rev4', 1),
 
215
                                 ('3', b'rev3', 0), ('2', b'rev2', 0),
 
216
                                 ],
 
217
                            tree.branch, tree2.branch,
 
218
                            include_merged=True,
 
219
                            backward=True)
 
220
 
 
221
        self.assertUnmerged(
 
222
            [], [('4', b'rev6', 0)],
 
223
            tree.branch, tree2.branch,
 
224
            include_merged=True, remote_revid_range=(rev6, rev6))
 
225
 
 
226
        self.assertUnmerged(
 
227
            [], [('3', b'rev3', 0), ('3.1.1', b'rev4', 1)],
 
228
            tree.branch, tree2.branch,
 
229
            include_merged=True, remote_revid_range=(rev3, rev4))
 
230
 
 
231
        self.assertUnmerged(
 
232
            [], [('4', b'rev6', 0), ('3.1.2', b'rev5', 1)],
 
233
            tree.branch, tree2.branch,
 
234
            include_merged=True, remote_revid_range=(rev5, rev6))
 
235
 
 
236
    def test_revision_range(self):
 
237
        local = self.make_branch_and_tree('local')
 
238
        lrevid1 = local.commit('one')
 
239
        remote = local.controldir.sprout('remote').open_workingtree()
 
240
        rrevid2 = remote.commit('two')
 
241
        rrevid3 = remote.commit('three')
 
242
        rrevid4 = remote.commit('four')
 
243
        lrevid2 = local.commit('two')
 
244
        lrevid3 = local.commit('three')
 
245
        lrevid4 = local.commit('four')
 
246
        local_extra = [('2', lrevid2, 0), ('3', lrevid3, 0), ('4', lrevid4, 0)]
 
247
        remote_extra = [('2', rrevid2, 0), ('3', rrevid3, 0),
 
248
                        ('4', rrevid4, 0)]
 
249
 
 
250
        # control
 
251
        self.assertUnmerged(local_extra, remote_extra,
 
252
                            local.branch, remote.branch)
 
253
        self.assertUnmerged(local_extra, remote_extra,
 
254
                            local.branch, remote.branch, local_revid_range=(
 
255
                                None, None),
 
256
                            remote_revid_range=(None, None))
 
257
 
 
258
        # exclude local revisions
 
259
        self.assertUnmerged(
 
260
            [('2', lrevid2, 0)], remote_extra,
 
261
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid2))
 
262
        self.assertUnmerged(
 
263
            [('2', lrevid2, 0), ('3', lrevid3, 0)], remote_extra,
 
264
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid3))
 
265
        self.assertUnmerged(
 
266
            [('2', lrevid2, 0), ('3', lrevid3, 0)], None,
 
267
            local.branch, remote.branch, 'local',
 
268
            local_revid_range=(lrevid2, lrevid3))
 
269
 
 
270
        # exclude remote revisions
 
271
        self.assertUnmerged(
 
272
            local_extra, [('2', rrevid2, 0)],
 
273
            local.branch, remote.branch, remote_revid_range=(None, rrevid2))
 
274
        self.assertUnmerged(
 
275
            local_extra, [('2', rrevid2, 0)],
 
276
            local.branch, remote.branch, remote_revid_range=(lrevid1, rrevid2))
 
277
        self.assertUnmerged(
 
278
            local_extra, [('2', rrevid2, 0)],
 
279
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid2))
 
280
        self.assertUnmerged(
 
281
            local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
 
282
            local.branch, remote.branch, remote_revid_range=(None, rrevid3))
 
283
        self.assertUnmerged(
 
284
            local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
 
285
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid3))
 
286
        self.assertUnmerged(
 
287
            local_extra, [('3', rrevid3, 0)],
 
288
            local.branch, remote.branch, remote_revid_range=(rrevid3, rrevid3))
 
289
        self.assertUnmerged(None, [('2', rrevid2, 0), ('3', rrevid3, 0)],
 
290
                            local.branch, remote.branch, 'remote',
 
291
                            remote_revid_range=(rrevid2, rrevid3))
 
292
 
 
293
        # exclude local and remote revisions
 
294
        self.assertUnmerged([('3', lrevid3, 0)], [('3', rrevid3, 0)],
 
295
                            local.branch, remote.branch, local_revid_range=(
 
296
                                lrevid3, lrevid3),
 
297
                            remote_revid_range=(rrevid3, rrevid3))