Mercurial > public > mercurial-scm > hg
diff mercurial/templater.py @ 20860:81d6dc8c3c63
merge with stable
This should correct an earlier couple of bad merges (5433856b2558 and
596960a4ad0d, now pruned) that accidentally brought in a change that had
been marked obsolete (244ac996a821).
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Mon, 31 Mar 2014 10:12:07 -0500 |
| parents | 0084fcd5d7e2 6eb55310fcbc |
| children | d8fb835376d1 |
line wrap: on
line diff
--- a/mercurial/templater.py Tue Mar 18 14:29:33 2014 -0700 +++ b/mercurial/templater.py Mon Mar 31 10:12:07 2014 -0500 @@ -212,6 +212,7 @@ raise error.ParseError(_("filter %s expects one argument") % n) f = context._filters[n] return (runfilter, (args[0][0], args[0][1], f)) + raise error.ParseError(_("unknown function '%s'") % n) def date(context, mapping, args): if not (1 <= len(args) <= 2):