# HG changeset patch # User Yuya Nishihara <yuya@tcha.org> # Date 1430641994 -32400 # Sun May 03 17:33:14 2015 +0900 # Branch stable # Node ID 09124cce913f633e8ecafa6580751aaab3ddd4e2 # Parent 986a5c23b1c14954e6ddc3fdcc0b6edfb019b5a0 templater: fix crash by passing invalid object to date() function "date information" is somewhat obscure, but we call it that way in templatekw.showdate(). diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -226,10 +226,17 @@ raise error.ParseError(_("date expects one or two arguments")) date = args[0][0](context, mapping, args[0][1]) + fmt = None if len(args) == 2: fmt = stringify(args[1][0](context, mapping, args[1][1])) - return util.datestr(date, fmt) - return util.datestr(date) + try: + if fmt is None: + return util.datestr(date) + else: + return util.datestr(date, fmt) + except (TypeError, ValueError): + # i18n: "date" is a keyword + raise error.ParseError(_("date expects a date information")) def diff(context, mapping, args): """:diff([includepattern [, excludepattern]]): Show a diff, optionally diff --git a/tests/test-command-template.t b/tests/test-command-template.t --- a/tests/test-command-template.t +++ b/tests/test-command-template.t @@ -2236,6 +2236,12 @@ date: 70 01 01 01 +0000 date: 70 01 01 00 +0000 +Test invalid date: + + $ hg log -R latesttag -T '{date(rev)}\n' + hg: parse error: date expects a date information + [255] + Test string escaping: $ hg log -R latesttag -r 0 --template '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'