##// END OF EJS Templates
hook: lower inflated use of sys.__stdout__ and __stderr__...
Yuya Nishihara -
r30365:5564fcd0 default
parent child Browse files
Show More
@@ -209,11 +209,11 b' def runhooks(ui, repo, name, hooks, thro'
209 for hname, cmd in hooks:
209 for hname, cmd in hooks:
210 if oldstdout == -1 and _redirect:
210 if oldstdout == -1 and _redirect:
211 try:
211 try:
212 stdoutno = sys.__stdout__.fileno()
212 stdoutno = sys.stdout.fileno()
213 stderrno = sys.__stderr__.fileno()
213 stderrno = sys.stderr.fileno()
214 # temporarily redirect stdout to stderr, if possible
214 # temporarily redirect stdout to stderr, if possible
215 if stdoutno >= 0 and stderrno >= 0:
215 if stdoutno >= 0 and stderrno >= 0:
216 sys.__stdout__.flush()
216 sys.stdout.flush()
217 oldstdout = os.dup(stdoutno)
217 oldstdout = os.dup(stdoutno)
218 os.dup2(stderrno, stdoutno)
218 os.dup2(stderrno, stdoutno)
219 except (OSError, AttributeError):
219 except (OSError, AttributeError):
@@ -258,7 +258,7 b' def runhooks(ui, repo, name, hooks, thro'
258 sys.stderr.flush()
258 sys.stderr.flush()
259 finally:
259 finally:
260 if _redirect and oldstdout >= 0:
260 if _redirect and oldstdout >= 0:
261 sys.__stdout__.flush() # write hook output to stderr fd
261 sys.stdout.flush() # write hook output to stderr fd
262 os.dup2(oldstdout, stdoutno)
262 os.dup2(oldstdout, stdoutno)
263 os.close(oldstdout)
263 os.close(oldstdout)
264
264
General Comments 0
You need to be logged in to leave comments. Login now