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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-11 02:08:52 UTC
  • mfrom: (7510.1.3 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200611020852-jdb9d037vj6shvyj
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/385542

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/remote.py
222
222
        return e
223
223
    interesting_lines = [
224
224
        line for line in stderr_lines
225
 
        if line and line.replace('=', '')]
 
225
        if line and line.replace(b'=', b'')]
226
226
    if len(interesting_lines) == 1:
227
227
        interesting_line = interesting_lines[0]
228
 
        return parse_git_error(url, interesting_line)
229
 
    return RemoteGitError('\n'.join(stderr_lines))
 
228
        return parse_git_error(
 
229
            url, interesting_line.decode('utf-8', 'surrogateescape'))
 
230
    return RemoteGitError(
 
231
        b'\n'.join(stderr_lines).decode('utf-8', 'surrogateescape'))
230
232
 
231
233
 
232
234
class GitSmartTransport(Transport):