introduce "format" date-mode

This feeds the format directly to strftime. Besides being a
little more flexible, the main advantage is that your system
strftime may know more about your locale's preferred format
(e.g., how to spell the days of the week).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 77ac439234f40f51aae8613a672de06e3e143771..a9b808fab321e8287806c0bca34f1e41af3d41d1 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -727,6 +727,11 @@ format, often found in email messages.
 +
 `--date=raw` shows the date in the internal raw Git format `%s %z` format.
 +
+`--date=format:...` feeds the format `...` to your system `strftime`.
+Use `--date=format:%c` to show the date in your system locale's
+preferred format.  See the `strftime` manual for a complete list of
+format placeholders.
++
 `--date=default` shows timestamps in the original time zone
 (either committer's or author's).
 

diff --git a/builtin/blame.c b/builtin/blame.c
index 474da66ce435095836f0910bb88d058e4a2d93dc..7cc499dd347e96239b13d6e15fd142b1e321d53a 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2604,6 +2604,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
        case DATE_NORMAL:
                blame_date_width = sizeof("Thu Oct 19 16:00:04 2006 -0700");
                break;
+       case DATE_STRFTIME:
+               blame_date_width = strlen(show_date(0, 0, &blame_date_mode)) + 1; /* add the null */
+               break;
        }
        blame_date_width -= 1; /* strip the null */
 

diff --git a/cache.h b/cache.h
index 0974fa797ccaab7a10950d616c51491388f62e3f..04c1907d52583e904e9886eac7103580e56cf7dd 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1114,8 +1114,10 @@ struct date_mode {
                DATE_ISO8601,
                DATE_ISO8601_STRICT,
                DATE_RFC2822,
+               DATE_STRFTIME,
                DATE_RAW
        } type;
+       const char *strftime_fmt;
 };
 
 /*

diff --git a/date.c b/date.c
index cdad4db74b2f7bb7adb86dfbd1e4fe9fe70e169e..8f9156909b8d9d2cad6425aa44deebdcd01b2168 100644 (file)
--- a/date.c
+++ b/date.c
@@ -163,6 +163,8 @@ void show_date_relative(unsigned long time, int tz,
 struct date_mode *date_mode_from_type(enum date_mode_type type)
 {
        static struct date_mode mode;
+       if (type == DATE_STRFTIME)
+               die("BUG: cannot create anonymous strftime date_mode struct");
        mode.type = type;
        return &mode;
 }
@@ -221,6 +223,8 @@ const char *show_date(unsigned long time, int tz, const struct date_mode *mode)
                        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, tz);
+       else if (mode->type == DATE_STRFTIME)
+               strbuf_addftime(&timebuf, mode->strftime_fmt, tm);
        else
                strbuf_addf(&timebuf, "%.3s %.3s %d %02d:%02d:%02d %d%c%+05d",
                                weekday_names[tm->tm_wday],
@@ -787,7 +791,10 @@ void parse_date_format(const char *format, struct date_mode *mode)
                mode->type = DATE_NORMAL;
        else if (!strcmp(format, "raw"))
                mode->type = DATE_RAW;
-       else
+       else if (skip_prefix(format, "format:", &format)) {
+               mode->type = DATE_STRFTIME;
+               mode->strftime_fmt = xstrdup(format);
+       } else
                die("unknown date format %s", format);
 }
 

diff --git a/gettext.c b/gettext.c
index 7378ba287f0c449810250fb7b019f69e4f6a3497..a268a2c52c0ed444b073d0411ca0dcc3f210ef51 100644 (file)
--- a/gettext.c
+++ b/gettext.c
@@ -162,6 +162,7 @@ void git_setup_gettext(void)
                podir = GIT_LOCALE_PATH;
        bindtextdomain("git", podir);
        setlocale(LC_MESSAGES, "");
+       setlocale(LC_TIME, "");
        init_gettext_charset("git");
        textdomain("git");
 }

diff --git a/strbuf.c b/strbuf.c
index 0d4f4e54ec1ff1f0d37155e8049476d802a7c7e5..a7ba0281306e5dc271a446363946b6635a2dff15 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -709,3 +709,32 @@ char *xstrfmt(const char *fmt, ...)
 
        return ret;
 }
+
+void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm)
+{
+       size_t len;
+
+       /*
+        * strftime reports "0" if it could not fit the result in the buffer.
+        * Unfortunately, it also reports "0" if the requested time string
+        * takes 0 bytes. So if we were to probe and grow, we have to choose
+        * some arbitrary cap beyond which we guess that the format probably
+        * just results in a 0-length output. Since we have to choose some
+        * reasonable cap anyway, and since it is not that big, we may
+        * as well just grow to their in the first place.
+        */
+       strbuf_grow(sb, 128);
+       len = strftime(sb->buf + sb->len, sb->alloc - sb->len, fmt, tm);
+
+       if (!len) {
+               /*
+                * Either we failed, or the format actually produces a 0-length
+                * output. There's not much we can do, so we leave it blank.
+                * However, the output array is left in an undefined state, so
+                * we must re-assert our NUL terminator.
+                */
+               sb->buf[sb->len] = '\0';
+       } else {
+               sb->len += len;
+       }
+}

diff --git a/strbuf.h b/strbuf.h
index 01c5c6371b8e43686f335704a67a59a1d82dbe3b..8c8f8d56f931442e1827b9a1f4e131584be344a5 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -344,6 +344,11 @@ extern void strbuf_commented_addf(struct strbuf *sb, const char *fmt, ...);
 __attribute__((format (printf,2,0)))
 extern void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap);
 
+/**
+ * Add the time specified by `tm`, as formatted by `strftime`.
+ */
+extern void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm);
+
 /**
  * Read a given size of data from a FILE* pointer to the buffer.
  *

diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 24fc2ba55da38232f07c58346c628b61822af44a..c7f368c77c057619a1bce93d0586c0c499699e4f 100755 (executable)
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -227,6 +227,14 @@ test_expect_success 'Check format "rfc2822" date fields output' '
        test_cmp expected actual
 '
 
+test_expect_success 'Check format of strftime date fields' '
+       echo "my date is 2006-07-03" >expected &&
+       git for-each-ref \
+         --format="%(authordate:format:my date is %Y-%m-%d)" \
+         refs/heads >actual &&
+       test_cmp expected actual
+'
+
 cat >expected <<\EOF
 refs/heads/master
 refs/remotes/origin/master