Mercurial > hg
comparison mercurial/localrepo.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 | b24cde12061b |
| children | a8a902d7176e |
comparison
equal
deleted
inserted
replaced
| 37083:f99d64e8a4e4 | 37084:f0b6fbea00cf |
|---|---|
| 62 transaction, | 62 transaction, |
| 63 txnutil, | 63 txnutil, |
| 64 util, | 64 util, |
| 65 vfs as vfsmod, | 65 vfs as vfsmod, |
| 66 ) | 66 ) |
| 67 from .utils import ( | |
| 68 stringutil, | |
| 69 ) | |
| 67 | 70 |
| 68 release = lockmod.release | 71 release = lockmod.release |
| 69 urlerr = util.urlerr | 72 urlerr = util.urlerr |
| 70 urlreq = util.urlreq | 73 urlreq = util.urlreq |
| 71 | 74 |
| 261 b = bundle2.getunbundler(self.ui, stream) | 264 b = bundle2.getunbundler(self.ui, stream) |
| 262 bundle2.processbundle(self._repo, b) | 265 bundle2.processbundle(self._repo, b) |
| 263 raise | 266 raise |
| 264 except error.PushRaced as exc: | 267 except error.PushRaced as exc: |
| 265 raise error.ResponseError(_('push failed:'), | 268 raise error.ResponseError(_('push failed:'), |
| 266 util.forcebytestr(exc)) | 269 stringutil.forcebytestr(exc)) |
| 267 | 270 |
| 268 # End of _basewirecommands interface. | 271 # End of _basewirecommands interface. |
| 269 | 272 |
| 270 # Begin of peer interface. | 273 # Begin of peer interface. |
| 271 | 274 |