Mercurial > hg
comparison mercurial/bundle2.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 | 66c0ff381cfc |
| children | 6c7a6b04b274 |
comparison
equal
deleted
inserted
replaced
| 37083:f99d64e8a4e4 | 37084:f0b6fbea00cf |
|---|---|
| 168 pycompat, | 168 pycompat, |
| 169 streamclone, | 169 streamclone, |
| 170 tags, | 170 tags, |
| 171 url, | 171 url, |
| 172 util, | 172 util, |
| 173 ) | |
| 174 from .utils import ( | |
| 175 stringutil, | |
| 173 ) | 176 ) |
| 174 | 177 |
| 175 urlerr = util.urlerr | 178 urlerr = util.urlerr |
| 176 urlreq = util.urlreq | 179 urlreq = util.urlreq |
| 177 | 180 |
| 1089 # results anyway, so just bail quickly rather than trying | 1092 # results anyway, so just bail quickly rather than trying |
| 1090 # to produce an error part. | 1093 # to produce an error part. |
| 1091 ui.debug('bundle2-generatorexit\n') | 1094 ui.debug('bundle2-generatorexit\n') |
| 1092 raise | 1095 raise |
| 1093 except BaseException as exc: | 1096 except BaseException as exc: |
| 1094 bexc = util.forcebytestr(exc) | 1097 bexc = stringutil.forcebytestr(exc) |
| 1095 # backup exception data for later | 1098 # backup exception data for later |
| 1096 ui.debug('bundle2-input-stream-interrupt: encoding exception %s' | 1099 ui.debug('bundle2-input-stream-interrupt: encoding exception %s' |
| 1097 % bexc) | 1100 % bexc) |
| 1098 tb = sys.exc_info()[2] | 1101 tb = sys.exc_info()[2] |
| 1099 msg = 'unexpected error: %s' % bexc | 1102 msg = 'unexpected error: %s' % bexc |