--- a/hgext/keyword.py Thu Feb 08 23:27:24 2018 +0530
+++ b/hgext/keyword.py Thu Feb 15 17:18:26 2018 +0100
@@ -111,6 +111,7 @@
templatefilters,
util,
)
+from mercurial.utils import dateutil
cmdtable = {}
command = registrar.command(cmdtable)
@@ -156,21 +157,23 @@
def utcdate(text):
'''Date. Returns a UTC-date in this format: "2009/08/18 11:00:13".
'''
- return util.datestr((util.parsedate(text)[0], 0), '%Y/%m/%d %H:%M:%S')
+ dateformat = '%Y/%m/%d %H:%M:%S'
+ return dateutil.datestr((dateutil.parsedate(text)[0], 0), dateformat)
# date like in svn's $Date
@templatefilter('svnisodate')
def svnisodate(text):
'''Date. Returns a date in this format: "2009-08-18 13:00:13
+0200 (Tue, 18 Aug 2009)".
'''
- return util.datestr(text, '%Y-%m-%d %H:%M:%S %1%2 (%a, %d %b %Y)')
+ return dateutil.datestr(text, '%Y-%m-%d %H:%M:%S %1%2 (%a, %d %b %Y)')
# date like in svn's $Id
@templatefilter('svnutcdate')
def svnutcdate(text):
'''Date. Returns a UTC-date in this format: "2009-08-18
11:00:13Z".
'''
- return util.datestr((util.parsedate(text)[0], 0), '%Y-%m-%d %H:%M:%SZ')
+ dateformat = '%Y-%m-%d %H:%M:%SZ'
+ return dateutil.datestr((dateutil.parsedate(text)[0], 0), dateformat)
# make keyword tools accessible
kwtools = {'hgcmd': ''}