diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:24 (GMT) |
| commit | ecbe1beb8e41664ac00581234a449c4487600e1d (patch) | |
| tree | d53750776f3409aa3b3646c2b4027ac487e6c70a /t/helper | |
| parent | 13e263095b55c88b7af86c3c88f8b0f937eb4d5c (diff) | |
| parent | 110a6a161d304cac5e50306c70510f38000224bb (diff) | |
| download | git-ecbe1beb8e41664ac00581234a449c4487600e1d.zip git-ecbe1beb8e41664ac00581234a449c4487600e1d.tar.gz git-ecbe1beb8e41664ac00581234a449c4487600e1d.tar.bz2 | |
Merge branch 'lt/date-human'
A new date format "--date=human" that morphs its output depending
on how far the time is from the current time has been introduced.
"--date=auto" can be used to use this new format when the output is
going to the pager or to the terminal and otherwise the default
format.
* lt/date-human:
Add `human` date format tests.
Add `human` format to test-tool
Add 'human' date format documentation
Replace the proposed 'auto' mode with 'auto:'
Add 'human' date format
Diffstat (limited to 't/helper')
| -rw-r--r-- | t/helper/test-date.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/t/helper/test-date.c b/t/helper/test-date.c index aac4d54..a47bfa3 100644 --- a/t/helper/test-date.c +++ b/t/helper/test-date.c @@ -3,6 +3,7 @@ static const char *usage_msg = "\n" " test-tool date relative [time_t]...\n" +" test-tool date human [time_t]...\n" " test-tool date show:<format> [time_t]...\n" " test-tool date parse [date]...\n" " test-tool date approxidate [date]...\n" @@ -22,6 +23,14 @@ static void show_relative_dates(const char **argv, struct timeval *now) strbuf_release(&buf); } +static void show_human_dates(const char **argv) +{ + for (; *argv; argv++) { + time_t t = atoi(*argv); + printf("%s -> %s\n", *argv, show_date(t, 0, DATE_MODE(HUMAN))); + } +} + static void show_dates(const char **argv, const char *format) { struct date_mode mode; @@ -87,7 +96,7 @@ int cmd__date(int argc, const char **argv) struct timeval now; const char *x; - x = getenv("TEST_DATE_NOW"); + x = getenv("GIT_TEST_DATE_NOW"); if (x) { now.tv_sec = atoi(x); now.tv_usec = 0; @@ -100,6 +109,8 @@ int cmd__date(int argc, const char **argv) usage(usage_msg); if (!strcmp(*argv, "relative")) show_relative_dates(argv+1, &now); + else if (!strcmp(*argv, "human")) + show_human_dates(argv+1); else if (skip_prefix(*argv, "show:", &x)) show_dates(argv+1, x); else if (!strcmp(*argv, "parse")) |