Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 45682:d2e1dcd4490d
errors: name arguments to Abort constructor
Differential Revision: https://phab.mercurial-scm.org/D9179
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 08 Oct 2020 13:37:31 -0700 |
| parents | 5c8230ca37f2 |
| children | 89a2afe31e82 |
line wrap: on
line diff
--- a/mercurial/subrepo.py Thu Oct 08 15:35:44 2020 -0700 +++ b/mercurial/subrepo.py Thu Oct 08 13:37:31 2020 -0700 @@ -39,7 +39,6 @@ dateutil, hashutil, procutil, - stringutil, ) hg = None @@ -84,9 +83,7 @@ except error.Abort as ex: subrepo = subrelpath(self) errormsg = ( - stringutil.forcebytestr(ex) - + b' ' - + _(b'(in subrepository "%s")') % subrepo + ex.message + b' ' + _(b'(in subrepository "%s")') % subrepo ) # avoid handling this exception by raising a SubrepoAbort exception raise SubrepoAbort(