comparison mercurial/templater.py @ 25580:a69983942fb4

merge with stable

25579:b76410eed482

        # i18n: "diff" is a keyword
        raise error.ParseError(_("diff expects one, two or no arguments"))

    def getpatterns(i):
        if i < len(args):
            s = args[i][1].strip()
            if s:
                return [s]
        return []

    ctx = mapping['ctx']

25580:a69983942fb4

        # i18n: "diff" is a keyword
        raise error.ParseError(_("diff expects one, two or no arguments"))

    def getpatterns(i):
        if i < len(args):
            s = stringify(args[i][0](context, mapping, args[i][1])).strip()
            if s:
                return [s]
        return []

    ctx = mapping['ctx']