comparison mercurial/revset.py @ 32085:2a2744dffecf stable

revset: add i18n comments to error messages for followlines predicate

This patch also includes un-quoting "descend" keyword for similarity
to other error messages (this seems too trivial as a separated patch).

32084:091d6b9157da

    rev = '.'
    if 'startrev' in args:
        revs = getset(repo, fullreposet(repo), args['startrev'])
        if len(revs) != 1:
            raise error.ParseError(
                _("followlines expects exactly one revision"))
        rev = revs.last()

    pat = getstring(args['file'], _("followlines requires a pattern"))
    if not matchmod.patkind(pat):
        fname = pathutil.canonpath(repo.root, repo.getcwd(), pat)
    else:
        m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[rev])
        files = [f for f in repo[rev] if m(f)]
        if len(files) != 1:
            raise error.ParseError(_("followlines expects exactly one file"))
        fname = files[0]

    lr = getrange(args['lines'][0], _("followlines expects a line range"))
    fromline, toline = [getinteger(a, _("line range bounds must be integers"))
                        for a in lr]
    fromline, toline = util.processlinerange(fromline, toline)

    fctx = repo[rev].filectx(fname)
    descend = False
    if 'descend' in args:
        descend = getboolean(args['descend'],
                             _("'descend' argument must be a boolean"))
    if descend:
        rs = generatorset(
            (c.rev() for c, _linerange
             in context.blockdescendants(fctx, fromline, toline)),
            iterasc=True)

32085:2a2744dffecf

    rev = '.'
    if 'startrev' in args:
        revs = getset(repo, fullreposet(repo), args['startrev'])
        if len(revs) != 1:
            raise error.ParseError(
                # i18n: "followlines" is a keyword
                _("followlines expects exactly one revision"))
        rev = revs.last()

    pat = getstring(args['file'], _("followlines requires a pattern"))
    if not matchmod.patkind(pat):
        fname = pathutil.canonpath(repo.root, repo.getcwd(), pat)
    else:
        m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[rev])
        files = [f for f in repo[rev] if m(f)]
        if len(files) != 1:
            # i18n: "followlines" is a keyword
            raise error.ParseError(_("followlines expects exactly one file"))
        fname = files[0]

    # i18n: "followlines" is a keyword
    lr = getrange(args['lines'][0], _("followlines expects a line range"))
    fromline, toline = [getinteger(a, _("line range bounds must be integers"))
                        for a in lr]
    fromline, toline = util.processlinerange(fromline, toline)

    fctx = repo[rev].filectx(fname)
    descend = False
    if 'descend' in args:
        descend = getboolean(args['descend'],
                             # i18n: "descend" is a keyword
                             _("descend argument must be a boolean"))
    if descend:
        rs = generatorset(
            (c.rev() for c, _linerange
             in context.blockdescendants(fctx, fromline, toline)),
            iterasc=True)