Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 36422:04c319a07c7b
py3: hunt down str(exception) instances and use util.forcebytestr
I decided to grep around for \sstr\( and see what low-hanging fruit
that showed me. This was part of that hunt. That grep pattern still
has some things worth exploring.
Differential Revision: https://phab.mercurial-scm.org/D2440
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 25 Feb 2018 23:08:41 -0500 |
| parents | 7b86aa31b004 |
| children | c28b6d609c47 |
comparison
equal
deleted
inserted
replaced
| 36421:1df7e7b8558e | 36422:04c319a07c7b |
|---|---|
| 257 stream = util.chunkbuffer(bundler.getchunks()) | 257 stream = util.chunkbuffer(bundler.getchunks()) |
| 258 b = bundle2.getunbundler(self.ui, stream) | 258 b = bundle2.getunbundler(self.ui, stream) |
| 259 bundle2.processbundle(self._repo, b) | 259 bundle2.processbundle(self._repo, b) |
| 260 raise | 260 raise |
| 261 except error.PushRaced as exc: | 261 except error.PushRaced as exc: |
| 262 raise error.ResponseError(_('push failed:'), str(exc)) | 262 raise error.ResponseError(_('push failed:'), |
| 263 util.forcebytestr(exc)) | |
| 263 | 264 |
| 264 # End of _basewirecommands interface. | 265 # End of _basewirecommands interface. |
| 265 | 266 |
| 266 # Begin of peer interface. | 267 # Begin of peer interface. |
| 267 | 268 |