comparison mercurial/scmutil.py @ 47291:d9c71bbe20f7

errors: make InterventionRequired subclass Abort

The docstring for `Abort` says that it's for errors raised by commands
and `InterventionRequired` is definitely something raised by commands,
so it seems that it should be an `Abort`. This patch makes it so. It
adds a `coarse_exit_code` (in addition to the already existing
`detailed_exit_code`) to `Abort` to achieve that, since
`InterventionRequired` should result in a special exit code even when
the `ui.detailed-exit-code` config is not set.

Differential Revision: https://phab.mercurial-scm.org/D10737

47290:5e736d2e9703

    except error.StorageError as inst:
        ui.error(_(b"abort: %s\n") % inst)
        if inst.hint:
            ui.error(_(b"(%s)\n") % inst.hint)
        detailed_exit_code = 50
    except error.InterventionRequired as inst:
        ui.error(b"%s\n" % inst)
        if inst.hint:
            ui.error(_(b"(%s)\n") % inst.hint)
        detailed_exit_code = 240
        coarse_exit_code = 1
    except error.WdirUnsupported:
        ui.error(_(b"abort: working directory revision cannot be specified\n"))
    except error.Abort as inst:
        if inst.detailed_exit_code is not None:
            detailed_exit_code = inst.detailed_exit_code
        ui.error(inst.format())
    except error.WorkerError as inst:
        # Don't print a message -- the worker already should have
        return inst.status_code
    except ImportError as inst:

47291:d9c71bbe20f7

    except error.StorageError as inst:
        ui.error(_(b"abort: %s\n") % inst)
        if inst.hint:
            ui.error(_(b"(%s)\n") % inst.hint)
        detailed_exit_code = 50
    except error.WdirUnsupported:
        ui.error(_(b"abort: working directory revision cannot be specified\n"))
    except error.Abort as inst:
        if inst.detailed_exit_code is not None:
            detailed_exit_code = inst.detailed_exit_code
        if inst.coarse_exit_code is not None:
            coarse_exit_code = inst.coarse_exit_code
        ui.error(inst.format())
    except error.WorkerError as inst:
        # Don't print a message -- the worker already should have
        return inst.status_code
    except ImportError as inst: