changeset 36421 | 1df7e7b8558e |
parent 36205 | 976e1cfb2f64 |
child 36607 | c6061cadb400 |
--- a/mercurial/subrepo.py Sun Feb 25 22:29:28 2018 -0500 +++ b/mercurial/subrepo.py Sun Feb 25 22:30:14 2018 -0500 @@ -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())