Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 45681:a736ab681b78 | 45682:d2e1dcd4490d |
|---|---|
| 37 ) | 37 ) |
| 38 from .utils import ( | 38 from .utils import ( |
| 39 dateutil, | 39 dateutil, |
| 40 hashutil, | 40 hashutil, |
| 41 procutil, | 41 procutil, |
| 42 stringutil, | |
| 43 ) | 42 ) |
| 44 | 43 |
| 45 hg = None | 44 hg = None |
| 46 reporelpath = subrepoutil.reporelpath | 45 reporelpath = subrepoutil.reporelpath |
| 47 subrelpath = subrepoutil.subrelpath | 46 subrelpath = subrepoutil.subrelpath |
| 82 # This exception has already been handled | 81 # This exception has already been handled |
| 83 raise ex | 82 raise ex |
| 84 except error.Abort as ex: | 83 except error.Abort as ex: |
| 85 subrepo = subrelpath(self) | 84 subrepo = subrelpath(self) |
| 86 errormsg = ( | 85 errormsg = ( |
| 87 stringutil.forcebytestr(ex) | 86 ex.message + b' ' + _(b'(in subrepository "%s")') % subrepo |
| 88 + b' ' | |
| 89 + _(b'(in subrepository "%s")') % subrepo | |
| 90 ) | 87 ) |
| 91 # avoid handling this exception by raising a SubrepoAbort exception | 88 # avoid handling this exception by raising a SubrepoAbort exception |
| 92 raise SubrepoAbort( | 89 raise SubrepoAbort( |
| 93 errormsg, hint=ex.hint, subrepo=subrepo, cause=sys.exc_info() | 90 errormsg, hint=ex.hint, subrepo=subrepo, cause=sys.exc_info() |
| 94 ) | 91 ) |