mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'ss/get-time-cleanup'
Code simplification. * ss/get-time-cleanup: test_date.c: remove reference to GIT_TEST_DATE_NOW Quit passing 'now' to date code
This commit is contained in:
commit
36d2fca82b
5
cache.h
5
cache.h
|
@ -1554,8 +1554,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);
|
||||
|
@ -1564,7 +1563,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);
|
||||
|
||||
|
|
27
date.c
27
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, ×tamp, &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)
|
||||
|
|
|
@ -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,13 @@ 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 +117,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"))
|
||||
|
|
Loading…
Reference in a new issue