/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_fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2020-03-22 01:35:14 UTC
  • mfrom: (7490.7.6 work)
  • mto: This revision was merged to the branch mainline in revision 7499.
  • Revision ID: jelmer@jelmer.uk-20200322013514-7vw1ntwho04rcuj3
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_fetch.py
44
44
    try:
45
45
        graph = branch.repository.get_graph()
46
46
        history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
47
 
            [_mod_revision.NULL_REVISION]))
 
47
                                                    [_mod_revision.NULL_REVISION]))
48
48
    finally:
49
49
        branch.unlock()
50
50
    history.reverse()
111
111
    # construct.  One way would be to uncommit and gc the revision, but not
112
112
    # every branch supports that.  -- mbp 20070814
113
113
 
114
 
    #TODO: test that fetch correctly does reweaving when needed. RBC 20051008
 
114
    # TODO: test that fetch correctly does reweaving when needed. RBC 20051008
115
115
    # Note that this means - updating the weave when ghosts are filled in to
116
116
    # add the right parents.
117
117
 
119
119
class TestFetch(TestCaseWithTransport):
120
120
 
121
121
    def test_fetch(self):
122
 
        #highest indices a: 5, b: 7
 
122
        # highest indices a: 5, b: 7
123
123
        br_a, br_b = make_branches(self, format='dirstate-tags')
124
124
        fetch_steps(self, br_a, br_b, br_a)
125
125
 
141
141
        # root revision to change for each commit, even though the content,
142
142
        # parent, name, and other attributes are unchanged.
143
143
        tree = self.make_branch_and_tree('tree', knit1_format)
144
 
        tree.set_root_id('tree-root')
145
 
        tree.commit('rev1', rev_id='rev1')
146
 
        tree.commit('rev2', rev_id='rev2')
 
144
        tree.set_root_id(b'tree-root')
 
145
        tree.commit('rev1', rev_id=b'rev1')
 
146
        tree.commit('rev2', rev_id=b'rev2')
147
147
 
148
148
        # Now we convert it to a knit2 repository so that it has a root knit
149
149
        Convert(tree.basedir, knit2_format)
150
150
        tree = WorkingTree.open(tree.basedir)
151
151
        branch = self.make_branch('branch', format=knit2_format)
152
 
        branch.pull(tree.branch, stop_revision='rev1')
 
152
        branch.pull(tree.branch, stop_revision=b'rev1')
153
153
        repo = branch.repository
154
154
        repo.lock_read()
155
155
        try:
156
156
            # Make sure fetch retrieved only what we requested
157
 
            self.assertEqual({('tree-root', 'rev1'):()},
158
 
                repo.texts.get_parent_map(
159
 
                    [('tree-root', 'rev1'), ('tree-root', 'rev2')]))
 
157
            self.assertEqual({(b'tree-root', b'rev1'): ()},
 
158
                             repo.texts.get_parent_map(
 
159
                [(b'tree-root', b'rev1'), (b'tree-root', b'rev2')]))
160
160
        finally:
161
161
            repo.unlock()
162
162
        branch.pull(tree.branch)
165
165
        repo.lock_read()
166
166
        try:
167
167
            # Make sure fetch retrieved only what we requested
168
 
            self.assertEqual({('tree-root', 'rev2'):(('tree-root', 'rev1'),)},
169
 
                repo.texts.get_parent_map([('tree-root', 'rev2')]))
 
168
            self.assertEqual({(b'tree-root', b'rev2'): ((b'tree-root', b'rev1'),)},
 
169
                             repo.texts.get_parent_map([(b'tree-root', b'rev2')]))
170
170
        finally:
171
171
            repo.unlock()
172
172
 
173
173
    def test_fetch_incompatible(self):
174
174
        knit_tree = self.make_branch_and_tree('knit', format='knit')
175
175
        knit3_tree = self.make_branch_and_tree('knit3',
176
 
            format='dirstate-with-subtree')
 
176
                                               format='dirstate-with-subtree')
177
177
        knit3_tree.commit('blah')
178
178
        e = self.assertRaises(errors.IncompatibleRepositories,
179
179
                              knit_tree.branch.fetch, knit3_tree.branch)
180
180
        self.assertContainsRe(str(e),
181
 
            r"(?m).*/knit.*\nis not compatible with\n.*/knit3/.*\n"
182
 
            r"different rich-root support")
 
181
                              r"(?m).*/knit.*\nis not compatible with\n.*/knit3/.*\n"
 
182
                              r"different rich-root support")
183
183
 
184
184
 
185
185
class TestMergeFetch(TestCaseWithTransport):
188
188
        """Merge brings across history from unrelated source"""
189
189
        wt1 = self.make_branch_and_tree('br1')
190
190
        br1 = wt1.branch
191
 
        wt1.commit(message='rev 1-1', rev_id='1-1')
192
 
        wt1.commit(message='rev 1-2', rev_id='1-2')
 
191
        wt1.commit(message='rev 1-1', rev_id=b'1-1')
 
192
        wt1.commit(message='rev 1-2', rev_id=b'1-2')
193
193
        wt2 = self.make_branch_and_tree('br2')
194
194
        br2 = wt2.branch
195
 
        wt2.commit(message='rev 2-1', rev_id='2-1')
196
 
        wt2.merge_from_branch(br1, from_revision='null:')
 
195
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
 
196
        wt2.merge_from_branch(br1, from_revision=b'null:')
197
197
        self._check_revs_present(br2)
198
198
 
199
199
    def test_merge_fetches(self):
200
200
        """Merge brings across history from source"""
201
201
        wt1 = self.make_branch_and_tree('br1')
202
202
        br1 = wt1.branch
203
 
        wt1.commit(message='rev 1-1', rev_id='1-1')
 
203
        wt1.commit(message='rev 1-1', rev_id=b'1-1')
204
204
        dir_2 = br1.controldir.sprout('br2')
205
205
        br2 = dir_2.open_branch()
206
 
        wt1.commit(message='rev 1-2', rev_id='1-2')
 
206
        wt1.commit(message='rev 1-2', rev_id=b'1-2')
207
207
        wt2 = dir_2.open_workingtree()
208
 
        wt2.commit(message='rev 2-1', rev_id='2-1')
 
208
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
209
209
        wt2.merge_from_branch(br1)
210
210
        self._check_revs_present(br2)
211
211
 
212
212
    def _check_revs_present(self, br2):
213
 
        for rev_id in '1-1', '1-2', '2-1':
 
213
        for rev_id in [b'1-1', b'1-2', b'2-1']:
214
214
            self.assertTrue(br2.repository.has_revision(rev_id))
215
215
            rev = br2.repository.get_revision(rev_id)
216
216
            self.assertEqual(rev.revision_id, rev_id)
223
223
        super(TestMergeFileHistory, self).setUp()
224
224
        wt1 = self.make_branch_and_tree('br1')
225
225
        br1 = wt1.branch
226
 
        self.build_tree_contents([('br1/file', 'original contents\n')])
227
 
        wt1.add('file', 'this-file-id')
228
 
        wt1.commit(message='rev 1-1', rev_id='1-1')
 
226
        self.build_tree_contents([('br1/file', b'original contents\n')])
 
227
        wt1.add('file', b'this-file-id')
 
228
        wt1.commit(message='rev 1-1', rev_id=b'1-1')
229
229
        dir_2 = br1.controldir.sprout('br2')
230
230
        br2 = dir_2.open_branch()
231
231
        wt2 = dir_2.open_workingtree()
232
 
        self.build_tree_contents([('br1/file', 'original from 1\n')])
233
 
        wt1.commit(message='rev 1-2', rev_id='1-2')
234
 
        self.build_tree_contents([('br1/file', 'agreement\n')])
235
 
        wt1.commit(message='rev 1-3', rev_id='1-3')
236
 
        self.build_tree_contents([('br2/file', 'contents in 2\n')])
237
 
        wt2.commit(message='rev 2-1', rev_id='2-1')
238
 
        self.build_tree_contents([('br2/file', 'agreement\n')])
239
 
        wt2.commit(message='rev 2-2', rev_id='2-2')
 
232
        self.build_tree_contents([('br1/file', b'original from 1\n')])
 
233
        wt1.commit(message='rev 1-2', rev_id=b'1-2')
 
234
        self.build_tree_contents([('br1/file', b'agreement\n')])
 
235
        wt1.commit(message='rev 1-3', rev_id=b'1-3')
 
236
        self.build_tree_contents([('br2/file', b'contents in 2\n')])
 
237
        wt2.commit(message='rev 2-1', rev_id=b'2-1')
 
238
        self.build_tree_contents([('br2/file', b'agreement\n')])
 
239
        wt2.commit(message='rev 2-2', rev_id=b'2-2')
240
240
 
241
241
    def test_merge_fetches_file_history(self):
242
242
        """Merge brings across file histories"""
245
245
        wt2 = WorkingTree.open('br2').merge_from_branch(br1)
246
246
        br2.lock_read()
247
247
        self.addCleanup(br2.unlock)
248
 
        for rev_id, text in [('1-2', 'original from 1\n'),
249
 
                             ('1-3', 'agreement\n'),
250
 
                             ('2-1', 'contents in 2\n'),
251
 
                             ('2-2', 'agreement\n')]:
 
248
        for rev_id, text in [(b'1-2', b'original from 1\n'),
 
249
                             (b'1-3', b'agreement\n'),
 
250
                             (b'2-1', b'contents in 2\n'),
 
251
                             (b'2-2', b'agreement\n')]:
252
252
            self.assertEqualDiff(
253
253
                br2.repository.revision_tree(
254
254
                    rev_id).get_file_text('file'), text)
275
275
        tree = self.make_branch_and_tree('source', format='dirstate')
276
276
        target = self.make_repository('target', format='pack-0.92')
277
277
        self.build_tree(['source/file'])
278
 
        tree.set_root_id('root-id')
279
 
        tree.add('file', 'file-id')
280
 
        tree.commit('one', rev_id='rev-one')
 
278
        tree.set_root_id(b'root-id')
 
279
        tree.add('file', b'file-id')
 
280
        tree.commit('one', rev_id=b'rev-one')
281
281
        source = tree.branch.repository
282
282
        source.texts = versionedfile.RecordingVersionedFilesDecorator(
283
 
                        source.texts)
 
283
            source.texts)
284
284
        source.signatures = versionedfile.RecordingVersionedFilesDecorator(
285
 
                        source.signatures)
 
285
            source.signatures)
286
286
        source.revisions = versionedfile.RecordingVersionedFilesDecorator(
287
 
                        source.revisions)
 
287
            source.revisions)
288
288
        source.inventories = versionedfile.RecordingVersionedFilesDecorator(
289
 
                        source.inventories)
 
289
            source.inventories)
290
290
        # precondition
291
291
        self.assertTrue(target._format._fetch_uses_deltas)
292
 
        target.fetch(source, revision_id='rev-one')
293
 
        self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
 
292
        target.fetch(source, revision_id=b'rev-one')
 
293
        self.assertEqual(('get_record_stream', [(b'file-id', b'rev-one')],
294
294
                          target._format._fetch_order, False),
295
295
                         self.find_get_record_stream(source.texts.calls))
296
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
297
 
          target._format._fetch_order, False),
298
 
          self.find_get_record_stream(source.inventories.calls, 2))
299
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
 
296
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
 
297
                          target._format._fetch_order, False),
 
298
                         self.find_get_record_stream(source.inventories.calls, 2))
 
299
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
300
300
                          target._format._fetch_order, False),
301
301
                         self.find_get_record_stream(source.revisions.calls))
302
302
        # XXX: Signatures is special, and slightly broken. The
307
307
        # So we know there will be extra calls, but the *last* one is the one
308
308
        # we care about.
309
309
        signature_calls = source.signatures.calls[-1:]
310
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
 
310
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
311
311
                          target._format._fetch_order, False),
312
312
                         self.find_get_record_stream(signature_calls))
313
313
 
315
315
        tree = self.make_branch_and_tree('source', format='dirstate')
316
316
        target = self.make_repository('target', format='pack-0.92')
317
317
        self.build_tree(['source/file'])
318
 
        tree.set_root_id('root-id')
319
 
        tree.add('file', 'file-id')
320
 
        tree.commit('one', rev_id='rev-one')
 
318
        tree.set_root_id(b'root-id')
 
319
        tree.add('file', b'file-id')
 
320
        tree.commit('one', rev_id=b'rev-one')
321
321
        source = tree.branch.repository
322
322
        source.texts = versionedfile.RecordingVersionedFilesDecorator(
323
 
                        source.texts)
 
323
            source.texts)
324
324
        source.signatures = versionedfile.RecordingVersionedFilesDecorator(
325
 
                        source.signatures)
 
325
            source.signatures)
326
326
        source.revisions = versionedfile.RecordingVersionedFilesDecorator(
327
 
                        source.revisions)
 
327
            source.revisions)
328
328
        source.inventories = versionedfile.RecordingVersionedFilesDecorator(
329
 
                        source.inventories)
 
329
            source.inventories)
330
330
        # XXX: This won't work in general, but for the dirstate format it does.
331
331
        self.overrideAttr(target._format, '_fetch_uses_deltas', False)
332
 
        target.fetch(source, revision_id='rev-one')
333
 
        self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],
 
332
        target.fetch(source, revision_id=b'rev-one')
 
333
        self.assertEqual(('get_record_stream', [(b'file-id', b'rev-one')],
334
334
                          target._format._fetch_order, True),
335
335
                         self.find_get_record_stream(source.texts.calls))
336
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
337
 
            target._format._fetch_order, True),
338
 
            self.find_get_record_stream(source.inventories.calls, 2))
339
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
 
336
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
 
337
                          target._format._fetch_order, True),
 
338
                         self.find_get_record_stream(source.inventories.calls, 2))
 
339
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
340
340
                          target._format._fetch_order, True),
341
341
                         self.find_get_record_stream(source.revisions.calls))
342
342
        # XXX: Signatures is special, and slightly broken. The
347
347
        # So we know there will be extra calls, but the *last* one is the one
348
348
        # we care about.
349
349
        signature_calls = source.signatures.calls[-1:]
350
 
        self.assertEqual(('get_record_stream', [('rev-one',)],
 
350
        self.assertEqual(('get_record_stream', [(b'rev-one',)],
351
351
                          target._format._fetch_order, True),
352
352
                         self.find_get_record_stream(signature_calls))
353
353
 
360
360
        tree = self.make_branch_and_tree('source', format='dirstate')
361
361
        target = self.make_repository('target', format='pack-0.92')
362
362
        self.build_tree(['source/file'])
363
 
        tree.set_root_id('root-id')
364
 
        tree.add('file', 'file-id')
365
 
        tree.commit('one', rev_id='rev-one')
 
363
        tree.set_root_id(b'root-id')
 
364
        tree.add('file', b'file-id')
 
365
        tree.commit('one', rev_id=b'rev-one')
366
366
        # Hack the KVF for revisions so that it "accidentally" allows a delta
367
367
        tree.branch.repository.revisions._max_delta_chain = 200
368
 
        tree.commit('two', rev_id='rev-two')
 
368
        tree.commit('two', rev_id=b'rev-two')
369
369
        source = tree.branch.repository
370
370
        # Ensure that we stored a delta
371
371
        source.lock_read()
372
372
        self.addCleanup(source.unlock)
373
 
        record = next(source.revisions.get_record_stream([('rev-two',)],
374
 
            'unordered', False))
 
373
        record = next(source.revisions.get_record_stream([(b'rev-two',)],
 
374
                                                         'unordered', False))
375
375
        self.assertEqual('knit-delta-gz', record.storage_kind)
376
 
        target.fetch(tree.branch.repository, revision_id='rev-two')
 
376
        target.fetch(tree.branch.repository, revision_id=b'rev-two')
377
377
        # The record should get expanded back to a fulltext
378
378
        target.lock_read()
379
379
        self.addCleanup(target.unlock)
380
 
        record = next(target.revisions.get_record_stream([('rev-two',)],
381
 
            'unordered', False))
 
380
        record = next(target.revisions.get_record_stream([(b'rev-two',)],
 
381
                                                         'unordered', False))
382
382
        self.assertEqual('knit-ft-gz', record.storage_kind)
383
383
 
384
384
    def test_fetch_with_fallback_and_merge(self):
402
402
        # random ids because otherwise the inventory fulltext compresses too
403
403
        # well and the deltas get bigger.
404
404
        to_add = [
405
 
            ('add', ('', 'TREE_ROOT', 'directory', None))]
 
405
            ('add', ('', b'TREE_ROOT', 'directory', None))]
406
406
        for i in range(10):
407
407
            fname = 'file%03d' % (i,)
408
 
            fileid = '%s-%s' % (fname, osutils.rand_chars(64))
409
 
            to_add.append(('add', (fname, fileid, 'file', 'content\n')))
410
 
        builder.build_snapshot(None, to_add, revision_id='A')
411
 
        builder.build_snapshot(['A'], [], revision_id='B')
412
 
        builder.build_snapshot(['A'], [], revision_id='C')
413
 
        builder.build_snapshot(['C'], [], revision_id='D')
414
 
        builder.build_snapshot(['D'], [], revision_id='E')
415
 
        builder.build_snapshot(['E', 'B'], [], revision_id='F')
 
408
            fileid = ('%s-%s' %
 
409
                      (fname, osutils.rand_chars(64))).encode('ascii')
 
410
            to_add.append(('add', (fname, fileid, 'file', b'content\n')))
 
411
        builder.build_snapshot(None, to_add, revision_id=b'A')
 
412
        builder.build_snapshot([b'A'], [], revision_id=b'B')
 
413
        builder.build_snapshot([b'A'], [], revision_id=b'C')
 
414
        builder.build_snapshot([b'C'], [], revision_id=b'D')
 
415
        builder.build_snapshot([b'D'], [], revision_id=b'E')
 
416
        builder.build_snapshot([b'E', b'B'], [], revision_id=b'F')
416
417
        builder.finish_series()
417
418
        source_branch = builder.get_branch()
418
 
        source_branch.controldir.sprout('base', revision_id='B')
 
419
        source_branch.controldir.sprout('base', revision_id=b'B')
419
420
        target_branch = self.make_branch('target', format='1.6')
420
421
        target_branch.set_stacked_on_url('../base')
421
422
        source = source_branch.repository
422
423
        source.lock_read()
423
424
        self.addCleanup(source.unlock)
424
425
        source.inventories = versionedfile.OrderingVersionedFilesDecorator(
425
 
                        source.inventories,
426
 
                        key_priority={('E',): 1, ('D',): 2, ('C',): 4,
427
 
                                      ('F',): 3})
 
426
            source.inventories,
 
427
            key_priority={(b'E',): 1, (b'D',): 2, (b'C',): 4,
 
428
                          (b'F',): 3})
428
429
        # Ensure that the content is yielded in the proper order, and given as
429
430
        # the expected kinds
430
431
        records = [(record.key, record.storage_kind)
431
432
                   for record in source.inventories.get_record_stream(
432
 
                        [('D',), ('C',), ('E',), ('F',)], 'unordered', False)]
433
 
        self.assertEqual([(('E',), 'knit-delta-gz'), (('D',), 'knit-delta-gz'),
434
 
                          (('F',), 'knit-delta-gz'), (('C',), 'knit-delta-gz')],
435
 
                          records)
 
433
            [(b'D',), (b'C',), (b'E',), (b'F',)], 'unordered', False)]
 
434
        self.assertEqual([((b'E',), 'knit-delta-gz'), ((b'D',), 'knit-delta-gz'),
 
435
                          ((b'F',), 'knit-delta-gz'), ((b'C',), 'knit-delta-gz')],
 
436
                         records)
436
437
 
437
438
        target_branch.lock_write()
438
439
        self.addCleanup(target_branch.unlock)
439
440
        target = target_branch.repository
440
 
        target.fetch(source, revision_id='F')
 
441
        target.fetch(source, revision_id=b'F')
441
442
        # 'C' should be expanded to a fulltext, but D and E should still be
442
443
        # deltas
443
444
        stream = target.inventories.get_record_stream(
444
 
            [('C',), ('D',), ('E',), ('F',)],
 
445
            [(b'C',), (b'D',), (b'E',), (b'F',)],
445
446
            'unordered', False)
446
447
        kinds = dict((record.key, record.storage_kind) for record in stream)
447
 
        self.assertEqual({('C',): 'knit-ft-gz', ('D',): 'knit-delta-gz',
448
 
                          ('E',): 'knit-delta-gz', ('F',): 'knit-delta-gz'},
 
448
        self.assertEqual({(b'C',): 'knit-ft-gz', (b'D',): 'knit-delta-gz',
 
449
                          (b'E',): 'knit-delta-gz', (b'F',): 'knit-delta-gz'},
449
450
                         kinds)
450
451
 
451
452
 
471
472
 
472
473
    def test_fetch_order_AB(self):
473
474
        """See do_fetch_order_test"""
474
 
        self.do_fetch_order_test('A', 'B')
 
475
        self.do_fetch_order_test(b'A', b'B')
475
476
 
476
477
    def test_fetch_order_BA(self):
477
478
        """See do_fetch_order_test"""
478
 
        self.do_fetch_order_test('B', 'A')
 
479
        self.do_fetch_order_test(b'B', b'A')
479
480
 
480
481
    def get_parents(self, file_id, revision_id):
481
482
        self.repo.lock_read()
482
483
        try:
483
 
            parent_map = self.repo.texts.get_parent_map([(file_id, revision_id)])
 
484
            parent_map = self.repo.texts.get_parent_map(
 
485
                [(file_id, revision_id)])
484
486
            return parent_map[(file_id, revision_id)]
485
487
        finally:
486
488
            self.repo.unlock()
487
489
 
488
490
    def test_fetch_ghosts(self):
489
491
        self.make_tree_and_repo()
490
 
        self.tree.commit('first commit', rev_id='left-parent')
491
 
        self.tree.add_parent_tree_id('ghost-parent')
492
 
        fork = self.tree.controldir.sprout('fork', 'null:').open_workingtree()
493
 
        fork.commit('not a ghost', rev_id='not-ghost-parent')
 
492
        self.tree.commit('first commit', rev_id=b'left-parent')
 
493
        self.tree.add_parent_tree_id(b'ghost-parent')
 
494
        fork = self.tree.controldir.sprout('fork', b'null:').open_workingtree()
 
495
        fork.commit('not a ghost', rev_id=b'not-ghost-parent')
494
496
        self.tree.branch.repository.fetch(fork.branch.repository,
495
 
                                     'not-ghost-parent')
496
 
        self.tree.add_parent_tree_id('not-ghost-parent')
497
 
        self.tree.commit('second commit', rev_id='second-id')
498
 
        self.repo.fetch(self.tree.branch.repository, 'second-id')
499
 
        root_id = self.tree.get_root_id()
 
497
                                          b'not-ghost-parent')
 
498
        self.tree.add_parent_tree_id(b'not-ghost-parent')
 
499
        self.tree.commit('second commit', rev_id=b'second-id')
 
500
        self.repo.fetch(self.tree.branch.repository, b'second-id')
 
501
        root_id = self.tree.path2id('')
500
502
        self.assertEqual(
501
 
            ((root_id, 'left-parent'), (root_id, 'not-ghost-parent')),
502
 
            self.get_parents(root_id, 'second-id'))
 
503
            ((root_id, b'left-parent'), (root_id, b'not-ghost-parent')),
 
504
            self.get_parents(root_id, b'second-id'))
503
505
 
504
506
    def make_two_commits(self, change_root, fetch_twice):
505
507
        self.make_tree_and_repo()
506
 
        self.tree.commit('first commit', rev_id='first-id')
 
508
        self.tree.commit('first commit', rev_id=b'first-id')
507
509
        if change_root:
508
 
            self.tree.set_root_id('unique-id')
509
 
        self.tree.commit('second commit', rev_id='second-id')
 
510
            self.tree.set_root_id(b'unique-id')
 
511
        self.tree.commit('second commit', rev_id=b'second-id')
510
512
        if fetch_twice:
511
 
            self.repo.fetch(self.tree.branch.repository, 'first-id')
512
 
        self.repo.fetch(self.tree.branch.repository, 'second-id')
 
513
            self.repo.fetch(self.tree.branch.repository, b'first-id')
 
514
        self.repo.fetch(self.tree.branch.repository, b'second-id')
513
515
 
514
516
    def test_fetch_changed_root(self):
515
517
        self.make_two_commits(change_root=True, fetch_twice=False)
516
 
        self.assertEqual((), self.get_parents('unique-id', 'second-id'))
 
518
        self.assertEqual((), self.get_parents(b'unique-id', b'second-id'))
517
519
 
518
520
    def test_two_fetch_changed_root(self):
519
521
        self.make_two_commits(change_root=True, fetch_twice=True)
520
 
        self.assertEqual((), self.get_parents('unique-id', 'second-id'))
 
522
        self.assertEqual((), self.get_parents(b'unique-id', b'second-id'))
521
523
 
522
524
    def test_two_fetches(self):
523
525
        self.make_two_commits(change_root=False, fetch_twice=True)
524
 
        self.assertEqual((('TREE_ROOT', 'first-id'),),
525
 
            self.get_parents('TREE_ROOT', 'second-id'))
 
526
        self.assertEqual(((b'TREE_ROOT', b'first-id'),),
 
527
                         self.get_parents(b'TREE_ROOT', b'second-id'))