# HG changeset patch # User Christian Ebert # Date 1350078379 -7200 # Node ID 2a75107bd979bfd06434ecfca86be208dc04307a # Parent cdabdd17f980e0290f93682d843759fa3ccc5db0# Parent 4e2090ed2e72840e72de781fc47bef9ab7b7d53a Merge with default diff -r cdabdd17f980 -r 2a75107bd979 hgkw/keyword.py --- a/hgkw/keyword.py Wed Sep 26 00:56:27 2012 +0200 +++ b/hgkw/keyword.py Fri Oct 12 23:46:19 2012 +0200 @@ -117,7 +117,7 @@ def utcdate(text): ''':utcdate: Date. Returns a UTC-date in this format: "2009/08/18 11:00:13". ''' - return util.datestr((text[0], 0), '%Y/%m/%d %H:%M:%S') + return util.datestr((util.parsedate(text)[0], 0), '%Y/%m/%d %H:%M:%S') # date like in svn's $Date def svnisodate(text): ''':svnisodate: Date. Returns a date in this format: "2009-08-18 13:00:13 @@ -129,7 +129,7 @@ ''':svnutcdate: Date. Returns a UTC-date in this format: "2009-08-18 11:00:13Z". ''' - return util.datestr((text[0], 0), '%Y-%m-%d %H:%M:%SZ') + return util.datestr((util.parsedate(text)[0], 0), '%Y-%m-%d %H:%M:%SZ') templatefilters.filters.update({'utcdate': utcdate, 'svnisodate': svnisodate,