diff -r 43d6ef658874 -r 3725986b151a mercurial/templater.py --- a/mercurial/templater.py Sat Mar 18 20:11:15 2017 +0900 +++ b/mercurial/templater.py Sat Mar 18 20:38:44 2017 +0900 @@ -575,6 +575,9 @@ fillchar = ' ' if len(args) > 2: fillchar = evalstring(context, mapping, args[2]) + if len(fillchar) != 1: + # i18n: "pad" is a keyword + raise error.ParseError(_("pad() expects a single fill character")) if len(args) > 3: left = evalboolean(context, mapping, args[3])