/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-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/mapping.py
324
324
            commit.author_timezone = commit.commit_timezone
325
325
        if u'git-gpg-signature' in rev.properties:
326
326
            commit.gpgsig = rev.properties[u'git-gpg-signature'].encode(
327
 
                'ascii')
 
327
                'utf-8')
 
328
        if u'git-gpg-signature-b64' in rev.properties:
 
329
            commit.gpgsig = base64.b64decode(rev.properties[u'git-gpg-signature-b64'])
328
330
        commit.message = self._encode_commit_message(rev, rev.message,
329
331
                                                     encoding)
330
332
        if not isinstance(commit.message, bytes):
337
339
            mapping_properties = set(
338
340
                [u'author', u'author-timezone', u'author-timezone-neg-utc',
339
341
                 u'commit-timezone-neg-utc', u'git-implicit-encoding',
340
 
                 u'git-gpg-signature', u'git-explicit-encoding',
 
342
                 u'git-gpg-signature', u'git-gpg-signature-b64',
 
343
                 u'git-explicit-encoding',
341
344
                 u'author-timestamp', u'file-modes'])
342
345
            for k, v in rev.properties.items():
343
346
                if k not in mapping_properties:
419
422
        if commit._commit_timezone_neg_utc:
420
423
            rev.properties[u'commit-timezone-neg-utc'] = ""
421
424
        if commit.gpgsig:
422
 
            rev.properties[u'git-gpg-signature'] = commit.gpgsig.decode(
423
 
                'ascii')
 
425
            try:
 
426
                rev.properties[u'git-gpg-signature'] = commit.gpgsig.decode(
 
427
                    'utf-8')
 
428
            except UnicodeDecodeError:
 
429
                rev.properties[u'git-gpg-signature-b64'] = base64.b64encode(
 
430
                    commit.gpgsig)
424
431
        if commit.mergetag:
425
432
            for i, tag in enumerate(commit.mergetag):
426
433
                rev.properties[u'git-mergetag-%d' % i] = tag.as_raw_string()