comparison hgext/histedit.py @ 48116:5ced12cfa41b

errors: raise InputError on bad revset to revrange() iff provided by the user

Most callers of `scmutil.revrange()` pass in a revset provided by the
user. If there are problems resolving that, it should result in an
`InputError` and exit code 10 (when using detailed exit
codes). However, there are also some callers that pass in revsets not
provided by the user. `InputError` is not appropriate in those
cases. This patch therefore introduces a wrapper around
`scmutil.revrange()` that simply converts the exception type. I put it
in `logcmdutil.py` since that seems to be the lowest-level module in
the (poorly defined) UI layer.

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

48115:b067d22dc6ad

        if len(revs) != 1:
            raise error.InputError(
                _(b'histedit requires exactly one ancestor revision')
            )

        rr = list(repo.set(b'roots(%ld)', scmutil.revrange(repo, revs)))
        if len(rr) != 1:
            raise error.InputError(
                _(
                    b'The specified revisions must have '
                    b'exactly one common root'

    _validateargs(ui, repo, freeargs, opts, goal, rules, revs)

    hastags = False
    if revs:
        revs = scmutil.revrange(repo, revs)
        ctxs = [repo[rev] for rev in revs]
        for ctx in ctxs:
            tags = [tag for tag in ctx.tags() if tag != b'tip']
            if not hastags:
                hastags = len(tags)

            remote = freeargs[0]
        else:
            remote = None
        root = findoutgoing(ui, repo, remote, force, opts)
    else:
        rr = list(repo.set(b'roots(%ld)', scmutil.revrange(repo, revs)))
        if len(rr) != 1:
            raise error.InputError(
                _(
                    b'The specified revisions must have '
                    b'exactly one common root'

48116:5ced12cfa41b

        if len(revs) != 1:
            raise error.InputError(
                _(b'histedit requires exactly one ancestor revision')
            )

        rr = list(repo.set(b'roots(%ld)', logcmdutil.revrange(repo, revs)))
        if len(rr) != 1:
            raise error.InputError(
                _(
                    b'The specified revisions must have '
                    b'exactly one common root'

    _validateargs(ui, repo, freeargs, opts, goal, rules, revs)

    hastags = False
    if revs:
        revs = logcmdutil.revrange(repo, revs)
        ctxs = [repo[rev] for rev in revs]
        for ctx in ctxs:
            tags = [tag for tag in ctx.tags() if tag != b'tip']
            if not hastags:
                hastags = len(tags)

            remote = freeargs[0]
        else:
            remote = None
        root = findoutgoing(ui, repo, remote, force, opts)
    else:
        rr = list(repo.set(b'roots(%ld)', logcmdutil.revrange(repo, revs)))
        if len(rr) != 1:
            raise error.InputError(
                _(
                    b'The specified revisions must have '
                    b'exactly one common root'