Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 37087:f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
This might conflict with other patches floating around, sorry.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Thu, 22 Mar 2018 21:56:20 +0900 |
| parents | 45bfcd16f27e |
| children | a8a902d7176e |
line wrap: on
line diff
--- 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,