mercurial/templateutil.py

--- a/mercurial/templateutil.py	Sun Mar 18 15:55:31 2018 +0900
+++ b/mercurial/templateutil.py	Sun Mar 18 15:58:22 2018 +0900
@@ -330,6 +330,10 @@
         return dateutil.parsedate(thing)
     except AttributeError:
         raise error.ParseError(err or _('not a date tuple nor a string'))
+    except error.ParseError:
+        if not err:
+            raise
+        raise error.ParseError(err)
 
 def evalinteger(context, mapping, arg, err=None):
     return unwrapinteger(evalrawexp(context, mapping, arg), err)