/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/git/mapping.py

  • Committer: Jelmer Vernooij
  • Date: 2020-06-09 16:07:27 UTC
  • mto: (7490.40.36 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200609160727-08115oj4wjhugs16
Use surrogateescape in revprops.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/mapping.py
334
334
            commit.author_timezone = commit.commit_timezone
335
335
        if u'git-gpg-signature' in rev.properties:
336
336
            commit.gpgsig = rev.properties[u'git-gpg-signature'].encode(
337
 
                'utf-8')
338
 
        if u'git-gpg-signature-b64' in rev.properties:
339
 
            commit.gpgsig = base64.b64decode(rev.properties[u'git-gpg-signature-b64'])
 
337
                'utf-8', 'surrogateencode')
340
338
        commit.message = self._encode_commit_message(rev, rev.message,
341
339
                                                     encoding)
342
340
        if not isinstance(commit.message, bytes):
349
347
            mapping_properties = set(
350
348
                [u'author', u'author-timezone', u'author-timezone-neg-utc',
351
349
                 u'commit-timezone-neg-utc', u'git-implicit-encoding',
352
 
                 u'git-gpg-signature', u'git-gpg-signature-b64',
353
 
                 u'git-explicit-encoding',
 
350
                 u'git-gpg-signature', u'git-explicit-encoding',
354
351
                 u'author-timestamp', u'file-modes'])
355
352
            for k, v in viewitems(rev.properties):
356
353
                if k not in mapping_properties:
432
429
        if commit._commit_timezone_neg_utc:
433
430
            rev.properties[u'commit-timezone-neg-utc'] = ""
434
431
        if commit.gpgsig:
435
 
            try:
436
 
                rev.properties[u'git-gpg-signature'] = commit.gpgsig.decode(
437
 
                    'utf-8')
438
 
            except UnicodeDecodeError:
439
 
                rev.properties[u'git-gpg-signature-b64'] = base64.b64encode(
440
 
                    commit.gpgsig)
 
432
            rev.properties[u'git-gpg-signature'] = commit.gpgsig.decode(
 
433
                'utf-8', 'surrogateescape')
441
434
        if commit.mergetag:
442
435
            for i, tag in enumerate(commit.mergetag):
443
436
                rev.properties[u'git-mergetag-%d' % i] = tag.as_raw_string()