comparison mercurial/dispatch.py @ 38022:48853a927757

dispatch: fix exit code of unhandled exception recorded in blackbox log

Spotted by Martin von Zweigbergk.

We might want to change the exit code to -1 (i.e. 255) because 1 means
non-abort error in hg, but that's another issue.

38021:538e850ae737

        _formatparse(ferr.write, inst)
        return -1

    msg = _formatargs(req.args)
    starttime = util.timer()
    ret = -1
    try:
        ret = _runcatch(req) or 0
    except error.ProgrammingError as inst:
        req.ui.warn(_('** ProgrammingError: %s\n') % inst)
        if inst.hint:

        if req.ui.logblockedtimes:
            req.ui._blockedtimes['command_duration'] = duration * 1000
            req.ui.log('uiblocked', 'ui blocked ms',
                       **pycompat.strkwargs(req.ui._blockedtimes))
        req.ui.log("commandfinish", "%s exited %d after %0.2f seconds\n",
                   msg, ret or 0, duration)
        try:
            req._runexithandlers()
        except: # exiting, so no re-raises
            ret = ret or -1
    return ret

38022:48853a927757

        _formatparse(ferr.write, inst)
        return -1

    msg = _formatargs(req.args)
    starttime = util.timer()
    ret = 1  # default of Python exit code on unhandled exception
    try:
        ret = _runcatch(req) or 0
    except error.ProgrammingError as inst:
        req.ui.warn(_('** ProgrammingError: %s\n') % inst)
        if inst.hint:

        if req.ui.logblockedtimes:
            req.ui._blockedtimes['command_duration'] = duration * 1000
            req.ui.log('uiblocked', 'ui blocked ms',
                       **pycompat.strkwargs(req.ui._blockedtimes))
        req.ui.log("commandfinish", "%s exited %d after %0.2f seconds\n",
                   msg, ret, duration)
        try:
            req._runexithandlers()
        except: # exiting, so no re-raises
            ret = ret or -1
    return ret