( )⚙ D11692 backout: backed out changeset 2f2107c01dee

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11692

backout: backed out changeset 2f2107c01dee
ClosedPublic

Authored by Alphare on Oct 19 2021, 1:04 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG56d037d07395: backout: backed out changeset 2f2107c01dee
Summary

After discussion on the original phab patch, we've decided to wait until
Python 2 support is dropped to do this since the behavior differs for
relatively obscure reasons.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare created this revision.Oct 19 2021, 1:04 PM
Alphare added a commit: rHG56d037d07395: backout: backed out changeset 2f2107c01dee.Oct 19 2021, 1:49 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG56d037d07395: backout: backed out changeset 2f2107c01dee (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (26 lines)
Mtests/test-pager.t (8 lines)

Diff 30905

mercurial/dispatch.py

"""run the command specified in req.args; returns an integer status code""" """run the command specified in req.args; returns an integer status code"""
err = None err = None
try: try:
status = _rundispatch(req) status = _rundispatch(req)
except error.StdioError as e: except error.StdioError as e:
err = e err = e
status = -1 status = -1
# Somehow we have to catcht he exception here; catching it inside
# _flushstdio() doesn't work.
try:
ret = _flushstdio(req.ui, err) ret = _flushstdio(req.ui, err)
if ret and not status: if ret and not status:
status = ret status = ret
except BaseException:
pass
return status return status
def _rundispatch(req): def _rundispatch(req):
with tracing.log('dispatch._rundispatch'): with tracing.log('dispatch._rundispatch'):
if req.ferr: if req.ferr:
ferr = req.ferr ferr = req.ferr
elif req.ui: elif req.ui:
if inst.errno != errno.EPIPE: if inst.errno != errno.EPIPE:
raise raise
if req.ui.configbool(b'ui', b'detailed-exit-code'): if req.ui.configbool(b'ui', b'detailed-exit-code'):
ret = 250 ret = 250
else: else:
ret = -1 ret = -1
finally: finally:
duration = util.timer() - starttime duration = util.timer() - starttime
try:
req.ui.flush() # record blocked times req.ui.flush() # record blocked times
except BaseException:
pass
if req.ui.logblockedtimes: if req.ui.logblockedtimes:
req.ui._blockedtimes[b'command_duration'] = duration * 1000 req.ui._blockedtimes[b'command_duration'] = duration * 1000
req.ui.log( req.ui.log(
b'uiblocked', b'uiblocked',
b'ui blocked ms\n', b'ui blocked ms\n',
**pycompat.strkwargs(req.ui._blockedtimes) **pycompat.strkwargs(req.ui._blockedtimes)
) )
return_code = ret & 255 return_code = ret & 255
req.ui.log( req.ui.log(
b"commandfinish", b"commandfinish",
b"%s exited %d after %0.2f seconds\n", b"%s exited %d after %0.2f seconds\n",
msg, msg,
return_code, return_code,
duration, duration,
return_code=return_code, return_code=return_code,
duration=duration, duration=duration,
canonical_command=req.canonical_command, canonical_command=req.canonical_command,
) )
try: try:
req._runexithandlers() req._runexithandlers()
except: # exiting, so no re-raises except: # exiting, so no re-raises
ret = ret or -1 ret = ret or -1
# do flush again since ui.log() and exit handlers may write to ui # do flush again since ui.log() and exit handlers may write to ui
try:
req.ui.flush() req.ui.flush()
except BaseException:
pass
return ret return ret
def _runcatch(req): def _runcatch(req):
with tracing.log('dispatch._runcatch'): with tracing.log('dispatch._runcatch'):
def catchterm(*args): def catchterm(*args):
raise error.SignalInterrupt raise error.SignalInterrupt
) )
% debugger % debugger
) )
with demandimport.deactivated(): with demandimport.deactivated():
debugtrace[debugger]() debugtrace[debugger]()
try: try:
return _dispatch(req) return _dispatch(req)
finally: finally:
try: ui.flush()
ui.flush() # record blocked times
except BaseException:
pass
except: # re-raises except: # re-raises
# enter the debugger when we hit an exception # enter the debugger when we hit an exception
if req.earlyoptions[b'debugger']: if req.earlyoptions[b'debugger']:
traceback.print_exc() traceback.print_exc()
debugmortem[debugger](sys.exc_info()[2]) debugmortem[debugger](sys.exc_info()[2])
raise raise
return _callcatch(ui, _runcatchfunc) return _callcatch(ui, _runcatchfunc)

tests/test-pager.t

\x1b[0;33mchangeset: 8:cff05a6312fe\x1b[0m (esc) \x1b[0;33mchangeset: 8:cff05a6312fe\x1b[0m (esc)
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: modify a 8 summary: modify a 8
#endif #endif
A complicated pager command gets worse behavior. Bonus points if you can A complicated pager command gets worse behavior. Bonus points if you can
improve this. improve this. Windows apparently does this better, but only sometimes?
#if windows
$ hg log --limit 3 \ $ hg log --limit 3 \
> --config pager.pager='this-command-better-never-exist --seriously' \ > --config pager.pager='this-command-better-never-exist --seriously' \
> 2>/dev/null || true > 2>/dev/null || true
\x1b[0;33mchangeset: 10:46106edeeb38\x1b[0m (esc) (?) \x1b[0;33mchangeset: 10:46106edeeb38\x1b[0m (esc) (?)
tag: tip (?) tag: tip (?)
user: test (?) user: test (?)
date: Thu Jan 01 00:00:00 1970 +0000 (?) date: Thu Jan 01 00:00:00 1970 +0000 (?)
summary: modify a 10 (?) summary: modify a 10 (?)
(?) (?)
\x1b[0;33mchangeset: 9:6dd8ea7dd621\x1b[0m (esc) (?) \x1b[0;33mchangeset: 9:6dd8ea7dd621\x1b[0m (esc) (?)
user: test (?) user: test (?)
date: Thu Jan 01 00:00:00 1970 +0000 (?) date: Thu Jan 01 00:00:00 1970 +0000 (?)
summary: modify a 9 (?) summary: modify a 9 (?)
(?) (?)
\x1b[0;33mchangeset: 8:cff05a6312fe\x1b[0m (esc) (?) \x1b[0;33mchangeset: 8:cff05a6312fe\x1b[0m (esc) (?)
user: test (?) user: test (?)
date: Thu Jan 01 00:00:00 1970 +0000 (?) date: Thu Jan 01 00:00:00 1970 +0000 (?)
summary: modify a 8 (?) summary: modify a 8 (?)
(?) (?)
#else
$ hg log --limit 3 \
> --config pager.pager='this-command-better-never-exist --seriously' \
> 2>/dev/null || true
#endif
Pager works with shell aliases. Pager works with shell aliases.
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [alias] > [alias]
> echoa = !echo a > echoa = !echo a
> EOF > EOF