##// END OF EJS Templates
ui: pass in bytes opts dict to logger.log()...
Yuya Nishihara -
r40794:691c68bc default
parent child Browse files
Show More
@@ -36,9 +36,6 b' from __future__ import absolute_import'
36
36
37 import os
37 import os
38
38
39 from mercurial import (
40 pycompat,
41 )
42 from mercurial.utils import (
39 from mercurial.utils import (
43 procutil,
40 procutil,
44 )
41 )
@@ -70,7 +67,7 b' class processlogger(object):'
70 }
67 }
71 # keyword arguments get prefixed with OPT_ and uppercased
68 # keyword arguments get prefixed with OPT_ and uppercased
72 env.update((b'OPT_%s' % key.upper(), value)
69 env.update((b'OPT_%s' % key.upper(), value)
73 for key, value in pycompat.byteskwargs(opts).items())
70 for key, value in opts.items())
74 fullenv = procutil.shellenviron(env)
71 fullenv = procutil.shellenviron(env)
75 procutil.runbgcommand(script, fullenv, shell=True)
72 procutil.runbgcommand(script, fullenv, shell=True)
76
73
@@ -1742,6 +1742,7 b' class ui(object):'
1742 if not activeloggers:
1742 if not activeloggers:
1743 return
1743 return
1744 msg = msgfmt % msgargs
1744 msg = msgfmt % msgargs
1745 opts = pycompat.byteskwargs(opts)
1745 # guard against recursion from e.g. ui.debug()
1746 # guard against recursion from e.g. ui.debug()
1746 registeredloggers = self._loggers
1747 registeredloggers = self._loggers
1747 self._loggers = {}
1748 self._loggers = {}
General Comments 0
You need to be logged in to leave comments. Login now