t0006: rename test-date's "show" to "relative"

The "show" tests are really only checking relative formats;
we should make that more clear.

This also frees up the "show" name to later check other
formats. We could later fold "relative" into a more generic
"show" command, but it's not worth it.  Relative times are a
special case already because we have to munge the concept of
"now" in our tests.

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

diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index fac0986134fefa5c61763f4c56873da8ba28072a..fa05269e507e497a36953c9db6d45ab02c79743a 100755 (executable)
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -6,26 +6,26 @@ test_description='test date parsing and printing'
 # arbitrary reference time: 2009-08-30 19:20:00
 TEST_DATE_NOW=1251660000; export TEST_DATE_NOW
 
 # arbitrary reference time: 2009-08-30 19:20:00
 TEST_DATE_NOW=1251660000; export TEST_DATE_NOW
 

-check_show() {
+check_relative() {

        t=$(($TEST_DATE_NOW - $1))
        echo "$t -> $2" >expect
        test_expect_${3:-success} "relative date ($2)" "
        t=$(($TEST_DATE_NOW - $1))
        echo "$t -> $2" >expect
        test_expect_${3:-success} "relative date ($2)" "

-       test-date show $t >actual &&
+       test-date relative $t >actual &&

        test_i18ncmp expect actual
        "
 }
 
        test_i18ncmp expect actual
        "
 }
 

-check_show 5 '5 seconds ago'
-check_show 300 '5 minutes ago'
-check_show 18000 '5 hours ago'
-check_show 432000 '5 days ago'
-check_show 1728000 '3 weeks ago'
-check_show 13000000 '5 months ago'
-check_show 37500000 '1 year, 2 months ago'
-check_show 55188000 '1 year, 9 months ago'
-check_show 630000000 '20 years ago'
-check_show 31449600 '12 months ago'
-check_show 62985600 '2 years ago'
+check_relative 5 '5 seconds ago'
+check_relative 300 '5 minutes ago'
+check_relative 18000 '5 hours ago'
+check_relative 432000 '5 days ago'
+check_relative 1728000 '3 weeks ago'
+check_relative 13000000 '5 months ago'
+check_relative 37500000 '1 year, 2 months ago'
+check_relative 55188000 '1 year, 9 months ago'
+check_relative 630000000 '20 years ago'
+check_relative 31449600 '12 months ago'
+check_relative 62985600 '2 years ago'

 
 check_parse() {
        echo "$1 -> $2" >expect
 
 check_parse() {
        echo "$1 -> $2" >expect

diff --git a/test-date.c b/test-date.c
index 63f373557e7236d294fb580d38db9e6d331e53d3..8ebcdedbf08303d4a16e90abc4cb8491efefdaa9 100644 (file)
--- a/test-date.c
+++ b/test-date.c
@@ -1,11 +1,11 @@
 #include "cache.h"
 
 static const char *usage_msg = "\n"
 #include "cache.h"
 
 static const char *usage_msg = "\n"

-"  test-date show [time_t]...\n"
+"  test-date relative [time_t]...\n"

 "  test-date parse [date]...\n"
 "  test-date approxidate [date]...\n";
 
 "  test-date parse [date]...\n"
 "  test-date approxidate [date]...\n";
 

-static void show_dates(char **argv, struct timeval *now)
+static void show_relative_dates(char **argv, struct timeval *now)

 {
        struct strbuf buf = STRBUF_INIT;
 
 {
        struct strbuf buf = STRBUF_INIT;
 


@@ -61,8 +61,8 @@ int main(int argc, char **argv)
        argv++;
        if (!*argv)
                usage(usage_msg);
        argv++;
        if (!*argv)
                usage(usage_msg);

-       if (!strcmp(*argv, "show"))
-               show_dates(argv+1, &now);
+       if (!strcmp(*argv, "relative"))
+               show_relative_dates(argv+1, &now);

        else if (!strcmp(*argv, "parse"))
                parse_dates(argv+1, &now);
        else if (!strcmp(*argv, "approxidate"))
        else if (!strcmp(*argv, "parse"))
                parse_dates(argv+1, &now);
        else if (!strcmp(*argv, "approxidate"))