Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/chgserver.py @ 37122:d4a2e0d5d042
procutil: bulk-replace util.std* to point to new module
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 24 Mar 2018 15:09:33 +0900 |
| parents | 5bc7ff103081 |
| children | a8a902d7176e |
comparison
equal
deleted
inserted
replaced
| 37121:5be286db5fb5 | 37122:d4a2e0d5d042 |
|---|---|
| 57 error, | 57 error, |
| 58 extensions, | 58 extensions, |
| 59 node, | 59 node, |
| 60 pycompat, | 60 pycompat, |
| 61 util, | 61 util, |
| 62 ) | |
| 63 | |
| 64 from .utils import ( | |
| 65 procutil, | |
| 62 ) | 66 ) |
| 63 | 67 |
| 64 _log = commandserver.log | 68 _log = commandserver.log |
| 65 | 69 |
| 66 def _hashlist(items): | 70 def _hashlist(items): |
| 198 # captured (to self._buffers), or the output stream is not stdout | 202 # captured (to self._buffers), or the output stream is not stdout |
| 199 # (e.g. stderr, cStringIO), because the chg client is not aware of | 203 # (e.g. stderr, cStringIO), because the chg client is not aware of |
| 200 # these situations and will behave differently (write to stdout). | 204 # these situations and will behave differently (write to stdout). |
| 201 if (out is not self.fout | 205 if (out is not self.fout |
| 202 or not util.safehasattr(self.fout, 'fileno') | 206 or not util.safehasattr(self.fout, 'fileno') |
| 203 or self.fout.fileno() != util.stdout.fileno()): | 207 or self.fout.fileno() != procutil.stdout.fileno()): |
| 204 return util.system(cmd, environ=environ, cwd=cwd, out=out) | 208 return util.system(cmd, environ=environ, cwd=cwd, out=out) |
| 205 self.flush() | 209 self.flush() |
| 206 return self._csystem(cmd, util.shellenviron(environ), cwd) | 210 return self._csystem(cmd, util.shellenviron(environ), cwd) |
| 207 | 211 |
| 208 def _runpager(self, cmd, env=None): | 212 def _runpager(self, cmd, env=None): |