[PATCH] Pretty-print date in 'git log'

David Woodhouse· Apr 18, 2005, 05:46 UTC · lore

Add tool to render git's "<utcseconds> <zone>" into an RFC2822-compliant string, because I don't think date(1) can do it. Use same for 'git log' output.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

--- Makefile +++ Makefile 2005-04-18 15:40:43.000000000 +1000

Show changes to diff +67 −2

@@ -14,7 +14,7 @@
 
 PROG=   update-cache show-diff init-db write-tree read-tree commit-tree \
 	cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
-	check-files ls-tree merge-base
+	check-files ls-tree merge-base show-date
 
 SCRIPT=	parent-id tree-id git gitXnormid.sh gitadd.sh gitaddremote.sh \
 	gitcommit.sh gitdiff-do gitdiff.sh gitlog.sh gitls.sh gitlsobj.sh \
--- gitlog.sh
+++ gitlog.sh	2005-04-18 15:39:38.000000000 +1000
@@ -13,6 +13,23 @@
 
 rev-tree $base | sort -rn | while read time commit parents; do
 	echo commit ${commit%:*};
-	cat-file commit $commit
+	cat-file commit $commit | while read type rest ; do
+		case "$type" in
+		    "author"|"committer")
+		        DATESTAMP="`echo $rest | cut -f2 -d\>`"
+			RFC2822DATE="`show-date $DATESTAMP 2>/dev/null || echo $DATESTAMP`"
+			echo $type $rest | sed "s/$DATESTAMP\$/ $RFC2822DATE/"
+			;;
+
+		    "")
+			echo ""
+			cat
+			;;
+		    *)
+			echo $type $rest
+			;;
+		esac
+	    done
+		    
 	echo -e "\n--------------------------"
 done
--- show-date.c.orig	2005-04-18 15:43:06.000000000 +1000
+++ show-date.c	2005-04-18 15:42:15.000000000 +1000
@@ -0,0 +1,48 @@
+#include <time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "cache.h"
+
+static const char *month_names[] = {
+        "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+        "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+};
+
+static const char *weekday_names[] = {
+        "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+};
+
+int main(int argc, char **argv)
+{
+	time_t t;
+	int offset;
+	char *p;
+	struct tm tm;
+
+	if (argc != 3)
+		usage("usage: show-date <seconds> <zone>");
+
+	t = strtol(argv[1], &p, 0);
+	if (*p || !t)
+		usage("usage: show-date <seconds> <zone>");
+
+	if (argv[2][0] != '-' && argv[2][0] != '+')
+		usage("usage: show-date <seconds> <zone>");
+
+	offset = strtol(argv[2]+1, &p, 10);
+	if (*p || p!= argv[2]+5)
+		usage("usage: show-date <seconds> <zone>");
+
+	if (argv[2][0] == '-')
+		offset = -offset;
+
+	offset = 60 * (offset % 100 + (offset / 100 * 60));
+
+	t += offset;
+	gmtime_r(&t, &tm);
+
+	printf("%s, %d %s %04d %02d:%02d:%02d %s\n",
+	       weekday_names[tm.tm_wday], tm.tm_mday, month_names[tm.tm_mon],
+	       tm.tm_year+1900, tm.tm_hour, tm.tm_min, tm.tm_sec, argv[2]);
+	return 0;
+}

-- 
dwmw2

Ray Lee· Apr 18, 2005, 19:02 UTC · re: David Woodhouse · lore

Re: [PATCH] Pretty-print date in 'git log'

On Mon, 2005-04-18 at 15:46 +1000, David Woodhouse wrote:

> Add tool to render git's "<utcseconds> <zone>" into an RFC2822-compliant
> string, because I don't think date(1) can do it.

I admit it's not obvious, but date(1) includes gnu's full date parser, so you can pull stunts like:

ray:~/work/home$ date -ud 'jan 1, 1970 + 1111111111 seconds' Fri Mar 18 01:58:31 UTC 2005 ray:~/work/home$ date -ud 'jan 1, 1970 + 1111111111 seconds + 0800' Fri Mar 18 09:58:31 UTC 2005

Ray

Sanjoy Mahajan· Apr 18, 2005, 19:57 UTC · re: Ray Lee · lore

Re: [PATCH] Pretty-print date in 'git log'

> ray:~/work/home$ date -ud 'jan 1, 1970 + 1111111111 seconds'
> Fri Mar 18 01:58:31 UTC 2005
> ray:~/work/home$ date -ud 'jan 1, 1970 + 1111111111 seconds + 0800'
> Fri Mar 18 09:58:31 UTC 2005

I sent David a short script to do almost that, except that mine needed to negate the timezone whereas yours elegantly changes +0800 to + 0800

In your 2nd example, you'll need 'sed' to replace UTC (or +0000 if using -R) in the output by +0800, because the 1111111111 is the UTC seconds, so the actual time is Fri Mar 18 01:58:31 UTC 2005 (as given by your first example).

-Sanjoy

patchPretty-print date in 'git log'