Patchwork D3284: py3: use stringutil.forcebytestr() to convert error messages to bytes

login
register
mail settings
Submitter phabricator
Date April 12, 2018, 3:08 p.m.
Message ID <f3f8ba52ba021cae5b0c3105ce8e300c@localhost.localdomain>
Download mbox | patch
Permalink /patch/30794/
State Not Applicable
Headers show

Comments

phabricator - April 12, 2018, 3:08 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdf4fd29c0854: py3: use stringutil.forcebytestr() to convert error messages to bytes (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3284?vs=8051&id=8063

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

AFFECTED FILES
  mercurial/subrepoutil.py

CHANGE DETAILS




To: pulkit, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/mercurial/subrepoutil.py b/mercurial/subrepoutil.py
--- a/mercurial/subrepoutil.py
+++ b/mercurial/subrepoutil.py
@@ -86,7 +86,8 @@ 
                 src = re.sub(pattern, repl, src, 1)
             except re.error as e:
                 raise error.Abort(_("bad subrepository pattern in %s: %s")
-                                 % (p.source('subpaths', pattern), e))
+                                 % (p.source('subpaths', pattern),
+                                    stringutil.forcebytestr(e)))
         return src
 
     state = {}