Quit passing 'now' to date code

Commit b841d4ff43 (Add `human` format to test-tool, 2019-01-28) added
a get_time() function which allows $GIT_TEST_DATE_NOW in the
environment to override the current time. So we no longer need to
interpret that variable in cmd__date().

Therefore, we can stop passing the "now" parameter down through the
date functions, since nobody uses them. Note that we do need to make
sure all of the previous callers that took a "now" parameter are
correctly using get_time().

Signed-off-by: Stephen P. Smith <ischis2@cox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index b1da1ab08faad3da19657a9a5dcf5f2592c2127c..48d4287aa74fbf2a6f18faf51917d1216e56b357 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1516,8 +1516,7 @@ struct date_mode {
 struct date_mode *date_mode_from_type(enum date_mode_type type);
 
 const char *show_date(timestamp_t time, int timezone, const struct date_mode *mode);
-void show_date_relative(timestamp_t time, const struct timeval *now,
-                       struct strbuf *timebuf);
+void show_date_relative(timestamp_t time, struct strbuf *timebuf);
 void show_date_human(timestamp_t time, int tz, const struct timeval *now,
                        struct strbuf *timebuf);
 int parse_date(const char *date, struct strbuf *out);
@@ -1526,7 +1525,7 @@ int parse_expiry_date(const char *date, timestamp_t *timestamp);
 void datestamp(struct strbuf *out);
 #define approxidate(s) approxidate_careful((s), NULL)
 timestamp_t approxidate_careful(const char *, int *);
-timestamp_t approxidate_relative(const char *date, const struct timeval *now);
+timestamp_t approxidate_relative(const char *date);
 void parse_date_format(const char *format, struct date_mode *mode);
 int date_overflows(timestamp_t date);
 

diff --git a/date.c b/date.c
index 8126146c5069c9ab9d9f25f1f1bba1323f63cf52..041db7db4e6e4815978f7afc6e280a76566b36b9 100644 (file)
--- a/date.c
+++ b/date.c
@@ -128,16 +128,17 @@ static void get_time(struct timeval *now)
                gettimeofday(now, NULL);
 }
 
-void show_date_relative(timestamp_t time,
-                       const struct timeval *now,
-                       struct strbuf *timebuf)
+void show_date_relative(timestamp_t time, struct strbuf *timebuf)
 {
+       struct timeval now;
        timestamp_t diff;
-       if (now->tv_sec < time) {
+
+       get_time(&now);
+       if (now.tv_sec < time) {
                strbuf_addstr(timebuf, _("in the future"));
                return;
        }
-       diff = now->tv_sec - time;
+       diff = now.tv_sec - time;
        if (diff < 90) {
                strbuf_addf(timebuf,
                         Q_("%"PRItime" second ago", "%"PRItime" seconds ago", diff), diff);
@@ -240,9 +241,7 @@ static void show_date_normal(struct strbuf *buf, timestamp_t time, struct tm *tm
 
        /* Show "today" times as just relative times */
        if (hide.wday) {
-               struct timeval now;
-               get_time(&now);
-               show_date_relative(time, &now, buf);
+               show_date_relative(time, buf);
                return;
        }
 
@@ -313,11 +312,8 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode)
        }
 
        if (mode->type == DATE_RELATIVE) {
-               struct timeval now;
-
                strbuf_reset(&timebuf);
-               get_time(&now);
-               show_date_relative(time, &now, &timebuf);
+               show_date_relative(time, &timebuf);
                return timebuf.buf;
        }
 
@@ -1288,15 +1284,18 @@ static timestamp_t approxidate_str(const char *date,
        return (timestamp_t)update_tm(&tm, &now, 0);
 }
 
-timestamp_t approxidate_relative(const char *date, const struct timeval *tv)
+timestamp_t approxidate_relative(const char *date)
 {
+       struct timeval tv;
        timestamp_t timestamp;
        int offset;
        int errors = 0;
 
        if (!parse_date_basic(date, &timestamp, &offset))
                return timestamp;
-       return approxidate_str(date, tv, &errors);
+
+       get_time(&tv);
+       return approxidate_str(date, (const struct timeval *) &tv, &errors);
 }
 
 timestamp_t approxidate_careful(const char *date, int *error_ret)

diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index 585347ea487a3c1ed9754d66d454a2f20f332154..deb586934361c8fbeee86fcbbaf11e6856f4d185 100644 (file)
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@ -12,13 +12,13 @@ static const char *usage_msg = "\n"
 "  test-tool date is64bit\n"
 "  test-tool date time_t-is64bit\n";
 
-static void show_relative_dates(const char **argv, struct timeval *now)
+static void show_relative_dates(const char **argv)
 {
        struct strbuf buf = STRBUF_INIT;
 
        for (; *argv; argv++) {
                time_t t = atoi(*argv);
-               show_date_relative(t, now, &buf);
+               show_date_relative(t, &buf);
                printf("%s -> %s\n", *argv, buf.buf);
        }
        strbuf_release(&buf);
@@ -74,20 +74,20 @@ static void parse_dates(const char **argv)
        strbuf_release(&result);
 }
 
-static void parse_approxidate(const char **argv, struct timeval *now)
+static void parse_approxidate(const char **argv)
 {
        for (; *argv; argv++) {
                timestamp_t t;
-               t = approxidate_relative(*argv, now);
+               t = approxidate_relative(*argv);
                printf("%s -> %s\n", *argv, show_date(t, 0, DATE_MODE(ISO8601)));
        }
 }
 
-static void parse_approx_timestamp(const char **argv, struct timeval *now)
+static void parse_approx_timestamp(const char **argv)
 {
        for (; *argv; argv++) {
                timestamp_t t;
-               t = approxidate_relative(*argv, now);
+               t = approxidate_relative(*argv);
                printf("%s -> %"PRItime"\n", *argv, t);
        }
 }
@@ -103,22 +103,14 @@ static void getnanos(const char **argv)
 
 int cmd__date(int argc, const char **argv)
 {
-       struct timeval now;
        const char *x;
-
        x = getenv("GIT_TEST_DATE_NOW");
-       if (x) {
-               now.tv_sec = atoi(x);
-               now.tv_usec = 0;
-       }
-       else
-               gettimeofday(&now, NULL);
 
        argv++;
        if (!*argv)
                usage(usage_msg);
        if (!strcmp(*argv, "relative"))
-               show_relative_dates(argv+1, &now);
+               show_relative_dates(argv+1);
        else if (!strcmp(*argv, "human"))
                show_human_dates(argv+1);
        else if (skip_prefix(*argv, "show:", &x))
@@ -126,9 +118,9 @@ int cmd__date(int argc, const char **argv)
        else if (!strcmp(*argv, "parse"))
                parse_dates(argv+1);
        else if (!strcmp(*argv, "approxidate"))
-               parse_approxidate(argv+1, &now);
+               parse_approxidate(argv+1);
        else if (!strcmp(*argv, "timestamp"))
-               parse_approx_timestamp(argv+1, &now);
+               parse_approx_timestamp(argv+1);
        else if (!strcmp(*argv, "getnanos"))
                getnanos(argv+1);
        else if (!strcmp(*argv, "is64bit"))