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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-25 03:06:42 UTC
  • mfrom: (7045.3.4 python3-r)
  • Revision ID: breezy.the.bot@gmail.com-20180725030642-oghhedvui3470wy6
Fix another ~500 tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-r/+merge/350430

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/shelf.py
346
346
    @staticmethod
347
347
    def parse_metadata(records):
348
348
        names, metadata_bytes = next(records)
349
 
        if names[0] != ('metadata',):
 
349
        if names[0] != (b'metadata',):
350
350
            raise ShelfCorrupt
351
351
        metadata = bencode.bdecode(metadata_bytes)
352
 
        message = metadata.get('message')
 
352
        message = metadata.get(b'message')
353
353
        if message is not None:
354
 
            metadata['message'] = message.decode('utf-8')
 
354
            metadata[b'message'] = message.decode('utf-8')
355
355
        return metadata
356
356
 
357
357
    @classmethod
364
364
        """
365
365
        records = klass.iter_records(shelf_file)
366
366
        metadata = klass.parse_metadata(records)
367
 
        base_revision_id = metadata['revision_id']
 
367
        base_revision_id = metadata[b'revision_id']
368
368
        try:
369
369
            base_tree = tree.revision_tree(base_revision_id)
370
370
        except errors.NoSuchRevisionInTree:
371
371
            base_tree = tree.branch.repository.revision_tree(base_revision_id)
372
372
        tt = transform.TransformPreview(base_tree)
373
373
        tt.deserialize(records)
374
 
        return klass(tree, base_tree, tt, metadata.get('message'))
 
374
        return klass(tree, base_tree, tt, metadata.get(b'message'))
375
375
 
376
376
    def make_merger(self):
377
377
        """Return a merger that can unshelve the changes."""