Skip to content
Permalink
Browse files

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>
  • Loading branch information
peff authored and gitster committed Jun 25, 2015
1 parent a5481a6 commit aa1462cc3d3b0c4c8ad6a60aaf31e0f3a424162d
Showing with 61 additions and 1 deletion.
  1. +5 −0 Documentation/rev-list-options.txt
  2. +3 −0 builtin/blame.c
  3. +2 −0 cache.h
  4. +8 −1 date.c
  5. +1 −0 gettext.c
  6. +29 −0 strbuf.c
  7. +5 −0 strbuf.h
  8. +8 −0 t/t6300-for-each-ref.sh
@@ -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).

@@ -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 */

@@ -1114,8 +1114,10 @@ struct date_mode {
DATE_ISO8601,
DATE_ISO8601_STRICT,
DATE_RFC2822,
DATE_STRFTIME,
DATE_RAW
} type;
const char *strftime_fmt;
};

/*
9 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);
}

@@ -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");
}
@@ -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;
}
}
@@ -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.
*
@@ -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

0 comments on commit aa1462c

Please sign in to comment.
You can’t perform that action at this time.