Patchwork D2437: subrepo: use util.forcebytestr() instead of str() on exception

login
register
mail settings
Submitter phabricator
Date Feb. 26, 2018, 3:49 a.m.
Message ID <differential-rev-PHID-DREV-gmpavmniwej7p2otw572-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/28360/
State Superseded
Headers show

Comments

phabricator - Feb. 26, 2018, 3:49 a.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/subrepo.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -73,7 +73,8 @@ 
             raise ex
         except error.Abort as ex:
             subrepo = subrelpath(self)
-            errormsg = str(ex) + ' ' + _('(in subrepository "%s")') % subrepo
+            errormsg = (util.forcebytestr(ex) + ' '
+                        + _('(in subrepository "%s")') % subrepo)
             # avoid handling this exception by raising a SubrepoAbort exception
             raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo,
                                cause=sys.exc_info())