Show More
@@ -252,9 +252,14 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: | |
|
255 | 258 | ret = _flushstdio(req.ui, err) |
|
256 | 259 | if ret and not status: |
|
257 | 260 | status = ret |
|
261 | except BaseException: | |
|
262 | pass | |
|
258 | 263 | return status |
|
259 | 264 | |
|
260 | 265 | |
@@ -314,7 +319,10 b' def _rundispatch(req):' | |||
|
314 | 319 | ret = -1 |
|
315 | 320 | finally: |
|
316 | 321 | duration = util.timer() - starttime |
|
322 | try: | |
|
317 | 323 | req.ui.flush() # record blocked times |
|
324 | except BaseException: | |
|
325 | pass | |
|
318 | 326 | if req.ui.logblockedtimes: |
|
319 | 327 | req.ui._blockedtimes[b'command_duration'] = duration * 1000 |
|
320 | 328 | req.ui.log( |
@@ -338,7 +346,10 b' def _rundispatch(req):' | |||
|
338 | 346 | except: # exiting, so no re-raises |
|
339 | 347 | ret = ret or -1 |
|
340 | 348 | # do flush again since ui.log() and exit handlers may write to ui |
|
349 | try: | |
|
341 | 350 | req.ui.flush() |
|
351 | except BaseException: | |
|
352 | pass | |
|
342 | 353 | return ret |
|
343 | 354 | |
|
344 | 355 | |
@@ -459,7 +470,10 b' def _runcatch(req):' | |||
|
459 | 470 | try: |
|
460 | 471 | return _dispatch(req) |
|
461 | 472 | finally: |
|
462 |
|
|
|
473 | try: | |
|
474 | ui.flush() # record blocked times | |
|
475 | except BaseException: | |
|
476 | pass | |
|
463 | 477 | except: # re-raises |
|
464 | 478 | # enter the debugger when we hit an exception |
|
465 | 479 | if req.earlyoptions[b'debugger']: |
@@ -219,8 +219,7 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. Windows apparently does this better, but only sometimes? | |
|
223 | #if windows | |
|
222 | improve this. | |
|
224 | 223 | $ hg log --limit 3 \ |
|
225 | 224 | > --config pager.pager='this-command-better-never-exist --seriously' \ |
|
226 | 225 | > 2>/dev/null || true |
@@ -240,11 +239,6 b' improve this. Windows apparently does th' | |||
|
240 | 239 | date: Thu Jan 01 00:00:00 1970 +0000 (?) |
|
241 | 240 | summary: modify a 8 (?) |
|
242 | 241 | (?) |
|
243 | #else | |
|
244 | $ hg log --limit 3 \ | |
|
245 | > --config pager.pager='this-command-better-never-exist --seriously' \ | |
|
246 | > 2>/dev/null || true | |
|
247 | #endif | |
|
248 | 242 | |
|
249 | 243 | Pager works with shell aliases. |
|
250 | 244 |
General Comments 0
You need to be logged in to leave comments.
Login now