##// END OF EJS Templates
backout: backed out changeset 2f2107c01dee...
Raphaël Gomès -
r49072:56d037d0 default
parent child Browse files
Show More
@@ -252,14 +252,9 b' def dispatch(req):'
252 252 err = e
253 253 status = -1
254 254
255 # Somehow we have to catcht he exception here; catching it inside
256 # _flushstdio() doesn't work.
257 try:
258 255 ret = _flushstdio(req.ui, err)
259 256 if ret and not status:
260 257 status = ret
261 except BaseException:
262 pass
263 258 return status
264 259
265 260
@@ -319,10 +314,7 b' def _rundispatch(req):'
319 314 ret = -1
320 315 finally:
321 316 duration = util.timer() - starttime
322 try:
323 317 req.ui.flush() # record blocked times
324 except BaseException:
325 pass
326 318 if req.ui.logblockedtimes:
327 319 req.ui._blockedtimes[b'command_duration'] = duration * 1000
328 320 req.ui.log(
@@ -346,10 +338,7 b' def _rundispatch(req):'
346 338 except: # exiting, so no re-raises
347 339 ret = ret or -1
348 340 # do flush again since ui.log() and exit handlers may write to ui
349 try:
350 341 req.ui.flush()
351 except BaseException:
352 pass
353 342 return ret
354 343
355 344
@@ -470,10 +459,7 b' def _runcatch(req):'
470 459 try:
471 460 return _dispatch(req)
472 461 finally:
473 try:
474 ui.flush() # record blocked times
475 except BaseException:
476 pass
462 ui.flush()
477 463 except: # re-raises
478 464 # enter the debugger when we hit an exception
479 465 if req.earlyoptions[b'debugger']:
@@ -219,7 +219,8 b' use shell=True in the subprocess call:'
219 219 #endif
220 220
221 221 A complicated pager command gets worse behavior. Bonus points if you can
222 improve this.
222 improve this. Windows apparently does this better, but only sometimes?
223 #if windows
223 224 $ hg log --limit 3 \
224 225 > --config pager.pager='this-command-better-never-exist --seriously' \
225 226 > 2>/dev/null || true
@@ -239,6 +240,11 b' improve this.'
239 240 date: Thu Jan 01 00:00:00 1970 +0000 (?)
240 241 summary: modify a 8 (?)
241 242 (?)
243 #else
244 $ hg log --limit 3 \
245 > --config pager.pager='this-command-better-never-exist --seriously' \
246 > 2>/dev/null || true
247 #endif
242 248
243 249 Pager works with shell aliases.
244 250
General Comments 0
You need to be logged in to leave comments. Login now