Merge ba172a7 into 0730666

mgaitan · Jun 23, 2017 · b73569f · b73569f
2 parents 0730666 + ba172a7
commit b73569f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/waliki/git/models.py b/waliki/git/models.py
@@ -4,6 +4,7 @@
 from django.contrib.auth import get_user_model
 from django.dispatch import receiver
 from django.utils.translation import ugettext_lazy as _
+from django.utils.dateparse import parse_datetime
 from django.utils import six
 _
 from sh import git, ErrorReturnCode, Command
@@ -79,8 +80,8 @@ def commit(self, page, message='', author=None, parent=None, extra_path=None):
         return there_were_changes
 
     def history(self, page):
-        GIT_COMMIT_FIELDS = ['commit', 'author', 'date', 'date_relative', 'message']
-        GIT_LOG_FORMAT = '%x1f'.join(['%h', '%an', '%ad', '%ar', '%s']) + '%x1e'
+        GIT_COMMIT_FIELDS = ['commit', 'author', 'date', 'date_relative', 'date_parsed', 'message']
+        GIT_LOG_FORMAT = '%x1f'.join(['%h', '%an', '%ad', '%ar', '%ai', '%s']) + '%x1e'
         output = git.log('--format=%s' % GIT_LOG_FORMAT, '--follow', '-z', '--shortstat', page.abspath)
         output = output.split('\n')
         history = []
@@ -97,7 +98,8 @@ def history(self, page):
         max_changes = float(max([(v['insertion'] + v['deletion']) for v in history])) or 1.0
         for v in history:
             v.update({'insertion_relative': str((v['insertion'] / max_changes) * 100),
-                      'deletion_relative': str((v['deletion'] / max_changes) * 100)})
+                      'deletion_relative': str((v['deletion'] / max_changes) * 100),
+                      'date_parsed': parse_datetime('%s %s%s' % tuple(v['date_parsed'].split()))})
         return history
 
     def version(self, page, version):