Breezy

Merge lp:~jelmer/brz/decode-utf-8 into lp:brz/3.1

  1. decode-utf-8
  2. Merge into 3.1
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/decode-utf-8
Merge into: lp:brz/3.1
Diff against target: 12 lines (+1/-1)
1 file modified
breezy/git/remote.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/decode-utf-8
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+400323@code.launchpad.net

Commit message

Surrogate-escape error messages from git.

Description of the change

Surrogate-escape error messages from git.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/git/remote.py'
2--- breezy/git/remote.py 2021-03-27 16:32:17 +0000
3+++ breezy/git/remote.py 2021-03-29 11:41:40 +0000
4@@ -396,7 +396,7 @@
5
6 def progress(self, text):
7 text = text.rstrip(b"\r\n")
8- text = text.decode('utf-8')
9+ text = text.decode('utf-8', 'surrogateescape')
10 if text.lower().startswith('error: '):
11 trace.show_error('git: %s', text[len(b'error: '):])
12 else:

Subscribers

People subscribed via source and target branches