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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-25 11:54:30 UTC
  • mfrom: (6855.4.10 more-bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325115430-75xnlbrmzjoomd83
Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_pack_repository.py
319
319
        builder.start_series()
320
320
        builder.build_snapshot(None, [
321
321
            ('add', ('', 'root-id', 'directory', None))],
322
 
            revision_id='A-id')
 
322
            revision_id=b'A-id')
323
323
        builder.build_snapshot(None, [
324
324
            ('add', ('file', 'file-id', 'file', 'B content\n'))],
325
 
            revision_id='B-id')
 
325
            revision_id=b'B-id')
326
326
        builder.build_snapshot(None, [
327
327
            ('modify', ('file-id', 'C content\n'))],
328
 
            revision_id='C-id')
 
328
            revision_id=b'C-id')
329
329
        builder.finish_series()
330
330
        b = builder.get_branch()
331
331
        b.lock_read()
333
333
        repo = self.make_repository('repo', shared=True, format=format)
334
334
        repo.lock_write()
335
335
        self.addCleanup(repo.unlock)
336
 
        repo.fetch(b.repository, revision_id='B-id')
 
336
        repo.fetch(b.repository, revision_id=b'B-id')
337
337
        inv = next(b.repository.iter_inventories(['C-id']))
338
338
        repo.start_write_group()
339
339
        repo.add_inventory('C-id', inv, ['B-id'])
352
352
        format = self.get_format()
353
353
        tree = self.make_branch_and_tree('.', format=format)
354
354
        trans = tree.branch.repository.controldir.get_repository_transport(None)
355
 
        tree.commit('start', rev_id='1')
356
 
        tree.commit('more work', rev_id='2')
 
355
        tree.commit('start', rev_id=b'1')
 
356
        tree.commit('more work', rev_id=b'2')
357
357
        tree.branch.repository.pack()
358
358
        tree.lock_read()
359
359
        self.addCleanup(tree.unlock)
1013
1013
        builder.start_series()
1014
1014
        builder.build_snapshot(None, [
1015
1015
            ('add', ('', 'root-id', 'directory', None))],
1016
 
            revision_id='A-id')
 
1016
            revision_id=b'A-id')
1017
1017
        builder.build_snapshot(
1018
1018
                ['A-id', 'ghost-id'], [],
1019
 
                revision_id='B-id', )
 
1019
                revision_id=b'B-id', )
1020
1020
        builder.finish_series()
1021
1021
        repo = self.make_repository('target', format=self.get_format())
1022
1022
        b = builder.get_branch()