D9184: py3: convert an exception message to bytes

Submitter	phabricator
Date	Oct. 9, 2020, 4:23 p.m.
Message ID	<differential-rev-PHID-DREV-p76h2reuvfwjff2skocp-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/47421/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Fri, 9 Oct 2020 16:23:13 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "martinvonz (Martin von Zweigbergk)" <phabricator@mercurial-scm.org> Subject: D9184: py3: convert an exception message to bytes Message-ID: <differential-rev-PHID-DREV-p76h2reuvfwjff2skocp-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-p76h2reuvfwjff2skocp Thread-Index: M2YxNGY0YTM0YWJkNTg2NzQ2MDM0Njg0OWZi MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "martinvonz \(Martin von Zweigbergk\)" <phabricator+D9184+public+b1d2781e156e41bc@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - Oct. 9, 2020, 4:23 p.m.

martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  One of our users ran into this (unrelated to my recent work on
  more specific errors).

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9184

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1309,7 +1309,8 @@ 
             wctx[f].remove(ignoremissing=True)
         except OSError as inst:
             repo.ui.warn(
-                _(b"update failed to remove %s: %s!\n") % (f, inst.strerror)
+                _(b"update failed to remove %s: %s!\n")
+                % (f, pycompat.bytestr(inst.strerror))
             )
         if i == 100:
             yield i, f

Patchwork D9184: py3: convert an exception message to bytes

Comments

Patch