Mercurial > hg
comparison mercurial/subrepo.py @ 37084: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 |
comparison
equal
deleted
inserted
replaced
| 37083:f99d64e8a4e4 | 37084:f0b6fbea00cf |
|---|---|
| 34 scmutil, | 34 scmutil, |
| 35 subrepoutil, | 35 subrepoutil, |
| 36 util, | 36 util, |
| 37 vfs as vfsmod, | 37 vfs as vfsmod, |
| 38 ) | 38 ) |
| 39 from .utils import dateutil | 39 from .utils import ( |
| 40 dateutil, | |
| 41 stringutil, | |
| 42 ) | |
| 40 | 43 |
| 41 hg = None | 44 hg = None |
| 42 reporelpath = subrepoutil.reporelpath | 45 reporelpath = subrepoutil.reporelpath |
| 43 subrelpath = subrepoutil.subrelpath | 46 subrelpath = subrepoutil.subrelpath |
| 44 _abssource = subrepoutil._abssource | 47 _abssource = subrepoutil._abssource |
| 72 except SubrepoAbort as ex: | 75 except SubrepoAbort as ex: |
| 73 # This exception has already been handled | 76 # This exception has already been handled |
| 74 raise ex | 77 raise ex |
| 75 except error.Abort as ex: | 78 except error.Abort as ex: |
| 76 subrepo = subrelpath(self) | 79 subrepo = subrelpath(self) |
| 77 errormsg = (util.forcebytestr(ex) + ' ' | 80 errormsg = (stringutil.forcebytestr(ex) + ' ' |
| 78 + _('(in subrepository "%s")') % subrepo) | 81 + _('(in subrepository "%s")') % subrepo) |
| 79 # avoid handling this exception by raising a SubrepoAbort exception | 82 # avoid handling this exception by raising a SubrepoAbort exception |
| 80 raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo, | 83 raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo, |
| 81 cause=sys.exc_info()) | 84 cause=sys.exc_info()) |
| 82 return res | 85 return res |