comparison mercurial/dispatch.py @ 37995:6f9ac3cb0987

dispatch: unify handling of None returned by a command function

A command function may return None in place of 0 just for convenience, but
dispatch() doesn't need to inherit that property. This patch makes it be
friendly to callers.

37994:e9c588802529

    "run the command in sys.argv"
    initstdio()
    req = request(pycompat.sysargv[1:])
    err = None
    try:
        status = dispatch(req) or 0
    except error.StdioError as e:
        err = e
        status = -1

    # In all cases we try to flush stdio streams.

def _formatargs(args):
    return ' '.join(procutil.shellquote(a) for a in args)

def dispatch(req):
    "run the command specified in req.args"
    if req.ferr:
        ferr = req.ferr
    elif req.ui:
        ferr = req.ui.ferr
    else:

        _formatparse(ferr.write, inst)
        return -1

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

37995:6f9ac3cb0987

    "run the command in sys.argv"
    initstdio()
    req = request(pycompat.sysargv[1:])
    err = None
    try:
        status = dispatch(req)
    except error.StdioError as e:
        err = e
        status = -1

    # In all cases we try to flush stdio streams.

def _formatargs(args):
    return ' '.join(procutil.shellquote(a) for a in args)

def dispatch(req):
    """run the command specified in req.args; returns an integer status code"""
    if req.ferr:
        ferr = req.ferr
    elif req.ui:
        ferr = req.ui.ferr
    else:

        _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:
            req.ui.warn(_('** (%s)\n') % inst.hint)
        raise