/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: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_missing.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from .. import (
 
17
from bzrlib import (
18
18
    missing,
19
19
    tests,
20
20
    )
21
 
from ..missing import (
 
21
from bzrlib.missing import (
22
22
    iter_log_revisions,
23
23
    )
24
 
from . import TestCaseWithTransport
 
24
from bzrlib.tests import TestCaseWithTransport
25
25
 
26
26
 
27
27
class TestMissing(TestCaseWithTransport):
40
40
        merger_tree = self.make_branch_and_tree('merger')
41
41
        merger = merger_tree.branch
42
42
        self.assertUnmerged(([], []), original, puller)
43
 
        original_tree.commit('a', rev_id=b'a')
44
 
        self.assertUnmerged(([('1', 'a', 0)], []), original, puller)
 
43
        original_tree.commit('a', rev_id='a')
 
44
        self.assertUnmerged(([('1', 'a')], []), original, puller)
45
45
        puller_tree.pull(original)
46
46
        self.assertUnmerged(([], []), original, puller)
47
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', 0), ('3', 'c', 0)], []),
 
48
        original_tree.commit('b', rev_id='b')
 
49
        original_tree.commit('c', rev_id='c')
 
50
        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
51
51
                            original, puller)
52
 
        self.assertUnmerged(([('3', 'c', 0), ('2', 'b', 0)], []),
 
52
        self.assertUnmerged(([('3', 'c'), ('2', 'b')], []),
53
53
                            original, puller, backward=True)
54
54
 
55
55
        puller_tree.pull(original)
56
56
        self.assertUnmerged(([], []), original, puller)
57
 
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
 
57
        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
58
58
                            original, merger)
59
59
        merger_tree.merge_from_branch(original)
60
 
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
 
60
        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
61
61
                            original, merger)
62
 
        merger_tree.commit('d', rev_id=b'd')
63
 
        self.assertUnmerged(([], [('2', 'd', 0)]), original, merger)
 
62
        merger_tree.commit('d', rev_id='d')
 
63
        self.assertUnmerged(([], [('2', 'd')]), original, merger)
64
64
 
65
65
    def test_iter_log_revisions(self):
66
66
        base_tree = self.make_branch_and_tree('base')
67
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')
 
68
        base_tree.add(['a'], ['a-id'])
 
69
        base_tree.commit('add a', rev_id='b-1')
70
70
 
71
 
        child_tree = base_tree.controldir.sprout('child').open_workingtree()
 
71
        child_tree = base_tree.bzrdir.sprout('child').open_workingtree()
72
72
 
73
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')
 
74
        child_tree.add(['b'], ['b-id'])
 
75
        child_tree.commit('adding b', rev_id='c-2')
76
76
 
77
77
        child_tree.remove(['a'])
78
 
        child_tree.commit('removing a', rev_id=b'c-3')
 
78
        child_tree.commit('removing a', rev_id='c-3')
79
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')
 
80
        self.build_tree_contents([('child/b', 'new contents for b\n')])
 
81
        child_tree.commit('modifying b', rev_id='c-4')
82
82
 
83
83
        child_tree.rename_one('b', 'c')
84
 
        child_tree.commit('rename b=>c', rev_id=b'c-5')
 
84
        child_tree.commit('rename b=>c', rev_id='c-5')
85
85
 
86
86
        base_extra, child_extra = missing.find_unmerged(base_tree.branch,
87
87
                                                        child_tree.branch)
95
95
                            verbose=True))
96
96
        self.assertEqual(4, len(results))
97
97
 
98
 
        r0, r1, r2, r3 = results
 
98
        r0,r1,r2,r3 = results
99
99
 
100
100
        self.assertEqual([('2', 'c-2'), ('3', 'c-3'),
101
101
                          ('4', 'c-4'), ('5', 'c-5'),],
157
157
    def test_one_ahead(self):
158
158
        tree = self.make_branch_and_tree('tree')
159
159
        rev1 = tree.commit('one')
160
 
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
 
160
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
161
161
        rev2 = tree2.commit('two')
162
 
        self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch)
163
 
        self.assertUnmerged([('2', rev2, 0)], [], tree2.branch, tree.branch)
 
162
        self.assertUnmerged([], [('2', rev2)], tree.branch, tree2.branch)
 
163
        self.assertUnmerged([('2', rev2)], [], tree2.branch, tree.branch)
164
164
 
165
165
    def test_restrict(self):
166
166
        tree = self.make_branch_and_tree('tree')
167
167
        rev1 = tree.commit('one')
168
 
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
 
168
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
169
169
        rev2 = tree2.commit('two')
170
 
        self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch)
 
170
        self.assertUnmerged([], [('2', rev2)], tree.branch, tree2.branch)
171
171
        self.assertUnmerged([], None, tree.branch, tree2.branch, 'local')
172
 
        self.assertUnmerged(None, [('2', rev2, 0)], tree.branch, tree2.branch,
 
172
        self.assertUnmerged(None, [('2', rev2)], tree.branch, tree2.branch,
173
173
                                               'remote')
174
174
 
175
175
    def test_merged(self):
176
176
        tree = self.make_branch_and_tree('tree')
177
177
        rev1 = tree.commit('one')
178
 
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
 
178
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
179
179
        rev2 = tree2.commit('two')
180
180
        rev3 = tree2.commit('three')
181
181
        tree.merge_from_branch(tree2.branch)
182
182
        rev4 = tree.commit('four')
183
183
 
184
 
        self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch)
185
 
        self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch,
 
184
        self.assertUnmerged([('2', rev4)], [], tree.branch, tree2.branch)
 
185
        self.assertUnmerged([('2', rev4)], [], tree.branch, tree2.branch,
186
186
            local_revid_range=(rev4, rev4))
187
187
        self.assertUnmerged([], [], tree.branch, tree2.branch,
188
188
            local_revid_range=(rev1, rev1))
189
189
 
190
190
    def test_include_merged(self):
191
191
        tree = self.make_branch_and_tree('tree')
192
 
        rev1 = tree.commit('one', rev_id=b'rev1')
193
 
 
194
 
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
195
 
        rev2 = tree2.commit('two', rev_id=b'rev2')
196
 
        rev3 = tree2.commit('three', rev_id=b'rev3')
197
 
 
198
 
        tree3 = tree2.controldir.sprout('tree3').open_workingtree()
199
 
        rev4 = tree3.commit('four', rev_id=b'rev4')
200
 
        rev5 = tree3.commit('five', rev_id=b'rev5')
 
192
        rev1 = tree.commit('one', rev_id='rev1')
 
193
 
 
194
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
195
        rev2 = tree2.commit('two', rev_id='rev2')
 
196
        rev3 = tree2.commit('three', rev_id='rev3')
 
197
 
 
198
        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
 
199
        rev4 = tree3.commit('four', rev_id='rev4')
 
200
        rev5 = tree3.commit('five', rev_id='rev5')
201
201
 
202
202
        tree2.merge_from_branch(tree3.branch)
203
 
        rev6 = tree2.commit('six', rev_id=b'rev6')
 
203
        rev6 = tree2.commit('six', rev_id='rev6')
204
204
 
205
205
        self.assertUnmerged([], [('2', 'rev2', 0), ('3', 'rev3', 0),
206
206
                                 ('4', 'rev6', 0),
232
232
    def test_revision_range(self):
233
233
        local = self.make_branch_and_tree('local')
234
234
        lrevid1 = local.commit('one')
235
 
        remote = local.controldir.sprout('remote').open_workingtree()
 
235
        remote = local.bzrdir.sprout('remote').open_workingtree()
236
236
        rrevid2 = remote.commit('two')
237
237
        rrevid3 = remote.commit('three')
238
238
        rrevid4 = remote.commit('four')
239
239
        lrevid2 = local.commit('two')
240
240
        lrevid3 = local.commit('three')
241
241
        lrevid4 = local.commit('four')
242
 
        local_extra = [('2', lrevid2, 0), ('3', lrevid3, 0), ('4', lrevid4, 0)]
243
 
        remote_extra = [('2', rrevid2, 0), ('3', rrevid3, 0), ('4', rrevid4, 0)]
 
242
        local_extra = [('2', lrevid2), ('3', lrevid3), ('4', lrevid4)]
 
243
        remote_extra = [('2', rrevid2), ('3', rrevid3), ('4', rrevid4)]
244
244
 
245
245
        # control
246
246
        self.assertUnmerged(local_extra, remote_extra,
250
250
            remote_revid_range=(None, None))
251
251
 
252
252
        # exclude local revisions
253
 
        self.assertUnmerged([('2', lrevid2, 0)], remote_extra,
 
253
        self.assertUnmerged([('2', lrevid2)], remote_extra,
254
254
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid2))
255
 
        self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], remote_extra,
 
255
        self.assertUnmerged([('2', lrevid2), ('3', lrevid3)], remote_extra,
256
256
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid3))
257
 
        self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], None,
 
257
        self.assertUnmerged([('2', lrevid2), ('3', lrevid3)], None,
258
258
            local.branch, remote.branch, 'local',
259
259
            local_revid_range=(lrevid2, lrevid3))
260
260
 
261
261
        # exclude remote revisions
262
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
 
262
        self.assertUnmerged(local_extra, [('2', rrevid2)],
263
263
            local.branch, remote.branch, remote_revid_range=(None, rrevid2))
264
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
 
264
        self.assertUnmerged(local_extra, [('2', rrevid2)],
265
265
            local.branch, remote.branch, remote_revid_range=(lrevid1, rrevid2))
266
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
 
266
        self.assertUnmerged(local_extra, [('2', rrevid2)],
267
267
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid2))
268
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
 
268
        self.assertUnmerged(local_extra, [('2', rrevid2), ('3', rrevid3)],
269
269
            local.branch, remote.branch, remote_revid_range=(None, rrevid3))
270
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
 
270
        self.assertUnmerged(local_extra, [('2', rrevid2), ('3', rrevid3)],
271
271
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid3))
272
 
        self.assertUnmerged(local_extra, [('3', rrevid3, 0)],
 
272
        self.assertUnmerged(local_extra, [('3', rrevid3)],
273
273
            local.branch, remote.branch, remote_revid_range=(rrevid3, rrevid3))
274
 
        self.assertUnmerged(None, [('2', rrevid2, 0), ('3', rrevid3, 0)],
 
274
        self.assertUnmerged(None, [('2', rrevid2), ('3', rrevid3)],
275
275
            local.branch, remote.branch, 'remote',
276
276
            remote_revid_range=(rrevid2, rrevid3))
277
277
 
278
278
        # exclude local and remote revisions
279
 
        self.assertUnmerged([('3', lrevid3, 0)], [('3', rrevid3, 0)],
 
279
        self.assertUnmerged([('3', lrevid3)], [('3', rrevid3)],
280
280
            local.branch, remote.branch, local_revid_range=(lrevid3, lrevid3),
281
281
            remote_revid_range=(rrevid3, rrevid3))