From: "Stephen P. Smith" <ischis2@cox.net>
To: git@vger.kernel.org
Cc: "Linus Torvalds" <torvalds@linux-foundation.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jeff King" <peff@peff.net>,
"Philip Oakley" <philipoakley@iee.org>,
"Johannes Sixt" <j6t@kdbg.org>
Subject: [PATCH v3 4/5] Add `human` format to test-tool
Date: Sun, 20 Jan 2019 22:16:45 -0700 [thread overview]
Message-ID: <20190121051646.20991-5-ischis2@cox.net> (raw)
In-Reply-To: <20190121051646.20991-1-ischis2@cox.net>
Add the human format support to the test tool so that TEST_DATE_NOW
can be used to specify the current time.
The get_time() helper function was created and and checks the
TEST_DATE_NOW environment variable. If TEST_DATE_NOW is set, then
that date is used instead of the date returned by by gettimeofday().
All calls to gettimeofday() were replaced by calls to get_time().
Signed-off-by: Stephen P. Smith <ischis2@cox.net>
---
cache.h | 2 ++
date.c | 21 +++++++++++++++++----
t/helper/test-date.c | 11 +++++++++++
3 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/cache.h b/cache.h
index 34c33e6a28..fe00ddf910 100644
--- a/cache.h
+++ b/cache.h
@@ -1467,6 +1467,8 @@ 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, int tz, const struct timeval *now,
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);
int parse_date_basic(const char *date, timestamp_t *timestamp, int *offset);
int parse_expiry_date(const char *date, timestamp_t *timestamp);
diff --git a/date.c b/date.c
index 43c3a84e25..5f9ea7d5d7 100644
--- a/date.c
+++ b/date.c
@@ -115,6 +115,19 @@ static int local_tzoffset(timestamp_t time)
return local_time_tzoffset((time_t)time, &tm);
}
+static void get_time(struct timeval *now)
+{
+ const char *x;
+
+ x = getenv("TEST_DATE_NOW");
+ if (x) {
+ now->tv_sec = atoi(x);
+ now->tv_usec = 0;
+ }
+ else
+ gettimeofday(now, NULL);
+}
+
void show_date_relative(timestamp_t time, int tz,
const struct timeval *now,
struct strbuf *timebuf)
@@ -228,7 +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;
- gettimeofday(&now, NULL);
+ get_time(&now);
show_date_relative(time, tz, &now, buf);
return;
}
@@ -284,7 +297,7 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode)
if (mode->type == DATE_HUMAN) {
struct timeval now;
- gettimeofday(&now, NULL);
+ get_time(&now);
/* Fill in the data for "current time" in human_tz and human_tm */
human_tz = local_time_tzoffset(now.tv_sec, &human_tm);
@@ -303,7 +316,7 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode)
struct timeval now;
strbuf_reset(&timebuf);
- gettimeofday(&now, NULL);
+ get_time(&now);
show_date_relative(time, tz, &now, &timebuf);
return timebuf.buf;
}
@@ -1296,7 +1309,7 @@ timestamp_t approxidate_careful(const char *date, int *error_ret)
return timestamp;
}
- gettimeofday(&tv, NULL);
+ get_time(&tv);
return approxidate_str(date, &tv, error_ret);
}
diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index a0837371ab..811b116c7e 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;
@@ -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"))
--
2.20.1.2.gb21ebb671b
next prev parent reply other threads:[~2019-01-21 7:13 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-31 0:31 [PATCH 0/3] Add 'human' date format Stephen P. Smith
2018-12-31 0:31 ` [PATCH 1/3] " Stephen P. Smith
2019-01-03 7:37 ` Jeff King
2019-01-03 13:19 ` Stephen P. Smith
2019-01-04 7:50 ` Jeff King
2019-01-04 13:03 ` Stephen P Smith
2019-01-06 6:19 ` Jeff King
2018-12-31 0:31 ` [PATCH 2/3] Add 'human' date format documentation Stephen P. Smith
2018-12-31 0:31 ` [PATCH 3/3] t0006-date.sh: add `human` date format tests Stephen P. Smith
2019-01-02 18:15 ` Junio C Hamano
2019-01-03 2:36 ` Stephen & Linda Smith
2019-01-03 6:42 ` Junio C Hamano
2019-01-03 13:20 ` Stephen P. Smith
2019-01-03 21:14 ` Philip Oakley
2019-01-03 21:45 ` Junio C Hamano
2019-01-03 23:57 ` Stephen P. Smith
2019-01-03 7:44 ` Jeff King
2019-01-03 13:12 ` Stephen & Linda Smith
2019-01-08 21:27 ` Johannes Sixt
2019-01-09 0:44 ` Stephen P. Smith
2019-01-09 6:58 ` Johannes Sixt
2019-01-10 1:50 ` Stephen & Linda Smith
2019-01-18 6:18 ` [PATCH v2 0/5] Re-roll of 'human' date format patch set Stephen P. Smith
2019-01-18 6:18 ` [PATCH v2 1/5] Add 'human' date format Stephen P. Smith
2019-01-18 6:18 ` [PATCH v2 2/5] Remove the proposed use of auto as secondary way to specify human Stephen P. Smith
2019-01-18 18:35 ` Junio C Hamano
2019-01-19 3:44 ` Stephen & Linda Smith
2019-01-18 6:18 ` [PATCH v2 3/5] Add 'human' date format documentation Stephen P. Smith
2019-01-18 18:47 ` Junio C Hamano
2019-01-18 6:18 ` [PATCH v2 4/5] Add `human` format to test-tool Stephen P. Smith
2019-01-18 19:03 ` Junio C Hamano
2019-01-20 22:11 ` Stephen P. Smith
2019-01-22 18:29 ` Junio C Hamano
2019-01-18 6:18 ` [PATCH v2 5/5] Add `human` date format tests Stephen P. Smith
2019-01-18 19:24 ` Junio C Hamano
2019-01-21 5:31 ` [PATCH v3 0/5] Re-roll of 'human' date format patch set Stephen P. Smith
2019-01-21 5:31 ` [PATCH v3 1/5] Add 'human' date format Stephen P. Smith
2019-01-21 5:31 ` [PATCH v3 2/5] Replace the proposed 'auto' mode with 'auto:' Stephen P. Smith
2019-01-21 5:31 ` [PATCH v3 3/5] Add 'human' date format documentation Stephen P. Smith
2019-01-21 5:31 ` [PATCH v3 4/5] Add `human` format to test-tool Stephen P. Smith
2019-01-22 22:34 ` Junio C Hamano
2019-01-21 5:31 ` [PATCH v3 5/5] Add `human` date format tests Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 0/5] Re-roll of 'human' date format patch set Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 1/5] Add 'human' date format Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 2/5] Replace the proposed 'auto' mode with 'auto:' Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 3/5] Add 'human' date format documentation Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 4/5] Add `human` format to test-tool Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 5/5] Add `human` date format tests Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 0/5] Re-roll of 'human' date format patch set Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 1/5] Add 'human' date format Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 2/5] Replace the proposed 'auto' mode with 'auto:' Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 3/5] Add 'human' date format documentation Stephen P. Smith
2019-01-21 5:16 ` Stephen P. Smith [this message]
2019-01-21 5:16 ` [PATCH v3 5/5] Add `human` date format tests Stephen P. Smith
2019-01-21 15:04 ` SZEDER Gábor
2019-01-22 0:53 ` Stephen & Linda Smith
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190121051646.20991-5-ischis2@cox.net \
--to=ischis2@cox.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).