git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 4/5] Add `human` format to test-tool

From
SSStephen P. Smith <ischis2@cox.net>
Date
Jan 21, 2019, 05:16 UTC
Message-ID
<20190121051646.20991-5-ischis2@cox.net>
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
Previous: Stephen & Linda SmithNext: Stephen P. Smith
Message 54 of 56 in “Add 'human' date format”
  1. 0/3 Add 'human' date formatStephen P. Smith, Dec 31, 2018
  2. 2/3 Add 'human' date format documentationStephen P. Smith, Dec 31, 2018
  3. 3/3 t0006-date.sh: add `human` date format tests.Stephen P. Smith, Dec 31, 2018
  4. Junio C HamanoJan 2, 2019
  5. Stephen & Linda SmithJan 3, 2019
  6. Junio C HamanoJan 3, 2019
  7. Stephen P. SmithJan 3, 2019
  8. Philip OakleyJan 3, 2019
  9. Junio C HamanoJan 3, 2019
  10. Stephen P. SmithJan 3, 2019
  11. Jeff KingJan 3, 2019
  12. Stephen & Linda SmithJan 3, 2019
  13. Johannes SixtJan 8, 2019
  14. Stephen P. SmithJan 9, 2019
  15. Johannes SixtJan 9, 2019
  16. Stephen & Linda SmithJan 10, 2019
  17. 1/3 Add 'human' date formatStephen P. Smith, Dec 31, 2018
  18. Jeff KingJan 3, 2019
  19. Stephen P. SmithJan 3, 2019
  20. Jeff KingJan 4, 2019
  21. Stephen P SmithJan 4, 2019
  22. Jeff KingJan 6, 2019
  23. 0/5 Re-roll of 'human' date format patch setStephen P. Smith, Jan 18, 2019
  24. 3/5 Add 'human' date format documentationStephen P. Smith, Jan 18, 2019
  25. Junio C HamanoJan 18, 2019
  26. 2/5 Remove the proposed use of auto as secondary way to specify humanStephen P. Smith, Jan 18, 2019
  27. Junio C HamanoJan 18, 2019
  28. Stephen & Linda SmithJan 19, 2019
  29. 5/5 Add `human` date format tests.Stephen P. Smith, Jan 18, 2019
  30. Junio C HamanoJan 18, 2019
  31. 4/5 Add `human` format to test-toolStephen P. Smith, Jan 18, 2019
  32. Junio C HamanoJan 18, 2019
  33. Stephen P. SmithJan 20, 2019
  34. Junio C HamanoJan 22, 2019
  35. 1/5 Add 'human' date formatStephen P. Smith, Jan 18, 2019
  36. 0/5 Re-roll of 'human' date format patch setStephen P. Smith, Jan 21, 2019
  37. 1/5 Add 'human' date formatStephen P. Smith, Jan 21, 2019
  38. 2/5 Replace the proposed 'auto' mode with 'auto:'Stephen P. Smith, Jan 21, 2019
  39. 5/5 Add `human` date format tests.Stephen P. Smith, Jan 21, 2019
  40. 3/5 Add 'human' date format documentationStephen P. Smith, Jan 21, 2019
  41. 4/5 Add `human` format to test-toolStephen P. Smith, Jan 21, 2019
  42. Junio C HamanoJan 22, 2019
  43. 0/5 Re-roll of 'human' date format patch setStephen P. Smith, Jan 29, 2019
  44. 4/5 Add `human` format to test-toolStephen P. Smith, Jan 29, 2019
  45. 1/5 Add 'human' date formatStephen P. Smith, Jan 29, 2019
  46. 3/5 Add 'human' date format documentationStephen P. Smith, Jan 29, 2019
  47. 2/5 Replace the proposed 'auto' mode with 'auto:'Stephen P. Smith, Jan 29, 2019
  48. 5/5 Add `human` date format tests.Stephen P. Smith, Jan 29, 2019
  49. 0/5 Re-roll of 'human' date format patch setStephen P. Smith, Jan 21, 2019
  50. 1/5 Add 'human' date formatStephen P. Smith, Jan 21, 2019
  51. 5/5 Add `human` date format tests.Stephen P. Smith, Jan 21, 2019
  52. SZEDER GáborJan 21, 2019
  53. Stephen & Linda SmithJan 22, 2019
  54. 4/5 Add `human` format to test-toolStephen P. Smith, Jan 21, 2019
  55. 3/5 Add 'human' date format documentationStephen P. Smith, Jan 21, 2019
  56. 2/5 Replace the proposed 'auto' mode with 'auto:'Stephen P. Smith, Jan 21, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.