/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 brzlib/tests/test_fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

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