Git 2.23

diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index 506054bcd5dfbd76c8aec85382f35794514b9db9..585347ea487a3c1ed9754d66d454a2f20f332154 100644 (file)
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@ -1,10 +1,16 @@
+#include "test-tool.h"
 #include "cache.h"
 
 static const char *usage_msg = "\n"
-"  test-date relative [time_t]...\n"
-"  test-date show:<format> [time_t]...\n"
-"  test-date parse [date]...\n"
-"  test-date approxidate [date]...\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"
+"  test-tool date timestamp [date]...\n"
+"  test-tool date getnanos [start-nanos]\n"
+"  test-tool date is64bit\n"
+"  test-tool date time_t-is64bit\n";
 
 static void show_relative_dates(const char **argv, struct timeval *now)
 {
@@ -12,12 +18,20 @@ static void show_relative_dates(const char **argv, struct timeval *now)
 
        for (; *argv; argv++) {
                time_t t = atoi(*argv);
-               show_date_relative(t, 0, now, &buf);
+               show_date_relative(t, now, &buf);
                printf("%s -> %s\n", *argv, buf.buf);
        }
        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;
@@ -25,14 +39,14 @@ static void show_dates(const char **argv, const char *format)
        parse_date_format(format, &mode);
        for (; *argv; argv++) {
                char *arg;
-               time_t t;
+               timestamp_t t;
                int tz;
 
                /*
                 * Do not use our normal timestamp parsing here, as the point
                 * is to test the formatting code in isolation.
                 */
-               t = strtol(*argv, &arg, 10);
+               t = parse_timestamp(*argv, &arg, 10);
                while (*arg == ' ')
                        arg++;
                tz = atoi(arg);
@@ -41,17 +55,17 @@ static void show_dates(const char **argv, const char *format)
        }
 }
 
-static void parse_dates(const char **argv, struct timeval *now)
+static void parse_dates(const char **argv)
 {
        struct strbuf result = STRBUF_INIT;
 
        for (; *argv; argv++) {
-               unsigned long t;
+               timestamp_t t;
                int tz;
 
                strbuf_reset(&result);
                parse_date(*argv, &result);
-               if (sscanf(result.buf, "%lu %d", &t, &tz) == 2)
+               if (sscanf(result.buf, "%"PRItime" %d", &t, &tz) == 2)
                        printf("%s -> %s\n",
                               *argv, show_date(t, tz, DATE_MODE(ISO8601)));
                else
@@ -63,18 +77,36 @@ static void parse_dates(const char **argv, struct timeval *now)
 static void parse_approxidate(const char **argv, struct timeval *now)
 {
        for (; *argv; argv++) {
-               time_t t;
+               timestamp_t t;
                t = approxidate_relative(*argv, now);
                printf("%s -> %s\n", *argv, show_date(t, 0, DATE_MODE(ISO8601)));
        }
 }
 
-int cmd_main(int argc, const char **argv)
+static void parse_approx_timestamp(const char **argv, struct timeval *now)
+{
+       for (; *argv; argv++) {
+               timestamp_t t;
+               t = approxidate_relative(*argv, now);
+               printf("%s -> %"PRItime"\n", *argv, t);
+       }
+}
+
+static void getnanos(const char **argv)
+{
+       double seconds = getnanotime() / 1.0e9;
+
+       if (*argv)
+               seconds -= strtod(*argv, NULL);
+       printf("%lf\n", seconds);
+}
+
+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;
@@ -87,12 +119,22 @@ int cmd_main(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"))
-               parse_dates(argv+1, &now);
+               parse_dates(argv+1);
        else if (!strcmp(*argv, "approxidate"))
                parse_approxidate(argv+1, &now);
+       else if (!strcmp(*argv, "timestamp"))
+               parse_approx_timestamp(argv+1, &now);
+       else if (!strcmp(*argv, "getnanos"))
+               getnanos(argv+1);
+       else if (!strcmp(*argv, "is64bit"))
+               return sizeof(timestamp_t) == 8 ? 0 : 1;
+       else if (!strcmp(*argv, "time_t-is64bit"))
+               return sizeof(time_t) == 8 ? 0 : 1;
        else
                usage(usage_msg);
        return 0;