diff -r 5be286db5fb5 -r d4a2e0d5d042 mercurial/chgserver.py --- a/mercurial/chgserver.py Sat Mar 24 13:38:04 2018 +0900 +++ b/mercurial/chgserver.py Sat Mar 24 15:09:33 2018 +0900 @@ -61,6 +61,10 @@ util, ) +from .utils import ( + procutil, +) + _log = commandserver.log def _hashlist(items): @@ -200,7 +204,7 @@ # these situations and will behave differently (write to stdout). if (out is not self.fout or not util.safehasattr(self.fout, 'fileno') - or self.fout.fileno() != util.stdout.fileno()): + or self.fout.fileno() != procutil.stdout.fileno()): return util.system(cmd, environ=environ, cwd=cwd, out=out) self.flush() return self._csystem(cmd, util.shellenviron(environ), cwd)