Mercurial > hg
changeset 40761:691c68bc1222
ui: pass in bytes opts dict to logger.log()
This is the convention of the Mercurial API.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 11 Nov 2018 19:36:21 +0900 |
| parents | ffd574c144d2 |
| children | 37d6ee46a965 |
| files | hgext/logtoprocess.py mercurial/ui.py |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/logtoprocess.py Sun Nov 11 19:35:33 2018 +0900 +++ b/hgext/logtoprocess.py Sun Nov 11 19:36:21 2018 +0900 @@ -36,9 +36,6 @@ import os -from mercurial import ( - pycompat, -) from mercurial.utils import ( procutil, ) @@ -70,7 +67,7 @@ } # keyword arguments get prefixed with OPT_ and uppercased env.update((b'OPT_%s' % key.upper(), value) - for key, value in pycompat.byteskwargs(opts).items()) + for key, value in opts.items()) fullenv = procutil.shellenviron(env) procutil.runbgcommand(script, fullenv, shell=True)
--- a/mercurial/ui.py Sun Nov 11 19:35:33 2018 +0900 +++ b/mercurial/ui.py Sun Nov 11 19:36:21 2018 +0900 @@ -1742,6 +1742,7 @@ if not activeloggers: return msg = msgfmt % msgargs + opts = pycompat.byteskwargs(opts) # guard against recursion from e.g. ui.debug() registeredloggers = self._loggers self._loggers = {}