diff -r f99d64e8a4e4 -r f0b6fbea00cf mercurial/subrepo.py --- a/mercurial/subrepo.py Thu Mar 22 21:19:31 2018 +0900 +++ b/mercurial/subrepo.py Thu Mar 22 21:56:20 2018 +0900 @@ -36,7 +36,10 @@ util, vfs as vfsmod, ) -from .utils import dateutil +from .utils import ( + dateutil, + stringutil, +) hg = None reporelpath = subrepoutil.reporelpath @@ -74,7 +77,7 @@ raise ex except error.Abort as ex: subrepo = subrelpath(self) - errormsg = (util.forcebytestr(ex) + ' ' + errormsg = (stringutil.forcebytestr(ex) + ' ' + _('(in subrepository "%s")') % subrepo) # avoid handling this exception by raising a SubrepoAbort exception raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo,