comparison mercurial/dispatch.py @ 37119: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 f0b6fbea00cf
children a8a902d7176e
comparison
equal deleted inserted replaced
37118:5be286db5fb5 37119:d4a2e0d5d042
40 ui as uimod, 40 ui as uimod,
41 util, 41 util,
42 ) 42 )
43 43
44 from .utils import ( 44 from .utils import (
45 procutil,
45 stringutil, 46 stringutil,
46 ) 47 )
47 48
48 unrecoverablewrite = registrar.command.unrecoverablewrite 49 unrecoverablewrite = registrar.command.unrecoverablewrite
49 50
125 continue 126 continue
126 except IOError: 127 except IOError:
127 pass 128 pass
128 # Otherwise mark it as closed to silence "Exception ignored in" 129 # Otherwise mark it as closed to silence "Exception ignored in"
129 # message emitted by the interpreter finalizer. Be careful to 130 # message emitted by the interpreter finalizer. Be careful to
130 # not close util.stdout, which may be a fdopen-ed file object and 131 # not close procutil.stdout, which may be a fdopen-ed file object
131 # its close() actually closes the underlying file descriptor. 132 # and its close() actually closes the underlying file descriptor.
132 try: 133 try:
133 fp.close() 134 fp.close()
134 except IOError: 135 except IOError:
135 pass 136 pass
136 else: 137 else:
178 if req.ferr: 179 if req.ferr:
179 ferr = req.ferr 180 ferr = req.ferr
180 elif req.ui: 181 elif req.ui:
181 ferr = req.ui.ferr 182 ferr = req.ui.ferr
182 else: 183 else:
183 ferr = util.stderr 184 ferr = procutil.stderr
184 185
185 try: 186 try:
186 if not req.ui: 187 if not req.ui:
187 req.ui = uimod.ui.load() 188 req.ui = uimod.ui.load()
188 req.earlyoptions.update(_earlyparseopts(req.ui, req.args)) 189 req.earlyoptions.update(_earlyparseopts(req.ui, req.args))