2005-04-30 18:46:49 +02:00
|
|
|
/*
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*/
|
|
|
|
|
2005-05-20 20:46:10 +02:00
|
|
|
#include "cache.h"
|
|
|
|
|
2008-06-23 08:31:41 +02:00
|
|
|
/*
|
|
|
|
* This is like mktime, but without normalization of tm_wday and tm_yday.
|
|
|
|
*/
|
2010-01-12 08:52:47 +01:00
|
|
|
static time_t tm_to_time_t(const struct tm *tm)
|
2005-04-30 18:46:49 +02:00
|
|
|
{
|
|
|
|
static const int mdays[] = {
|
|
|
|
0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
|
|
|
|
};
|
|
|
|
int year = tm->tm_year - 70;
|
|
|
|
int month = tm->tm_mon;
|
|
|
|
int day = tm->tm_mday;
|
|
|
|
|
|
|
|
if (year < 0 || year > 129) /* algo only works for 1970-2099 */
|
|
|
|
return -1;
|
|
|
|
if (month < 0 || month > 11) /* array bounds */
|
|
|
|
return -1;
|
|
|
|
if (month < 2 || (year + 2) % 4)
|
|
|
|
day--;
|
Further 'approxidate' improvements
The previous patch to improve approxidate got us to the point that a lot
of the remaining annoyances were due to the 'strict' date handling running
first, and deciding that it got a good enough date that the approximate
date routines were never even invoked.
For example, using a date string like
6AM, June 7, 2009
the strict date logic would be perfectly happy with the "June 7, 2009"
part, and ignore the 6AM part that it didn't understand - resulting in the
information getting dropped on the floor:
6AM, June 7, 2009 -> Sat Jun 6 00:00:00 2009
and the date being calculated as if it was midnight, and the '6AM' having
confused the date routines into thinking about '6 June' rather than 'June
7' at 6AM (ie notice how the _day_ was wrong due to this, not just the
time).
So this makes the strict date routines a bit stricter, and requires that
not just the date, but also the time, has actually been parsed. With that
fix, and trivial extension of the approxidate routines, git now properly
parses the date as
6AM, June 7, 2009 -> Sun Jun 7 06:00:00 2009
without dropping the fuzzy time ("6AM" or "noon" or any of the other
non-strict time formats) on the floor.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-23 03:11:44 +02:00
|
|
|
if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_sec < 0)
|
|
|
|
return -1;
|
2005-04-30 18:46:49 +02:00
|
|
|
return (year * 365 + (year + 1) / 4 + mdays[month] + day) * 24*60*60UL +
|
|
|
|
tm->tm_hour * 60*60 + tm->tm_min * 60 + tm->tm_sec;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *month_names[] = {
|
2005-04-30 22:19:56 +02:00
|
|
|
"January", "February", "March", "April", "May", "June",
|
|
|
|
"July", "August", "September", "October", "November", "December"
|
2005-04-30 18:46:49 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
static const char *weekday_names[] = {
|
Teach "approxidate" about weekday syntax
This allows people to use syntax like "last thursday" for the approxidate.
(Or, indeed, more complex "three thursdays ago", but I suspect that would
be pretty unusual).
NOTE! The parsing is strictly sequential, so if you do
"one day before last thursday"
it will _not_ do what you think it does. It will take the current time,
subtract one day, and then go back to the thursday before that. So to get
what you want, you'd have to write it the other way around:
"last thursday and one day before"
which is insane (it's usually the same as "last wednesday" _except_ if
today is Thursday, in which case "last wednesday" is yesterday, and "last
thursday and one day before" is eight days ago).
Similarly,
"last thursday one month ago"
will first go back to last thursday, and then go back one month from
there, not the other way around.
I doubt anybody would ever use insane dates like that, but I thought I'd
point out that the approxidate parsing is not exactly "standard English".
Side note 2: if you want to avoid spaces (because of quoting issues), you
can use any non-alphanumberic character instead. So
git log --since=2.days.ago
works without any quotes.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-17 21:36:30 +01:00
|
|
|
"Sundays", "Mondays", "Tuesdays", "Wednesdays", "Thursdays", "Fridays", "Saturdays"
|
2005-04-30 18:46:49 +02:00
|
|
|
};
|
|
|
|
|
2006-08-27 00:45:26 +02:00
|
|
|
static time_t gm_time_t(unsigned long time, int tz)
|
|
|
|
{
|
|
|
|
int minutes;
|
|
|
|
|
|
|
|
minutes = tz < 0 ? -tz : tz;
|
|
|
|
minutes = (minutes / 100)*60 + (minutes % 100);
|
|
|
|
minutes = tz < 0 ? -minutes : minutes;
|
|
|
|
return time + minutes * 60;
|
|
|
|
}
|
|
|
|
|
2005-05-07 00:28:59 +02:00
|
|
|
/*
|
|
|
|
* The "tz" thing is passed in as this strange "decimal parse of tz"
|
|
|
|
* thing, which means that tz -0100 is passed in as the integer -100,
|
|
|
|
* even though it means "sixty minutes off"
|
|
|
|
*/
|
2006-05-01 10:44:33 +02:00
|
|
|
static struct tm *time_to_tm(unsigned long time, int tz)
|
2005-05-07 00:28:59 +02:00
|
|
|
{
|
2006-08-27 00:45:26 +02:00
|
|
|
time_t t = gm_time_t(time, tz);
|
2006-05-01 10:44:33 +02:00
|
|
|
return gmtime(&t);
|
|
|
|
}
|
|
|
|
|
2007-04-25 08:36:22 +02:00
|
|
|
/*
|
|
|
|
* What value of "tz" was in effect back then at "time" in the
|
|
|
|
* local timezone?
|
|
|
|
*/
|
|
|
|
static int local_tzoffset(unsigned long time)
|
|
|
|
{
|
|
|
|
time_t t, t_local;
|
|
|
|
struct tm tm;
|
|
|
|
int offset, eastwest;
|
|
|
|
|
|
|
|
t = time;
|
|
|
|
localtime_r(&t, &tm);
|
2008-06-23 08:31:41 +02:00
|
|
|
t_local = tm_to_time_t(&tm);
|
2007-04-25 08:36:22 +02:00
|
|
|
|
|
|
|
if (t_local < t) {
|
|
|
|
eastwest = -1;
|
|
|
|
offset = t - t_local;
|
|
|
|
} else {
|
|
|
|
eastwest = 1;
|
|
|
|
offset = t_local - t;
|
|
|
|
}
|
|
|
|
offset /= 60; /* in minutes */
|
|
|
|
offset = (offset % 60) + ((offset / 60) * 100);
|
|
|
|
return offset * eastwest;
|
|
|
|
}
|
|
|
|
|
2012-04-23 14:30:23 +02:00
|
|
|
void show_date_relative(unsigned long time, int tz,
|
2009-08-31 04:26:05 +02:00
|
|
|
const struct timeval *now,
|
2012-04-23 14:30:23 +02:00
|
|
|
struct strbuf *timebuf)
|
2009-08-31 04:26:05 +02:00
|
|
|
{
|
|
|
|
unsigned long diff;
|
2012-04-23 14:30:23 +02:00
|
|
|
if (now->tv_sec < time) {
|
|
|
|
strbuf_addstr(timebuf, _("in the future"));
|
|
|
|
return;
|
|
|
|
}
|
2009-08-31 04:26:05 +02:00
|
|
|
diff = now->tv_sec - time;
|
|
|
|
if (diff < 90) {
|
2012-04-23 14:30:23 +02:00
|
|
|
strbuf_addf(timebuf,
|
|
|
|
Q_("%lu second ago", "%lu seconds ago", diff), diff);
|
|
|
|
return;
|
2009-08-31 04:26:05 +02:00
|
|
|
}
|
|
|
|
/* Turn it into minutes */
|
|
|
|
diff = (diff + 30) / 60;
|
|
|
|
if (diff < 90) {
|
2012-04-23 14:30:23 +02:00
|
|
|
strbuf_addf(timebuf,
|
|
|
|
Q_("%lu minute ago", "%lu minutes ago", diff), diff);
|
|
|
|
return;
|
2009-08-31 04:26:05 +02:00
|
|
|
}
|
|
|
|
/* Turn it into hours */
|
|
|
|
diff = (diff + 30) / 60;
|
|
|
|
if (diff < 36) {
|
2012-04-23 14:30:23 +02:00
|
|
|
strbuf_addf(timebuf,
|
|
|
|
Q_("%lu hour ago", "%lu hours ago", diff), diff);
|
|
|
|
return;
|
2009-08-31 04:26:05 +02:00
|
|
|
}
|
|
|
|
/* We deal with number of days from here on */
|
|
|
|
diff = (diff + 12) / 24;
|
|
|
|
if (diff < 14) {
|
2012-04-23 14:30:23 +02:00
|
|
|
strbuf_addf(timebuf,
|
|
|
|
Q_("%lu day ago", "%lu days ago", diff), diff);
|
|
|
|
return;
|
2009-08-31 04:26:05 +02:00
|
|
|
}
|
|
|
|
/* Say weeks for the past 10 weeks or so */
|
|
|
|
if (diff < 70) {
|
2012-04-23 14:30:23 +02:00
|
|
|
strbuf_addf(timebuf,
|
|
|
|
Q_("%lu week ago", "%lu weeks ago", (diff + 3) / 7),
|
|
|
|
(diff + 3) / 7);
|
|
|
|
return;
|
2009-08-31 04:26:05 +02:00
|
|
|
}
|
|
|
|
/* Say months for the past 12 months or so */
|
2009-10-03 06:20:18 +02:00
|
|
|
if (diff < 365) {
|
2012-04-23 14:30:23 +02:00
|
|
|
strbuf_addf(timebuf,
|
|
|
|
Q_("%lu month ago", "%lu months ago", (diff + 15) / 30),
|
|
|
|
(diff + 15) / 30);
|
|
|
|
return;
|
2009-08-31 04:26:05 +02:00
|
|
|
}
|
|
|
|
/* Give years and months for 5 years or so */
|
|
|
|
if (diff < 1825) {
|
date: avoid "X years, 12 months" in relative dates
When relative dates are more than about a year ago, we start
writing them as "Y years, M months". At the point where we
calculate Y and M, we have the time delta specified as a
number of days. We calculate these integers as:
Y = days / 365
M = (days % 365 + 15) / 30
This rounds days in the latter half of a month up to the
nearest month, so that day 16 is "1 month" (or day 381 is "1
year, 1 month").
We don't round the year at all, though, meaning we can end
up with "1 year, 12 months", which is silly; it should just
be "2 years".
Implement this differently with months of size
onemonth = 365/12
so that
totalmonths = (long)( (days + onemonth/2)/onemonth )
years = totalmonths / 12
months = totalmonths % 12
In order to do this without floats, we write the first formula as
totalmonths = (days*12*2 + 365) / (365*2)
Tests and inspiration by Jeff King.
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-04-20 11:12:11 +02:00
|
|
|
unsigned long totalmonths = (diff * 12 * 2 + 365) / (365 * 2);
|
|
|
|
unsigned long years = totalmonths / 12;
|
|
|
|
unsigned long months = totalmonths % 12;
|
2012-04-23 14:30:23 +02:00
|
|
|
if (months) {
|
|
|
|
struct strbuf sb = STRBUF_INIT;
|
|
|
|
strbuf_addf(&sb, Q_("%lu year", "%lu years", years), years);
|
|
|
|
strbuf_addf(timebuf,
|
2014-04-17 07:37:17 +02:00
|
|
|
/* TRANSLATORS: "%s" is "<n> years" */
|
2012-04-23 14:30:23 +02:00
|
|
|
Q_("%s, %lu month ago", "%s, %lu months ago", months),
|
|
|
|
sb.buf, months);
|
|
|
|
strbuf_release(&sb);
|
|
|
|
} else
|
|
|
|
strbuf_addf(timebuf,
|
|
|
|
Q_("%lu year ago", "%lu years ago", years), years);
|
|
|
|
return;
|
2009-08-31 04:26:05 +02:00
|
|
|
}
|
|
|
|
/* Otherwise, just years. Centuries is probably overkill. */
|
2012-04-23 14:30:23 +02:00
|
|
|
strbuf_addf(timebuf,
|
|
|
|
Q_("%lu year ago", "%lu years ago", (diff + 183) / 365),
|
|
|
|
(diff + 183) / 365);
|
2009-08-31 04:26:05 +02:00
|
|
|
}
|
|
|
|
|
2007-02-27 16:21:04 +01:00
|
|
|
const char *show_date(unsigned long time, int tz, enum date_mode mode)
|
2006-05-01 10:44:33 +02:00
|
|
|
{
|
|
|
|
struct tm *tm;
|
2012-04-23 14:30:23 +02:00
|
|
|
static struct strbuf timebuf = STRBUF_INIT;
|
2006-05-01 10:44:33 +02:00
|
|
|
|
2009-02-20 23:15:22 +01:00
|
|
|
if (mode == DATE_RAW) {
|
2012-04-23 14:30:23 +02:00
|
|
|
strbuf_reset(&timebuf);
|
|
|
|
strbuf_addf(&timebuf, "%lu %+05d", time, tz);
|
|
|
|
return timebuf.buf;
|
2009-02-20 23:15:22 +01:00
|
|
|
}
|
|
|
|
|
2007-02-27 16:21:04 +01:00
|
|
|
if (mode == DATE_RELATIVE) {
|
2006-08-27 00:45:26 +02:00
|
|
|
struct timeval now;
|
2012-04-23 14:30:23 +02:00
|
|
|
|
|
|
|
strbuf_reset(&timebuf);
|
2006-08-27 00:45:26 +02:00
|
|
|
gettimeofday(&now, NULL);
|
2012-04-23 14:30:23 +02:00
|
|
|
show_date_relative(time, tz, &now, &timebuf);
|
|
|
|
return timebuf.buf;
|
2006-08-27 00:45:26 +02:00
|
|
|
}
|
|
|
|
|
2007-04-25 08:36:22 +02:00
|
|
|
if (mode == DATE_LOCAL)
|
|
|
|
tz = local_tzoffset(time);
|
|
|
|
|
2006-05-01 10:44:33 +02:00
|
|
|
tm = time_to_tm(time, tz);
|
2014-02-24 08:49:05 +01:00
|
|
|
if (!tm) {
|
|
|
|
tm = time_to_tm(0, 0);
|
|
|
|
tz = 0;
|
|
|
|
}
|
2012-04-23 14:30:23 +02:00
|
|
|
|
|
|
|
strbuf_reset(&timebuf);
|
2007-02-27 16:21:04 +01:00
|
|
|
if (mode == DATE_SHORT)
|
2012-04-23 14:30:23 +02:00
|
|
|
strbuf_addf(&timebuf, "%04d-%02d-%02d", tm->tm_year + 1900,
|
2007-02-27 16:21:04 +01:00
|
|
|
tm->tm_mon + 1, tm->tm_mday);
|
2007-07-14 01:00:42 +02:00
|
|
|
else if (mode == DATE_ISO8601)
|
2012-04-23 14:30:23 +02:00
|
|
|
strbuf_addf(&timebuf, "%04d-%02d-%02d %02d:%02d:%02d %+05d",
|
2007-07-14 01:00:42 +02:00
|
|
|
tm->tm_year + 1900,
|
|
|
|
tm->tm_mon + 1,
|
|
|
|
tm->tm_mday,
|
|
|
|
tm->tm_hour, tm->tm_min, tm->tm_sec,
|
|
|
|
tz);
|
2014-08-29 18:58:42 +02:00
|
|
|
else if (mode == DATE_ISO8601_STRICT) {
|
|
|
|
char sign = (tz >= 0) ? '+' : '-';
|
|
|
|
tz = abs(tz);
|
|
|
|
strbuf_addf(&timebuf, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
|
|
|
|
tm->tm_year + 1900,
|
|
|
|
tm->tm_mon + 1,
|
|
|
|
tm->tm_mday,
|
|
|
|
tm->tm_hour, tm->tm_min, tm->tm_sec,
|
|
|
|
sign, tz / 100, tz % 100);
|
|
|
|
} else if (mode == DATE_RFC2822)
|
2012-04-23 14:30:23 +02:00
|
|
|
strbuf_addf(&timebuf, "%.3s, %d %.3s %d %02d:%02d:%02d %+05d",
|
2007-07-14 08:14:52 +02:00
|
|
|
weekday_names[tm->tm_wday], tm->tm_mday,
|
|
|
|
month_names[tm->tm_mon], tm->tm_year + 1900,
|
|
|
|
tm->tm_hour, tm->tm_min, tm->tm_sec, tz);
|
2007-02-27 16:21:04 +01:00
|
|
|
else
|
2012-04-23 14:30:23 +02:00
|
|
|
strbuf_addf(&timebuf, "%.3s %.3s %d %02d:%02d:%02d %d%c%+05d",
|
2007-02-27 16:21:04 +01:00
|
|
|
weekday_names[tm->tm_wday],
|
|
|
|
month_names[tm->tm_mon],
|
|
|
|
tm->tm_mday,
|
|
|
|
tm->tm_hour, tm->tm_min, tm->tm_sec,
|
2007-04-25 08:36:22 +02:00
|
|
|
tm->tm_year + 1900,
|
|
|
|
(mode == DATE_LOCAL) ? 0 : ' ',
|
|
|
|
tz);
|
2012-04-23 14:30:23 +02:00
|
|
|
return timebuf.buf;
|
2005-05-07 00:28:59 +02:00
|
|
|
}
|
|
|
|
|
2005-04-30 22:19:56 +02:00
|
|
|
/*
|
|
|
|
* Check these. And note how it doesn't do the summer-time conversion.
|
|
|
|
*
|
|
|
|
* In my world, it's always summer, and things are probably a bit off
|
|
|
|
* in other ways too.
|
|
|
|
*/
|
|
|
|
static const struct {
|
|
|
|
const char *name;
|
|
|
|
int offset;
|
2005-04-30 23:53:12 +02:00
|
|
|
int dst;
|
2005-04-30 22:19:56 +02:00
|
|
|
} timezone_names[] = {
|
2005-04-30 23:53:12 +02:00
|
|
|
{ "IDLW", -12, 0, }, /* International Date Line West */
|
|
|
|
{ "NT", -11, 0, }, /* Nome */
|
|
|
|
{ "CAT", -10, 0, }, /* Central Alaska */
|
|
|
|
{ "HST", -10, 0, }, /* Hawaii Standard */
|
|
|
|
{ "HDT", -10, 1, }, /* Hawaii Daylight */
|
|
|
|
{ "YST", -9, 0, }, /* Yukon Standard */
|
|
|
|
{ "YDT", -9, 1, }, /* Yukon Daylight */
|
|
|
|
{ "PST", -8, 0, }, /* Pacific Standard */
|
|
|
|
{ "PDT", -8, 1, }, /* Pacific Daylight */
|
|
|
|
{ "MST", -7, 0, }, /* Mountain Standard */
|
|
|
|
{ "MDT", -7, 1, }, /* Mountain Daylight */
|
|
|
|
{ "CST", -6, 0, }, /* Central Standard */
|
|
|
|
{ "CDT", -6, 1, }, /* Central Daylight */
|
|
|
|
{ "EST", -5, 0, }, /* Eastern Standard */
|
|
|
|
{ "EDT", -5, 1, }, /* Eastern Daylight */
|
|
|
|
{ "AST", -3, 0, }, /* Atlantic Standard */
|
|
|
|
{ "ADT", -3, 1, }, /* Atlantic Daylight */
|
|
|
|
{ "WAT", -1, 0, }, /* West Africa */
|
|
|
|
|
|
|
|
{ "GMT", 0, 0, }, /* Greenwich Mean */
|
|
|
|
{ "UTC", 0, 0, }, /* Universal (Coordinated) */
|
2010-05-17 21:07:10 +02:00
|
|
|
{ "Z", 0, 0, }, /* Zulu, alias for UTC */
|
2005-04-30 23:53:12 +02:00
|
|
|
|
|
|
|
{ "WET", 0, 0, }, /* Western European */
|
|
|
|
{ "BST", 0, 1, }, /* British Summer */
|
|
|
|
{ "CET", +1, 0, }, /* Central European */
|
|
|
|
{ "MET", +1, 0, }, /* Middle European */
|
|
|
|
{ "MEWT", +1, 0, }, /* Middle European Winter */
|
|
|
|
{ "MEST", +1, 1, }, /* Middle European Summer */
|
|
|
|
{ "CEST", +1, 1, }, /* Central European Summer */
|
|
|
|
{ "MESZ", +1, 1, }, /* Middle European Summer */
|
|
|
|
{ "FWT", +1, 0, }, /* French Winter */
|
|
|
|
{ "FST", +1, 1, }, /* French Summer */
|
|
|
|
{ "EET", +2, 0, }, /* Eastern Europe, USSR Zone 1 */
|
2005-05-01 00:21:57 +02:00
|
|
|
{ "EEST", +2, 1, }, /* Eastern European Daylight */
|
2005-04-30 23:53:12 +02:00
|
|
|
{ "WAST", +7, 0, }, /* West Australian Standard */
|
|
|
|
{ "WADT", +7, 1, }, /* West Australian Daylight */
|
|
|
|
{ "CCT", +8, 0, }, /* China Coast, USSR Zone 7 */
|
|
|
|
{ "JST", +9, 0, }, /* Japan Standard, USSR Zone 8 */
|
|
|
|
{ "EAST", +10, 0, }, /* Eastern Australian Standard */
|
|
|
|
{ "EADT", +10, 1, }, /* Eastern Australian Daylight */
|
|
|
|
{ "GST", +10, 0, }, /* Guam Standard, USSR Zone 9 */
|
2008-02-26 01:45:53 +01:00
|
|
|
{ "NZT", +12, 0, }, /* New Zealand */
|
|
|
|
{ "NZST", +12, 0, }, /* New Zealand Standard */
|
|
|
|
{ "NZDT", +12, 1, }, /* New Zealand Daylight */
|
2005-04-30 23:53:12 +02:00
|
|
|
{ "IDLE", +12, 0, }, /* International Date Line East */
|
2005-04-30 22:19:56 +02:00
|
|
|
};
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2005-04-30 22:19:56 +02:00
|
|
|
static int match_string(const char *date, const char *str)
|
2005-04-30 18:46:49 +02:00
|
|
|
{
|
2005-04-30 22:19:56 +02:00
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
for (i = 0; *date; date++, str++, i++) {
|
|
|
|
if (*date == *str)
|
|
|
|
continue;
|
|
|
|
if (toupper(*date) == toupper(*str))
|
|
|
|
continue;
|
|
|
|
if (!isalnum(*date))
|
|
|
|
break;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return i;
|
2005-04-30 18:46:49 +02:00
|
|
|
}
|
|
|
|
|
2005-05-01 21:34:56 +02:00
|
|
|
static int skip_alpha(const char *date)
|
|
|
|
{
|
|
|
|
int i = 0;
|
|
|
|
do {
|
|
|
|
i++;
|
|
|
|
} while (isalpha(date[i]));
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2005-04-30 22:19:56 +02:00
|
|
|
/*
|
|
|
|
* Parse month, weekday, or timezone name
|
|
|
|
*/
|
|
|
|
static int match_alpha(const char *date, struct tm *tm, int *offset)
|
2005-04-30 18:46:49 +02:00
|
|
|
{
|
2005-04-30 22:19:56 +02:00
|
|
|
int i;
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2005-04-30 22:19:56 +02:00
|
|
|
for (i = 0; i < 12; i++) {
|
|
|
|
int match = match_string(date, month_names[i]);
|
|
|
|
if (match >= 3) {
|
|
|
|
tm->tm_mon = i;
|
|
|
|
return match;
|
2005-04-30 18:46:49 +02:00
|
|
|
}
|
2005-04-30 22:19:56 +02:00
|
|
|
}
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2005-04-30 22:19:56 +02:00
|
|
|
for (i = 0; i < 7; i++) {
|
|
|
|
int match = match_string(date, weekday_names[i]);
|
|
|
|
if (match >= 3) {
|
|
|
|
tm->tm_wday = i;
|
|
|
|
return match;
|
|
|
|
}
|
|
|
|
}
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2006-03-09 20:58:05 +01:00
|
|
|
for (i = 0; i < ARRAY_SIZE(timezone_names); i++) {
|
2005-04-30 22:19:56 +02:00
|
|
|
int match = match_string(date, timezone_names[i].name);
|
2010-05-17 21:07:10 +02:00
|
|
|
if (match >= 3 || match == strlen(timezone_names[i].name)) {
|
2005-04-30 23:53:12 +02:00
|
|
|
int off = timezone_names[i].offset;
|
|
|
|
|
|
|
|
/* This is bogus, but we like summer */
|
|
|
|
off += timezone_names[i].dst;
|
|
|
|
|
2005-05-01 00:21:57 +02:00
|
|
|
/* Only use the tz name offset if we don't have anything better */
|
|
|
|
if (*offset == -1)
|
|
|
|
*offset = 60*off;
|
|
|
|
|
2005-04-30 22:19:56 +02:00
|
|
|
return match;
|
2005-04-30 18:46:49 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-05-01 21:34:56 +02:00
|
|
|
if (match_string(date, "PM") == 2) {
|
2006-09-29 21:36:13 +02:00
|
|
|
tm->tm_hour = (tm->tm_hour % 12) + 12;
|
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (match_string(date, "AM") == 2) {
|
|
|
|
tm->tm_hour = (tm->tm_hour % 12) + 0;
|
2005-05-01 21:34:56 +02:00
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
|
2005-04-30 22:19:56 +02:00
|
|
|
/* BAD CRAP */
|
2005-05-01 21:34:56 +02:00
|
|
|
return skip_alpha(date);
|
2005-04-30 22:19:56 +02:00
|
|
|
}
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2006-04-06 00:31:12 +02:00
|
|
|
static int is_date(int year, int month, int day, struct tm *now_tm, time_t now, struct tm *tm)
|
2005-04-30 22:19:56 +02:00
|
|
|
{
|
2005-05-01 20:48:34 +02:00
|
|
|
if (month > 0 && month < 13 && day > 0 && day < 32) {
|
2006-04-06 00:31:12 +02:00
|
|
|
struct tm check = *tm;
|
|
|
|
struct tm *r = (now_tm ? &check : tm);
|
|
|
|
time_t specified;
|
|
|
|
|
|
|
|
r->tm_mon = month - 1;
|
|
|
|
r->tm_mday = day;
|
2005-05-01 20:48:34 +02:00
|
|
|
if (year == -1) {
|
2006-04-06 00:31:12 +02:00
|
|
|
if (!now_tm)
|
|
|
|
return 1;
|
|
|
|
r->tm_year = now_tm->tm_year;
|
2005-04-30 22:19:56 +02:00
|
|
|
}
|
2006-04-06 00:31:12 +02:00
|
|
|
else if (year >= 1970 && year < 2100)
|
|
|
|
r->tm_year = year - 1900;
|
|
|
|
else if (year > 70 && year < 100)
|
|
|
|
r->tm_year = year;
|
|
|
|
else if (year < 38)
|
|
|
|
r->tm_year = year + 100;
|
|
|
|
else
|
2005-05-01 20:48:34 +02:00
|
|
|
return 0;
|
2006-04-06 00:31:12 +02:00
|
|
|
if (!now_tm)
|
|
|
|
return 1;
|
|
|
|
|
2008-06-23 08:31:41 +02:00
|
|
|
specified = tm_to_time_t(r);
|
2005-05-01 20:48:34 +02:00
|
|
|
|
2006-04-06 00:31:12 +02:00
|
|
|
/* Be it commit time or author time, it does not make
|
|
|
|
* sense to specify timestamp way into the future. Make
|
|
|
|
* sure it is not later than ten days from now...
|
|
|
|
*/
|
2013-02-25 22:51:16 +01:00
|
|
|
if ((specified != -1) && (now + 10*24*3600 < specified))
|
2006-04-06 00:31:12 +02:00
|
|
|
return 0;
|
|
|
|
tm->tm_mon = r->tm_mon;
|
|
|
|
tm->tm_mday = r->tm_mday;
|
|
|
|
if (year != -1)
|
|
|
|
tm->tm_year = r->tm_year;
|
2005-05-01 20:48:34 +02:00
|
|
|
return 1;
|
2005-04-30 22:19:56 +02:00
|
|
|
}
|
2005-05-01 20:48:34 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2014-11-13 12:04:52 +01:00
|
|
|
static int match_multi_number(unsigned long num, char c, const char *date,
|
|
|
|
char *end, struct tm *tm, time_t now)
|
2005-05-01 20:48:34 +02:00
|
|
|
{
|
2006-04-06 00:31:12 +02:00
|
|
|
struct tm now_tm;
|
|
|
|
struct tm *refuse_future;
|
2005-05-01 20:48:34 +02:00
|
|
|
long num2, num3;
|
|
|
|
|
|
|
|
num2 = strtol(end+1, &end, 10);
|
|
|
|
num3 = -1;
|
|
|
|
if (*end == c && isdigit(end[1]))
|
|
|
|
num3 = strtol(end+1, &end, 10);
|
|
|
|
|
|
|
|
/* Time? Date? */
|
2005-04-30 22:19:56 +02:00
|
|
|
switch (c) {
|
2005-05-01 20:48:34 +02:00
|
|
|
case ':':
|
|
|
|
if (num3 < 0)
|
|
|
|
num3 = 0;
|
|
|
|
if (num < 25 && num2 >= 0 && num2 < 60 && num3 >= 0 && num3 <= 60) {
|
|
|
|
tm->tm_hour = num;
|
|
|
|
tm->tm_min = num2;
|
|
|
|
tm->tm_sec = num3;
|
2005-04-30 22:19:56 +02:00
|
|
|
break;
|
|
|
|
}
|
2005-05-01 20:48:34 +02:00
|
|
|
return 0;
|
2005-04-30 22:19:56 +02:00
|
|
|
|
|
|
|
case '-':
|
|
|
|
case '/':
|
2006-04-06 00:31:12 +02:00
|
|
|
case '.':
|
2014-11-13 12:04:52 +01:00
|
|
|
if (!now)
|
|
|
|
now = time(NULL);
|
2006-04-06 00:31:12 +02:00
|
|
|
refuse_future = NULL;
|
|
|
|
if (gmtime_r(&now, &now_tm))
|
|
|
|
refuse_future = &now_tm;
|
|
|
|
|
2005-05-01 20:48:34 +02:00
|
|
|
if (num > 70) {
|
|
|
|
/* yyyy-mm-dd? */
|
approxidate: allow ISO-like dates far in the future
When we are parsing approxidate strings and we find three
numbers separate by one of ":/-.", we guess that it may be a
date. We feed the numbers to match_multi_number, which
checks whether it makes sense as a date in various orderings
(e.g., dd/mm/yy or mm/dd/yy, etc).
One of the checks we do is to see whether it is a date more
than 10 days in the future. This was added in 38035cf (date
parsing: be friendlier to our European friends.,
2006-04-05), and lets us guess that if it is currently April
2014, then "10/03/2014" is probably March 10th, not October
3rd.
This has a downside, though; if you want to be overly
generous with your "--until" date specification, we may
wrongly parse "2014-12-01" as "2014-01-12" (because the
latter is an in-the-past date). If the year is a future year
(i.e., both are future dates), it gets even weirder. Due to
the vagaries of approxidate, months _after_ the current date
(no matter the year) get flipped, but ones before do not.
This patch drops the "in the future" check for dates of this
form, letting us treat them always as yyyy-mm-dd, even if
they are in the future. This does not affect the normal
dd/mm/yyyy versus mm/dd/yyyy lookup, because this code path
only kicks in when the first number is greater than 70
(i.e., it must be a year, and cannot be either a date or a
month).
The one possible casualty is that "yyyy-dd-mm" is less
likely to be chosen over "yyyy-mm-dd". That's probably OK,
though because:
1. The difference happens only when the date is in the
future. Already we prefer yyyy-mm-dd for dates in the
past.
2. It's unclear whether anybody even uses yyyy-dd-mm
regularly. It does not appear in lists of common date
formats in Wikipedia[1,2].
3. Even if (2) is wrong, it is better to prefer ISO-like
dates, as that is consistent with what we use elsewhere
in git.
[1] http://en.wikipedia.org/wiki/Date_and_time_representation_by_country
[2] http://en.wikipedia.org/wiki/Calendar_date
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-13 22:43:31 +01:00
|
|
|
if (is_date(num, num2, num3, NULL, now, tm))
|
2005-05-01 20:48:34 +02:00
|
|
|
break;
|
|
|
|
/* yyyy-dd-mm? */
|
approxidate: allow ISO-like dates far in the future
When we are parsing approxidate strings and we find three
numbers separate by one of ":/-.", we guess that it may be a
date. We feed the numbers to match_multi_number, which
checks whether it makes sense as a date in various orderings
(e.g., dd/mm/yy or mm/dd/yy, etc).
One of the checks we do is to see whether it is a date more
than 10 days in the future. This was added in 38035cf (date
parsing: be friendlier to our European friends.,
2006-04-05), and lets us guess that if it is currently April
2014, then "10/03/2014" is probably March 10th, not October
3rd.
This has a downside, though; if you want to be overly
generous with your "--until" date specification, we may
wrongly parse "2014-12-01" as "2014-01-12" (because the
latter is an in-the-past date). If the year is a future year
(i.e., both are future dates), it gets even weirder. Due to
the vagaries of approxidate, months _after_ the current date
(no matter the year) get flipped, but ones before do not.
This patch drops the "in the future" check for dates of this
form, letting us treat them always as yyyy-mm-dd, even if
they are in the future. This does not affect the normal
dd/mm/yyyy versus mm/dd/yyyy lookup, because this code path
only kicks in when the first number is greater than 70
(i.e., it must be a year, and cannot be either a date or a
month).
The one possible casualty is that "yyyy-dd-mm" is less
likely to be chosen over "yyyy-mm-dd". That's probably OK,
though because:
1. The difference happens only when the date is in the
future. Already we prefer yyyy-mm-dd for dates in the
past.
2. It's unclear whether anybody even uses yyyy-dd-mm
regularly. It does not appear in lists of common date
formats in Wikipedia[1,2].
3. Even if (2) is wrong, it is better to prefer ISO-like
dates, as that is consistent with what we use elsewhere
in git.
[1] http://en.wikipedia.org/wiki/Date_and_time_representation_by_country
[2] http://en.wikipedia.org/wiki/Calendar_date
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-13 22:43:31 +01:00
|
|
|
if (is_date(num, num3, num2, NULL, now, tm))
|
2005-04-30 22:19:56 +02:00
|
|
|
break;
|
2005-05-01 20:48:34 +02:00
|
|
|
}
|
2006-04-06 00:31:12 +02:00
|
|
|
/* Our eastern European friends say dd.mm.yy[yy]
|
|
|
|
* is the norm there, so giving precedence to
|
|
|
|
* mm/dd/yy[yy] form only when separator is not '.'
|
|
|
|
*/
|
|
|
|
if (c != '.' &&
|
|
|
|
is_date(num3, num, num2, refuse_future, now, tm))
|
|
|
|
break;
|
|
|
|
/* European dd.mm.yy[yy] or funny US dd/mm/yy[yy] */
|
|
|
|
if (is_date(num3, num2, num, refuse_future, now, tm))
|
2005-04-30 22:19:56 +02:00
|
|
|
break;
|
2006-04-06 00:31:12 +02:00
|
|
|
/* Funny European mm.dd.yy */
|
|
|
|
if (c == '.' &&
|
|
|
|
is_date(num3, num, num2, refuse_future, now, tm))
|
2005-05-01 20:48:34 +02:00
|
|
|
break;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return end - date;
|
|
|
|
}
|
|
|
|
|
Further 'approxidate' improvements
The previous patch to improve approxidate got us to the point that a lot
of the remaining annoyances were due to the 'strict' date handling running
first, and deciding that it got a good enough date that the approximate
date routines were never even invoked.
For example, using a date string like
6AM, June 7, 2009
the strict date logic would be perfectly happy with the "June 7, 2009"
part, and ignore the 6AM part that it didn't understand - resulting in the
information getting dropped on the floor:
6AM, June 7, 2009 -> Sat Jun 6 00:00:00 2009
and the date being calculated as if it was midnight, and the '6AM' having
confused the date routines into thinking about '6 June' rather than 'June
7' at 6AM (ie notice how the _day_ was wrong due to this, not just the
time).
So this makes the strict date routines a bit stricter, and requires that
not just the date, but also the time, has actually been parsed. With that
fix, and trivial extension of the approxidate routines, git now properly
parses the date as
6AM, June 7, 2009 -> Sun Jun 7 06:00:00 2009
without dropping the fuzzy time ("6AM" or "noon" or any of the other
non-strict time formats) on the floor.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-23 03:11:44 +02:00
|
|
|
/*
|
|
|
|
* Have we filled in any part of the time/date yet?
|
|
|
|
* We just do a binary 'and' to see if the sign bit
|
|
|
|
* is set in all the values.
|
|
|
|
*/
|
date/time: do not get confused by fractional seconds
The date/time parsing code was confused if the input time HH:MM:SS is
followed by fractional seconds. Since we do not record anything finer
grained than seconds, we could just drop fractional part, but there is a
twist.
We have taught people that not just spaces but dot can be used as word
separators when spelling things like:
$ git log --since 2.days
$ git show @{12:34:56.7.days.ago}
and we shouldn't mistake "7" in the latter example as a fraction and
discard it.
The rules are:
- valid days of month/mday are always single or double digits.
- valid years are either two or four digits
No, we don't support the year 600 _anyway_, since our encoding is based
on the UNIX epoch, and the day we worry about the year 10,000 is far
away and we can raise the limit to five digits when we get closer.
- Other numbers (eg "600 days ago") can have any number of digits, but
they cannot start with a zero. Again, the only exception is for
two-digit numbers, since that is fairly common for dates ("Dec 01" is
not unheard of)
So that means that any milli- or micro-second would be thrown out just
because the number of digits shows that it cannot be an interesting date.
A milli- or micro-second can obviously be a perfectly fine number
according to the rules above, as long as it doesn't start with a '0'. So
if we have
12:34:56.123
then that '123' gets parsed as a number, and we remember it. But because
it's bigger than 31, we'll never use it as such _unless_ there is
something after it to trigger that use.
So you can say "12:34:56.123.days.ago", and because of the "days", that
123 will actually be meaninful now.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-17 06:25:40 +02:00
|
|
|
static inline int nodate(struct tm *tm)
|
|
|
|
{
|
Further 'approxidate' improvements
The previous patch to improve approxidate got us to the point that a lot
of the remaining annoyances were due to the 'strict' date handling running
first, and deciding that it got a good enough date that the approximate
date routines were never even invoked.
For example, using a date string like
6AM, June 7, 2009
the strict date logic would be perfectly happy with the "June 7, 2009"
part, and ignore the 6AM part that it didn't understand - resulting in the
information getting dropped on the floor:
6AM, June 7, 2009 -> Sat Jun 6 00:00:00 2009
and the date being calculated as if it was midnight, and the '6AM' having
confused the date routines into thinking about '6 June' rather than 'June
7' at 6AM (ie notice how the _day_ was wrong due to this, not just the
time).
So this makes the strict date routines a bit stricter, and requires that
not just the date, but also the time, has actually been parsed. With that
fix, and trivial extension of the approxidate routines, git now properly
parses the date as
6AM, June 7, 2009 -> Sun Jun 7 06:00:00 2009
without dropping the fuzzy time ("6AM" or "noon" or any of the other
non-strict time formats) on the floor.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-23 03:11:44 +02:00
|
|
|
return (tm->tm_year &
|
|
|
|
tm->tm_mon &
|
|
|
|
tm->tm_mday &
|
|
|
|
tm->tm_hour &
|
|
|
|
tm->tm_min &
|
|
|
|
tm->tm_sec) < 0;
|
date/time: do not get confused by fractional seconds
The date/time parsing code was confused if the input time HH:MM:SS is
followed by fractional seconds. Since we do not record anything finer
grained than seconds, we could just drop fractional part, but there is a
twist.
We have taught people that not just spaces but dot can be used as word
separators when spelling things like:
$ git log --since 2.days
$ git show @{12:34:56.7.days.ago}
and we shouldn't mistake "7" in the latter example as a fraction and
discard it.
The rules are:
- valid days of month/mday are always single or double digits.
- valid years are either two or four digits
No, we don't support the year 600 _anyway_, since our encoding is based
on the UNIX epoch, and the day we worry about the year 10,000 is far
away and we can raise the limit to five digits when we get closer.
- Other numbers (eg "600 days ago") can have any number of digits, but
they cannot start with a zero. Again, the only exception is for
two-digit numbers, since that is fairly common for dates ("Dec 01" is
not unheard of)
So that means that any milli- or micro-second would be thrown out just
because the number of digits shows that it cannot be an interesting date.
A milli- or micro-second can obviously be a perfectly fine number
according to the rules above, as long as it doesn't start with a '0'. So
if we have
12:34:56.123
then that '123' gets parsed as a number, and we remember it. But because
it's bigger than 31, we'll never use it as such _unless_ there is
something after it to trigger that use.
So you can say "12:34:56.123.days.ago", and because of the "days", that
123 will actually be meaninful now.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-17 06:25:40 +02:00
|
|
|
}
|
|
|
|
|
2005-05-01 20:48:34 +02:00
|
|
|
/*
|
2007-06-07 09:04:01 +02:00
|
|
|
* We've seen a digit. Time? Year? Date?
|
2005-05-01 20:48:34 +02:00
|
|
|
*/
|
2005-07-12 19:33:06 +02:00
|
|
|
static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt)
|
2005-05-01 20:48:34 +02:00
|
|
|
{
|
|
|
|
int n;
|
|
|
|
char *end;
|
|
|
|
unsigned long num;
|
|
|
|
|
|
|
|
num = strtoul(date, &end, 10);
|
|
|
|
|
|
|
|
/*
|
2007-06-06 10:11:55 +02:00
|
|
|
* Seconds since 1970? We trigger on that for any numbers with
|
|
|
|
* more than 8 digits. This is because we don't want to rule out
|
|
|
|
* numbers like 20070606 as a YYYYMMDD date.
|
2005-05-01 20:48:34 +02:00
|
|
|
*/
|
date/time: do not get confused by fractional seconds
The date/time parsing code was confused if the input time HH:MM:SS is
followed by fractional seconds. Since we do not record anything finer
grained than seconds, we could just drop fractional part, but there is a
twist.
We have taught people that not just spaces but dot can be used as word
separators when spelling things like:
$ git log --since 2.days
$ git show @{12:34:56.7.days.ago}
and we shouldn't mistake "7" in the latter example as a fraction and
discard it.
The rules are:
- valid days of month/mday are always single or double digits.
- valid years are either two or four digits
No, we don't support the year 600 _anyway_, since our encoding is based
on the UNIX epoch, and the day we worry about the year 10,000 is far
away and we can raise the limit to five digits when we get closer.
- Other numbers (eg "600 days ago") can have any number of digits, but
they cannot start with a zero. Again, the only exception is for
two-digit numbers, since that is fairly common for dates ("Dec 01" is
not unheard of)
So that means that any milli- or micro-second would be thrown out just
because the number of digits shows that it cannot be an interesting date.
A milli- or micro-second can obviously be a perfectly fine number
according to the rules above, as long as it doesn't start with a '0'. So
if we have
12:34:56.123
then that '123' gets parsed as a number, and we remember it. But because
it's bigger than 31, we'll never use it as such _unless_ there is
something after it to trigger that use.
So you can say "12:34:56.123.days.ago", and because of the "days", that
123 will actually be meaninful now.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-17 06:25:40 +02:00
|
|
|
if (num >= 100000000 && nodate(tm)) {
|
2005-05-01 20:48:34 +02:00
|
|
|
time_t time = num;
|
2005-06-25 11:21:16 +02:00
|
|
|
if (gmtime_r(&time, tm)) {
|
|
|
|
*tm_gmt = 1;
|
2005-05-01 20:48:34 +02:00
|
|
|
return end - date;
|
2005-06-25 11:21:16 +02:00
|
|
|
}
|
2005-05-01 20:48:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2006-04-06 00:31:12 +02:00
|
|
|
* Check for special formats: num[-.:/]num[same]num
|
2005-05-01 20:48:34 +02:00
|
|
|
*/
|
|
|
|
switch (*end) {
|
|
|
|
case ':':
|
2006-04-06 00:31:12 +02:00
|
|
|
case '.':
|
2005-05-01 20:48:34 +02:00
|
|
|
case '/':
|
|
|
|
case '-':
|
|
|
|
if (isdigit(end[1])) {
|
2014-11-13 12:04:52 +01:00
|
|
|
int match = match_multi_number(num, *end, date, end, tm, 0);
|
2005-05-01 20:48:34 +02:00
|
|
|
if (match)
|
|
|
|
return match;
|
2005-04-30 22:19:56 +02:00
|
|
|
}
|
|
|
|
}
|
2005-05-01 20:48:34 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* None of the special formats? Try to guess what
|
|
|
|
* the number meant. We use the number of digits
|
|
|
|
* to make a more educated guess..
|
|
|
|
*/
|
|
|
|
n = 0;
|
|
|
|
do {
|
|
|
|
n++;
|
|
|
|
} while (isdigit(date[n]));
|
|
|
|
|
|
|
|
/* Four-digit year or a timezone? */
|
|
|
|
if (n == 4) {
|
2006-06-08 23:54:13 +02:00
|
|
|
if (num <= 1400 && *offset == -1) {
|
2005-05-01 20:48:34 +02:00
|
|
|
unsigned int minutes = num % 100;
|
|
|
|
unsigned int hours = num / 100;
|
|
|
|
*offset = hours*60 + minutes;
|
|
|
|
} else if (num > 1900 && num < 2100)
|
|
|
|
tm->tm_year = num - 1900;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
date/time: do not get confused by fractional seconds
The date/time parsing code was confused if the input time HH:MM:SS is
followed by fractional seconds. Since we do not record anything finer
grained than seconds, we could just drop fractional part, but there is a
twist.
We have taught people that not just spaces but dot can be used as word
separators when spelling things like:
$ git log --since 2.days
$ git show @{12:34:56.7.days.ago}
and we shouldn't mistake "7" in the latter example as a fraction and
discard it.
The rules are:
- valid days of month/mday are always single or double digits.
- valid years are either two or four digits
No, we don't support the year 600 _anyway_, since our encoding is based
on the UNIX epoch, and the day we worry about the year 10,000 is far
away and we can raise the limit to five digits when we get closer.
- Other numbers (eg "600 days ago") can have any number of digits, but
they cannot start with a zero. Again, the only exception is for
two-digit numbers, since that is fairly common for dates ("Dec 01" is
not unheard of)
So that means that any milli- or micro-second would be thrown out just
because the number of digits shows that it cannot be an interesting date.
A milli- or micro-second can obviously be a perfectly fine number
according to the rules above, as long as it doesn't start with a '0'. So
if we have
12:34:56.123
then that '123' gets parsed as a number, and we remember it. But because
it's bigger than 31, we'll never use it as such _unless_ there is
something after it to trigger that use.
So you can say "12:34:56.123.days.ago", and because of the "days", that
123 will actually be meaninful now.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-17 06:25:40 +02:00
|
|
|
/*
|
|
|
|
* Ignore lots of numerals. We took care of 4-digit years above.
|
|
|
|
* Days or months must be one or two digits.
|
|
|
|
*/
|
|
|
|
if (n > 2)
|
|
|
|
return n;
|
|
|
|
|
2005-05-01 20:48:34 +02:00
|
|
|
/*
|
|
|
|
* NOTE! We will give precedence to day-of-month over month or
|
2005-12-29 10:30:08 +01:00
|
|
|
* year numbers in the 1-12 range. So 05 is always "mday 5",
|
2005-05-01 20:48:34 +02:00
|
|
|
* unless we already have a mday..
|
|
|
|
*
|
|
|
|
* IOW, 01 Apr 05 parses as "April 1st, 2005".
|
|
|
|
*/
|
|
|
|
if (num > 0 && num < 32 && tm->tm_mday < 0) {
|
|
|
|
tm->tm_mday = num;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Two-digit year? */
|
|
|
|
if (n == 2 && tm->tm_year < 0) {
|
|
|
|
if (num < 10 && tm->tm_mday >= 0) {
|
|
|
|
tm->tm_year = num + 100;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
if (num >= 70) {
|
|
|
|
tm->tm_year = num;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-23 00:10:07 +02:00
|
|
|
if (num > 0 && num < 13 && tm->tm_mon < 0)
|
2005-05-01 20:48:34 +02:00
|
|
|
tm->tm_mon = num-1;
|
2007-06-07 09:04:01 +02:00
|
|
|
|
2005-05-01 20:48:34 +02:00
|
|
|
return n;
|
2005-04-30 22:19:56 +02:00
|
|
|
}
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2005-07-12 19:33:06 +02:00
|
|
|
static int match_tz(const char *date, int *offp)
|
2005-04-30 22:19:56 +02:00
|
|
|
{
|
|
|
|
char *end;
|
2011-09-09 12:10:33 +02:00
|
|
|
int hour = strtoul(date + 1, &end, 10);
|
|
|
|
int n = end - (date + 1);
|
|
|
|
int min = 0;
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2011-09-09 12:10:33 +02:00
|
|
|
if (n == 4) {
|
|
|
|
/* hhmm */
|
|
|
|
min = hour % 100;
|
|
|
|
hour = hour / 100;
|
|
|
|
} else if (n != 2) {
|
|
|
|
min = 99; /* random crap */
|
|
|
|
} else if (*end == ':') {
|
|
|
|
/* hh:mm? */
|
|
|
|
min = strtoul(end + 1, &end, 10);
|
|
|
|
if (end - (date + 1) != 5)
|
|
|
|
min = 99; /* random crap */
|
|
|
|
} /* otherwise we parsed "hh" */
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2005-05-01 20:48:34 +02:00
|
|
|
/*
|
2011-09-09 12:10:33 +02:00
|
|
|
* Don't accept any random crap. Even though some places have
|
|
|
|
* offset larger than 12 hours (e.g. Pacific/Kiritimati is at
|
|
|
|
* UTC+14), there is something wrong if hour part is much
|
|
|
|
* larger than that. We might also want to check that the
|
|
|
|
* minutes are divisible by 15 or something too. (Offset of
|
|
|
|
* Kathmandu, Nepal is UTC+5:45)
|
2005-05-01 20:48:34 +02:00
|
|
|
*/
|
2011-09-09 12:10:33 +02:00
|
|
|
if (min < 60 && hour < 24) {
|
|
|
|
int offset = hour * 60 + min;
|
2005-05-01 21:34:56 +02:00
|
|
|
if (*date == '-')
|
|
|
|
offset = -offset;
|
|
|
|
*offp = offset;
|
|
|
|
}
|
2005-04-30 22:19:56 +02:00
|
|
|
return end - date;
|
|
|
|
}
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2014-08-27 09:57:08 +02:00
|
|
|
static void date_string(unsigned long date, int offset, struct strbuf *buf)
|
2005-09-22 00:50:28 +02:00
|
|
|
{
|
|
|
|
int sign = '+';
|
|
|
|
|
|
|
|
if (offset < 0) {
|
|
|
|
offset = -offset;
|
|
|
|
sign = '-';
|
|
|
|
}
|
2014-08-27 09:57:08 +02:00
|
|
|
strbuf_addf(buf, "%lu %c%02d%02d", date, sign, offset / 60, offset % 60);
|
2005-09-22 00:50:28 +02:00
|
|
|
}
|
|
|
|
|
2012-02-02 22:41:42 +01:00
|
|
|
/*
|
|
|
|
* Parse a string like "0 +0000" as ancient timestamp near epoch, but
|
|
|
|
* only when it appears not as part of any other string.
|
|
|
|
*/
|
|
|
|
static int match_object_header_date(const char *date, unsigned long *timestamp, int *offset)
|
|
|
|
{
|
|
|
|
char *end;
|
|
|
|
unsigned long stamp;
|
|
|
|
int ofs;
|
|
|
|
|
2012-07-12 22:46:49 +02:00
|
|
|
if (*date < '0' || '9' < *date)
|
2012-02-02 22:41:42 +01:00
|
|
|
return -1;
|
|
|
|
stamp = strtoul(date, &end, 10);
|
|
|
|
if (*end != ' ' || stamp == ULONG_MAX || (end[1] != '+' && end[1] != '-'))
|
|
|
|
return -1;
|
|
|
|
date = end + 2;
|
|
|
|
ofs = strtol(date, &end, 10);
|
|
|
|
if ((*end != '\0' && (*end != '\n')) || end != date + 4)
|
|
|
|
return -1;
|
|
|
|
ofs = (ofs / 100) * 60 + (ofs % 100);
|
|
|
|
if (date[-1] == '-')
|
|
|
|
ofs = -ofs;
|
|
|
|
*timestamp = stamp;
|
|
|
|
*offset = ofs;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-30 22:19:56 +02:00
|
|
|
/* Gr. strptime is crap for this; it doesn't have a way to require RFC2822
|
|
|
|
(i.e. English) day/month names, and it doesn't work correctly with %z. */
|
2010-07-15 18:22:57 +02:00
|
|
|
int parse_date_basic(const char *date, unsigned long *timestamp, int *offset)
|
2005-04-30 22:19:56 +02:00
|
|
|
{
|
|
|
|
struct tm tm;
|
2010-06-03 22:28:55 +02:00
|
|
|
int tm_gmt;
|
|
|
|
unsigned long dummy_timestamp;
|
|
|
|
int dummy_offset;
|
|
|
|
|
|
|
|
if (!timestamp)
|
|
|
|
timestamp = &dummy_timestamp;
|
|
|
|
if (!offset)
|
|
|
|
offset = &dummy_offset;
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2005-04-30 22:19:56 +02:00
|
|
|
memset(&tm, 0, sizeof(tm));
|
|
|
|
tm.tm_year = -1;
|
|
|
|
tm.tm_mon = -1;
|
|
|
|
tm.tm_mday = -1;
|
2005-04-30 23:25:02 +02:00
|
|
|
tm.tm_isdst = -1;
|
Further 'approxidate' improvements
The previous patch to improve approxidate got us to the point that a lot
of the remaining annoyances were due to the 'strict' date handling running
first, and deciding that it got a good enough date that the approximate
date routines were never even invoked.
For example, using a date string like
6AM, June 7, 2009
the strict date logic would be perfectly happy with the "June 7, 2009"
part, and ignore the 6AM part that it didn't understand - resulting in the
information getting dropped on the floor:
6AM, June 7, 2009 -> Sat Jun 6 00:00:00 2009
and the date being calculated as if it was midnight, and the '6AM' having
confused the date routines into thinking about '6 June' rather than 'June
7' at 6AM (ie notice how the _day_ was wrong due to this, not just the
time).
So this makes the strict date routines a bit stricter, and requires that
not just the date, but also the time, has actually been parsed. With that
fix, and trivial extension of the approxidate routines, git now properly
parses the date as
6AM, June 7, 2009 -> Sun Jun 7 06:00:00 2009
without dropping the fuzzy time ("6AM" or "noon" or any of the other
non-strict time formats) on the floor.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-23 03:11:44 +02:00
|
|
|
tm.tm_hour = -1;
|
|
|
|
tm.tm_min = -1;
|
|
|
|
tm.tm_sec = -1;
|
2010-06-03 22:28:55 +02:00
|
|
|
*offset = -1;
|
2005-06-25 11:21:16 +02:00
|
|
|
tm_gmt = 0;
|
2005-04-30 22:19:56 +02:00
|
|
|
|
2012-02-02 22:41:43 +01:00
|
|
|
if (*date == '@' &&
|
|
|
|
!match_object_header_date(date + 1, timestamp, offset))
|
2012-02-02 22:41:42 +01:00
|
|
|
return 0; /* success */
|
2005-04-30 22:19:56 +02:00
|
|
|
for (;;) {
|
|
|
|
int match = 0;
|
|
|
|
unsigned char c = *date;
|
|
|
|
|
|
|
|
/* Stop at end of string or newline */
|
|
|
|
if (!c || c == '\n')
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (isalpha(c))
|
2010-06-03 22:28:55 +02:00
|
|
|
match = match_alpha(date, &tm, offset);
|
2005-04-30 22:19:56 +02:00
|
|
|
else if (isdigit(c))
|
2010-06-03 22:28:55 +02:00
|
|
|
match = match_digit(date, &tm, offset, &tm_gmt);
|
2005-04-30 22:19:56 +02:00
|
|
|
else if ((c == '-' || c == '+') && isdigit(date[1]))
|
2010-06-03 22:28:55 +02:00
|
|
|
match = match_tz(date, offset);
|
2005-04-30 22:19:56 +02:00
|
|
|
|
|
|
|
if (!match) {
|
|
|
|
/* BAD CRAP */
|
|
|
|
match = 1;
|
2007-06-07 09:04:01 +02:00
|
|
|
}
|
2005-04-30 22:19:56 +02:00
|
|
|
|
|
|
|
date += match;
|
|
|
|
}
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2015-04-15 17:47:48 +02:00
|
|
|
/* do not use mktime(), which uses local timezone, here */
|
2010-06-03 22:28:55 +02:00
|
|
|
*timestamp = tm_to_time_t(&tm);
|
2015-04-15 17:43:58 +02:00
|
|
|
if (*timestamp == -1)
|
|
|
|
return -1;
|
|
|
|
|
2013-02-25 22:53:40 +01:00
|
|
|
if (*offset == -1) {
|
2015-04-15 17:47:48 +02:00
|
|
|
time_t temp_time;
|
|
|
|
|
|
|
|
/* gmtime_r() in match_digit() may have clobbered it */
|
|
|
|
tm.tm_isdst = -1;
|
|
|
|
temp_time = mktime(&tm);
|
2013-02-25 22:53:40 +01:00
|
|
|
if ((time_t)*timestamp > temp_time) {
|
|
|
|
*offset = ((time_t)*timestamp - temp_time) / 60;
|
|
|
|
} else {
|
|
|
|
*offset = -(int)((temp_time - (time_t)*timestamp) / 60);
|
|
|
|
}
|
|
|
|
}
|
2005-04-30 23:25:02 +02:00
|
|
|
|
2005-06-25 11:21:16 +02:00
|
|
|
if (!tm_gmt)
|
2010-06-03 22:28:55 +02:00
|
|
|
*timestamp -= *offset * 60;
|
2010-07-15 18:22:57 +02:00
|
|
|
return 0; /* success */
|
2010-06-03 22:28:55 +02:00
|
|
|
}
|
|
|
|
|
2013-04-18 00:38:08 +02:00
|
|
|
int parse_expiry_date(const char *date, unsigned long *timestamp)
|
|
|
|
{
|
|
|
|
int errors = 0;
|
|
|
|
|
|
|
|
if (!strcmp(date, "never") || !strcmp(date, "false"))
|
|
|
|
*timestamp = 0;
|
|
|
|
else if (!strcmp(date, "all") || !strcmp(date, "now"))
|
|
|
|
/*
|
|
|
|
* We take over "now" here, which usually translates
|
|
|
|
* to the current timestamp. This is because the user
|
|
|
|
* really means to expire everything she has done in
|
|
|
|
* the past, and by definition reflogs are the record
|
|
|
|
* of the past, and there is nothing from the future
|
|
|
|
* to be kept.
|
|
|
|
*/
|
|
|
|
*timestamp = ULONG_MAX;
|
|
|
|
else
|
|
|
|
*timestamp = approxidate_careful(date, &errors);
|
|
|
|
|
|
|
|
return errors;
|
|
|
|
}
|
|
|
|
|
2014-08-27 09:57:08 +02:00
|
|
|
int parse_date(const char *date, struct strbuf *result)
|
2010-06-03 22:28:55 +02:00
|
|
|
{
|
|
|
|
unsigned long timestamp;
|
|
|
|
int offset;
|
2010-07-15 18:22:57 +02:00
|
|
|
if (parse_date_basic(date, ×tamp, &offset))
|
2010-06-03 22:28:55 +02:00
|
|
|
return -1;
|
2014-08-27 09:57:08 +02:00
|
|
|
date_string(timestamp, offset, result);
|
|
|
|
return 0;
|
2005-04-30 18:46:49 +02:00
|
|
|
}
|
|
|
|
|
2007-09-28 16:17:31 +02:00
|
|
|
enum date_mode parse_date_format(const char *format)
|
|
|
|
{
|
|
|
|
if (!strcmp(format, "relative"))
|
|
|
|
return DATE_RELATIVE;
|
|
|
|
else if (!strcmp(format, "iso8601") ||
|
|
|
|
!strcmp(format, "iso"))
|
|
|
|
return DATE_ISO8601;
|
2014-08-29 18:58:42 +02:00
|
|
|
else if (!strcmp(format, "iso8601-strict") ||
|
|
|
|
!strcmp(format, "iso-strict"))
|
|
|
|
return DATE_ISO8601_STRICT;
|
2007-09-28 16:17:31 +02:00
|
|
|
else if (!strcmp(format, "rfc2822") ||
|
|
|
|
!strcmp(format, "rfc"))
|
|
|
|
return DATE_RFC2822;
|
|
|
|
else if (!strcmp(format, "short"))
|
|
|
|
return DATE_SHORT;
|
|
|
|
else if (!strcmp(format, "local"))
|
|
|
|
return DATE_LOCAL;
|
|
|
|
else if (!strcmp(format, "default"))
|
|
|
|
return DATE_NORMAL;
|
2009-02-20 23:15:22 +01:00
|
|
|
else if (!strcmp(format, "raw"))
|
|
|
|
return DATE_RAW;
|
2007-09-28 16:17:31 +02:00
|
|
|
else
|
|
|
|
die("unknown date format %s", format);
|
|
|
|
}
|
|
|
|
|
2014-08-27 09:57:08 +02:00
|
|
|
void datestamp(struct strbuf *out)
|
2005-04-30 18:46:49 +02:00
|
|
|
{
|
|
|
|
time_t now;
|
|
|
|
int offset;
|
|
|
|
|
|
|
|
time(&now);
|
|
|
|
|
2008-06-23 08:31:41 +02:00
|
|
|
offset = tm_to_time_t(localtime(&now)) - now;
|
2005-04-30 18:46:49 +02:00
|
|
|
offset /= 60;
|
|
|
|
|
2014-08-27 09:57:08 +02:00
|
|
|
date_string(now, offset, out);
|
2005-04-30 18:46:49 +02:00
|
|
|
}
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
|
2009-08-23 00:10:07 +02:00
|
|
|
/*
|
|
|
|
* Relative time update (eg "2 days ago"). If we haven't set the time
|
|
|
|
* yet, we need to set it from current time.
|
|
|
|
*/
|
|
|
|
static unsigned long update_tm(struct tm *tm, struct tm *now, unsigned long sec)
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
{
|
2009-08-23 00:10:07 +02:00
|
|
|
time_t n;
|
|
|
|
|
|
|
|
if (tm->tm_mday < 0)
|
|
|
|
tm->tm_mday = now->tm_mday;
|
|
|
|
if (tm->tm_mon < 0)
|
|
|
|
tm->tm_mon = now->tm_mon;
|
|
|
|
if (tm->tm_year < 0) {
|
|
|
|
tm->tm_year = now->tm_year;
|
|
|
|
if (tm->tm_mon > now->tm_mon)
|
|
|
|
tm->tm_year--;
|
|
|
|
}
|
|
|
|
|
|
|
|
n = mktime(tm) - sec;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
localtime_r(&n, tm);
|
2009-08-23 00:10:07 +02:00
|
|
|
return n;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
}
|
|
|
|
|
2010-01-26 20:58:00 +01:00
|
|
|
static void date_now(struct tm *tm, struct tm *now, int *num)
|
|
|
|
{
|
|
|
|
update_tm(tm, now, 0);
|
|
|
|
}
|
|
|
|
|
2009-08-23 00:10:07 +02:00
|
|
|
static void date_yesterday(struct tm *tm, struct tm *now, int *num)
|
2005-11-18 17:56:40 +01:00
|
|
|
{
|
2009-08-23 00:10:07 +02:00
|
|
|
update_tm(tm, now, 24*60*60);
|
2005-11-18 17:56:40 +01:00
|
|
|
}
|
|
|
|
|
2009-08-23 00:10:07 +02:00
|
|
|
static void date_time(struct tm *tm, struct tm *now, int hour)
|
2005-11-18 17:56:40 +01:00
|
|
|
{
|
|
|
|
if (tm->tm_hour < hour)
|
2009-08-23 00:10:07 +02:00
|
|
|
date_yesterday(tm, now, NULL);
|
2005-11-18 17:56:40 +01:00
|
|
|
tm->tm_hour = hour;
|
|
|
|
tm->tm_min = 0;
|
|
|
|
tm->tm_sec = 0;
|
|
|
|
}
|
|
|
|
|
2009-08-23 00:10:07 +02:00
|
|
|
static void date_midnight(struct tm *tm, struct tm *now, int *num)
|
2005-11-18 17:56:40 +01:00
|
|
|
{
|
2009-08-23 00:10:07 +02:00
|
|
|
date_time(tm, now, 0);
|
2005-11-18 17:56:40 +01:00
|
|
|
}
|
|
|
|
|
2009-08-23 00:10:07 +02:00
|
|
|
static void date_noon(struct tm *tm, struct tm *now, int *num)
|
2005-11-18 17:56:40 +01:00
|
|
|
{
|
2009-08-23 00:10:07 +02:00
|
|
|
date_time(tm, now, 12);
|
2005-11-18 17:56:40 +01:00
|
|
|
}
|
|
|
|
|
2009-08-23 00:10:07 +02:00
|
|
|
static void date_tea(struct tm *tm, struct tm *now, int *num)
|
2005-11-18 17:56:40 +01:00
|
|
|
{
|
2009-08-23 00:10:07 +02:00
|
|
|
date_time(tm, now, 17);
|
2005-11-18 17:56:40 +01:00
|
|
|
}
|
|
|
|
|
2009-08-23 00:10:07 +02:00
|
|
|
static void date_pm(struct tm *tm, struct tm *now, int *num)
|
2006-09-28 21:14:27 +02:00
|
|
|
{
|
2006-09-29 21:36:13 +02:00
|
|
|
int hour, n = *num;
|
2006-09-28 21:14:27 +02:00
|
|
|
*num = 0;
|
|
|
|
|
2006-09-29 21:36:13 +02:00
|
|
|
hour = tm->tm_hour;
|
|
|
|
if (n) {
|
|
|
|
hour = n;
|
2006-09-28 21:14:27 +02:00
|
|
|
tm->tm_min = 0;
|
|
|
|
tm->tm_sec = 0;
|
|
|
|
}
|
2006-09-29 21:36:13 +02:00
|
|
|
tm->tm_hour = (hour % 12) + 12;
|
2006-09-28 21:14:27 +02:00
|
|
|
}
|
|
|
|
|
2009-08-23 00:10:07 +02:00
|
|
|
static void date_am(struct tm *tm, struct tm *now, int *num)
|
2006-09-28 21:14:27 +02:00
|
|
|
{
|
2006-09-29 21:36:13 +02:00
|
|
|
int hour, n = *num;
|
2006-09-28 21:14:27 +02:00
|
|
|
*num = 0;
|
|
|
|
|
2006-09-29 21:36:13 +02:00
|
|
|
hour = tm->tm_hour;
|
|
|
|
if (n) {
|
|
|
|
hour = n;
|
2006-09-28 21:14:27 +02:00
|
|
|
tm->tm_min = 0;
|
|
|
|
tm->tm_sec = 0;
|
|
|
|
}
|
2006-09-29 21:36:13 +02:00
|
|
|
tm->tm_hour = (hour % 12);
|
2006-09-28 21:14:27 +02:00
|
|
|
}
|
|
|
|
|
2009-08-23 00:10:07 +02:00
|
|
|
static void date_never(struct tm *tm, struct tm *now, int *num)
|
2007-07-24 20:18:34 +02:00
|
|
|
{
|
2008-06-17 18:34:57 +02:00
|
|
|
time_t n = 0;
|
|
|
|
localtime_r(&n, tm);
|
2007-07-24 20:18:34 +02:00
|
|
|
}
|
|
|
|
|
2005-11-18 17:56:40 +01:00
|
|
|
static const struct special {
|
|
|
|
const char *name;
|
2009-08-23 00:10:07 +02:00
|
|
|
void (*fn)(struct tm *, struct tm *, int *);
|
2005-11-18 17:56:40 +01:00
|
|
|
} special[] = {
|
|
|
|
{ "yesterday", date_yesterday },
|
|
|
|
{ "noon", date_noon },
|
|
|
|
{ "midnight", date_midnight },
|
|
|
|
{ "tea", date_tea },
|
2006-09-28 21:14:27 +02:00
|
|
|
{ "PM", date_pm },
|
|
|
|
{ "AM", date_am },
|
2007-07-24 20:18:34 +02:00
|
|
|
{ "never", date_never },
|
2010-01-26 20:58:00 +01:00
|
|
|
{ "now", date_now },
|
2005-11-18 17:56:40 +01:00
|
|
|
{ NULL }
|
|
|
|
};
|
|
|
|
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
static const char *number_name[] = {
|
|
|
|
"zero", "one", "two", "three", "four",
|
|
|
|
"five", "six", "seven", "eight", "nine", "ten",
|
|
|
|
};
|
|
|
|
|
2005-11-18 17:56:40 +01:00
|
|
|
static const struct typelen {
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
const char *type;
|
|
|
|
int length;
|
|
|
|
} typelen[] = {
|
|
|
|
{ "seconds", 1 },
|
|
|
|
{ "minutes", 60 },
|
|
|
|
{ "hours", 60*60 },
|
|
|
|
{ "days", 24*60*60 },
|
|
|
|
{ "weeks", 7*24*60*60 },
|
|
|
|
{ NULL }
|
2007-06-07 09:04:01 +02:00
|
|
|
};
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
|
2010-01-26 20:58:00 +01:00
|
|
|
static const char *approxidate_alpha(const char *date, struct tm *tm, struct tm *now, int *num, int *touched)
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
{
|
2005-11-18 17:56:40 +01:00
|
|
|
const struct typelen *tl;
|
|
|
|
const struct special *s;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
const char *end = date;
|
2006-08-23 12:39:16 +02:00
|
|
|
int i;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
|
2013-10-24 10:42:17 +02:00
|
|
|
while (isalpha(*++end))
|
2006-08-23 12:39:16 +02:00
|
|
|
;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
|
|
|
|
for (i = 0; i < 12; i++) {
|
|
|
|
int match = match_string(date, month_names[i]);
|
|
|
|
if (match >= 3) {
|
|
|
|
tm->tm_mon = i;
|
2010-01-26 20:58:00 +01:00
|
|
|
*touched = 1;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
return end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-11-18 17:56:40 +01:00
|
|
|
for (s = special; s->name; s++) {
|
|
|
|
int len = strlen(s->name);
|
|
|
|
if (match_string(date, s->name) == len) {
|
2009-08-23 00:10:07 +02:00
|
|
|
s->fn(tm, now, num);
|
2010-01-26 20:58:00 +01:00
|
|
|
*touched = 1;
|
2005-11-18 17:56:40 +01:00
|
|
|
return end;
|
|
|
|
}
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!*num) {
|
|
|
|
for (i = 1; i < 11; i++) {
|
|
|
|
int len = strlen(number_name[i]);
|
|
|
|
if (match_string(date, number_name[i]) == len) {
|
|
|
|
*num = i;
|
2010-01-26 20:58:00 +01:00
|
|
|
*touched = 1;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
return end;
|
|
|
|
}
|
|
|
|
}
|
2010-01-26 20:58:00 +01:00
|
|
|
if (match_string(date, "last") == 4) {
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
*num = 1;
|
2010-01-26 20:58:00 +01:00
|
|
|
*touched = 1;
|
|
|
|
}
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
return end;
|
|
|
|
}
|
|
|
|
|
|
|
|
tl = typelen;
|
|
|
|
while (tl->type) {
|
|
|
|
int len = strlen(tl->type);
|
|
|
|
if (match_string(date, tl->type) >= len-1) {
|
2009-08-23 00:10:07 +02:00
|
|
|
update_tm(tm, now, tl->length * *num);
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
*num = 0;
|
2010-01-26 20:58:00 +01:00
|
|
|
*touched = 1;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
return end;
|
|
|
|
}
|
|
|
|
tl++;
|
|
|
|
}
|
|
|
|
|
Teach "approxidate" about weekday syntax
This allows people to use syntax like "last thursday" for the approxidate.
(Or, indeed, more complex "three thursdays ago", but I suspect that would
be pretty unusual).
NOTE! The parsing is strictly sequential, so if you do
"one day before last thursday"
it will _not_ do what you think it does. It will take the current time,
subtract one day, and then go back to the thursday before that. So to get
what you want, you'd have to write it the other way around:
"last thursday and one day before"
which is insane (it's usually the same as "last wednesday" _except_ if
today is Thursday, in which case "last wednesday" is yesterday, and "last
thursday and one day before" is eight days ago).
Similarly,
"last thursday one month ago"
will first go back to last thursday, and then go back one month from
there, not the other way around.
I doubt anybody would ever use insane dates like that, but I thought I'd
point out that the approxidate parsing is not exactly "standard English".
Side note 2: if you want to avoid spaces (because of quoting issues), you
can use any non-alphanumberic character instead. So
git log --since=2.days.ago
works without any quotes.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-17 21:36:30 +01:00
|
|
|
for (i = 0; i < 7; i++) {
|
|
|
|
int match = match_string(date, weekday_names[i]);
|
|
|
|
if (match >= 3) {
|
|
|
|
int diff, n = *num -1;
|
|
|
|
*num = 0;
|
|
|
|
|
|
|
|
diff = tm->tm_wday - i;
|
|
|
|
if (diff <= 0)
|
|
|
|
n++;
|
|
|
|
diff += 7*n;
|
|
|
|
|
2009-08-23 00:10:07 +02:00
|
|
|
update_tm(tm, now, diff * 24 * 60 * 60);
|
2010-01-26 20:58:00 +01:00
|
|
|
*touched = 1;
|
Teach "approxidate" about weekday syntax
This allows people to use syntax like "last thursday" for the approxidate.
(Or, indeed, more complex "three thursdays ago", but I suspect that would
be pretty unusual).
NOTE! The parsing is strictly sequential, so if you do
"one day before last thursday"
it will _not_ do what you think it does. It will take the current time,
subtract one day, and then go back to the thursday before that. So to get
what you want, you'd have to write it the other way around:
"last thursday and one day before"
which is insane (it's usually the same as "last wednesday" _except_ if
today is Thursday, in which case "last wednesday" is yesterday, and "last
thursday and one day before" is eight days ago).
Similarly,
"last thursday one month ago"
will first go back to last thursday, and then go back one month from
there, not the other way around.
I doubt anybody would ever use insane dates like that, but I thought I'd
point out that the approxidate parsing is not exactly "standard English".
Side note 2: if you want to avoid spaces (because of quoting issues), you
can use any non-alphanumberic character instead. So
git log --since=2.days.ago
works without any quotes.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-17 21:36:30 +01:00
|
|
|
return end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
if (match_string(date, "months") >= 5) {
|
2009-08-31 04:31:42 +02:00
|
|
|
int n;
|
|
|
|
update_tm(tm, now, 0); /* fill in date fields if needed */
|
|
|
|
n = tm->tm_mon - *num;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
*num = 0;
|
|
|
|
while (n < 0) {
|
|
|
|
n += 12;
|
|
|
|
tm->tm_year--;
|
|
|
|
}
|
|
|
|
tm->tm_mon = n;
|
2010-01-26 20:58:00 +01:00
|
|
|
*touched = 1;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
return end;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (match_string(date, "years") >= 4) {
|
2009-08-31 04:31:42 +02:00
|
|
|
update_tm(tm, now, 0); /* fill in date fields if needed */
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
tm->tm_year -= *num;
|
|
|
|
*num = 0;
|
2010-01-26 20:58:00 +01:00
|
|
|
*touched = 1;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
return end;
|
|
|
|
}
|
|
|
|
|
|
|
|
return end;
|
|
|
|
}
|
|
|
|
|
2014-11-13 12:04:52 +01:00
|
|
|
static const char *approxidate_digit(const char *date, struct tm *tm, int *num,
|
|
|
|
time_t now)
|
2006-09-28 21:12:28 +02:00
|
|
|
{
|
|
|
|
char *end;
|
|
|
|
unsigned long number = strtoul(date, &end, 10);
|
|
|
|
|
2006-09-28 21:14:27 +02:00
|
|
|
switch (*end) {
|
|
|
|
case ':':
|
|
|
|
case '.':
|
|
|
|
case '/':
|
|
|
|
case '-':
|
|
|
|
if (isdigit(end[1])) {
|
2014-11-13 12:04:52 +01:00
|
|
|
int match = match_multi_number(number, *end, date, end,
|
|
|
|
tm, now);
|
2006-09-28 21:14:27 +02:00
|
|
|
if (match)
|
|
|
|
return date + match;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
date/time: do not get confused by fractional seconds
The date/time parsing code was confused if the input time HH:MM:SS is
followed by fractional seconds. Since we do not record anything finer
grained than seconds, we could just drop fractional part, but there is a
twist.
We have taught people that not just spaces but dot can be used as word
separators when spelling things like:
$ git log --since 2.days
$ git show @{12:34:56.7.days.ago}
and we shouldn't mistake "7" in the latter example as a fraction and
discard it.
The rules are:
- valid days of month/mday are always single or double digits.
- valid years are either two or four digits
No, we don't support the year 600 _anyway_, since our encoding is based
on the UNIX epoch, and the day we worry about the year 10,000 is far
away and we can raise the limit to five digits when we get closer.
- Other numbers (eg "600 days ago") can have any number of digits, but
they cannot start with a zero. Again, the only exception is for
two-digit numbers, since that is fairly common for dates ("Dec 01" is
not unheard of)
So that means that any milli- or micro-second would be thrown out just
because the number of digits shows that it cannot be an interesting date.
A milli- or micro-second can obviously be a perfectly fine number
according to the rules above, as long as it doesn't start with a '0'. So
if we have
12:34:56.123
then that '123' gets parsed as a number, and we remember it. But because
it's bigger than 31, we'll never use it as such _unless_ there is
something after it to trigger that use.
So you can say "12:34:56.123.days.ago", and because of the "days", that
123 will actually be meaninful now.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-17 06:25:40 +02:00
|
|
|
/* Accept zero-padding only for small numbers ("Dec 02", never "Dec 0002") */
|
|
|
|
if (date[0] != '0' || end - date <= 2)
|
|
|
|
*num = number;
|
2006-09-28 21:12:28 +02:00
|
|
|
return end;
|
|
|
|
}
|
|
|
|
|
2009-08-23 00:10:07 +02:00
|
|
|
/*
|
|
|
|
* Do we have a pending number at the end, or when
|
|
|
|
* we see a new one? Let's assume it's a month day,
|
|
|
|
* as in "Dec 6, 1992"
|
|
|
|
*/
|
|
|
|
static void pending_number(struct tm *tm, int *num)
|
|
|
|
{
|
|
|
|
int number = *num;
|
|
|
|
|
|
|
|
if (number) {
|
|
|
|
*num = 0;
|
|
|
|
if (tm->tm_mday < 0 && number < 32)
|
|
|
|
tm->tm_mday = number;
|
Further 'approxidate' improvements
The previous patch to improve approxidate got us to the point that a lot
of the remaining annoyances were due to the 'strict' date handling running
first, and deciding that it got a good enough date that the approximate
date routines were never even invoked.
For example, using a date string like
6AM, June 7, 2009
the strict date logic would be perfectly happy with the "June 7, 2009"
part, and ignore the 6AM part that it didn't understand - resulting in the
information getting dropped on the floor:
6AM, June 7, 2009 -> Sat Jun 6 00:00:00 2009
and the date being calculated as if it was midnight, and the '6AM' having
confused the date routines into thinking about '6 June' rather than 'June
7' at 6AM (ie notice how the _day_ was wrong due to this, not just the
time).
So this makes the strict date routines a bit stricter, and requires that
not just the date, but also the time, has actually been parsed. With that
fix, and trivial extension of the approxidate routines, git now properly
parses the date as
6AM, June 7, 2009 -> Sun Jun 7 06:00:00 2009
without dropping the fuzzy time ("6AM" or "noon" or any of the other
non-strict time formats) on the floor.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-08-23 03:11:44 +02:00
|
|
|
else if (tm->tm_mon < 0 && number < 13)
|
|
|
|
tm->tm_mon = number-1;
|
|
|
|
else if (tm->tm_year < 0) {
|
|
|
|
if (number > 1969 && number < 2100)
|
|
|
|
tm->tm_year = number - 1900;
|
|
|
|
else if (number > 69 && number < 100)
|
|
|
|
tm->tm_year = number;
|
|
|
|
else if (number < 38)
|
|
|
|
tm->tm_year = 100 + number;
|
|
|
|
/* We screw up for number = 00 ? */
|
|
|
|
}
|
2009-08-23 00:10:07 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-01-26 20:58:00 +01:00
|
|
|
static unsigned long approxidate_str(const char *date,
|
|
|
|
const struct timeval *tv,
|
|
|
|
int *error_ret)
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
{
|
|
|
|
int number = 0;
|
2010-01-26 20:58:00 +01:00
|
|
|
int touched = 0;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
struct tm tm, now;
|
2009-04-06 19:26:37 +02:00
|
|
|
time_t time_sec;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
|
2009-08-31 04:26:05 +02:00
|
|
|
time_sec = tv->tv_sec;
|
2009-04-06 19:26:37 +02:00
|
|
|
localtime_r(&time_sec, &tm);
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
now = tm;
|
2009-08-23 00:10:07 +02:00
|
|
|
|
|
|
|
tm.tm_year = -1;
|
|
|
|
tm.tm_mon = -1;
|
|
|
|
tm.tm_mday = -1;
|
|
|
|
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
for (;;) {
|
|
|
|
unsigned char c = *date;
|
|
|
|
if (!c)
|
|
|
|
break;
|
|
|
|
date++;
|
|
|
|
if (isdigit(c)) {
|
2009-08-23 00:10:07 +02:00
|
|
|
pending_number(&tm, &number);
|
2014-11-13 12:04:52 +01:00
|
|
|
date = approxidate_digit(date-1, &tm, &number, time_sec);
|
2010-01-26 20:58:00 +01:00
|
|
|
touched = 1;
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (isalpha(c))
|
2010-01-26 20:58:00 +01:00
|
|
|
date = approxidate_alpha(date-1, &tm, &now, &number, &touched);
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
}
|
2009-08-23 00:10:07 +02:00
|
|
|
pending_number(&tm, &number);
|
2010-01-26 20:58:00 +01:00
|
|
|
if (!touched)
|
|
|
|
*error_ret = 1;
|
2009-08-23 00:10:07 +02:00
|
|
|
return update_tm(&tm, &now, 0);
|
git's rev-parse.c function show_datestring presumes gnu date
Ok. This is the insane patch to do this.
It really isn't very careful, and the reason I call it "approxidate()"
will become obvious when you look at the code. It is very liberal in what
it accepts, to the point where sometimes the results may not make a whole
lot of sense.
It accepts "last week" as a date string, by virtue of "last" parsing as
the number 1, and it totally ignoring superfluous fluff like "ago", so
"last week" ends up being exactly the same thing as "1 week ago". Fine so
far.
It has strange side effects: "last december" will actually parse as "Dec
1", which actually _does_ turn out right, because it will then notice that
it's not December yet, so it will decide that you must be talking about a
date last year. So it actually gets it right, but it's kind of for the
"wrong" reasons.
It also accepts the numbers 1..10 in string format ("one" .. "ten"), so
you can do "ten weeks ago" or "ten hours ago" and it will do the right
thing.
But it will do some really strange thigns too: the string "this will last
forever", will not recognize anyting but "last", which is recognized as
"1", which since it doesn't understand anything else it will think is the
day of the month. So if you do
gitk --since="this will last forever"
the date will actually parse as the first day of the current month.
And it will parse the string "now" as "now", but only because it doesn't
understand it at all, and it makes everything relative to "now".
Similarly, it doesn't actually parse the "ago" or "from now", so "2 weeks
ago" is exactly the same as "2 weeks from now". It's the current date
minus 14 days.
But hey, it's probably better (and certainly faster) than depending on GNU
date. So now you can portably do things like
gitk --since="two weeks and three days ago"
git log --since="July 5"
git-whatchanged --since="10 hours ago"
git log --since="last october"
and it will actually do exactly what you thought it would do (I think). It
will count 17 days backwards, and it will do so even if you don't have GNU
date installed.
(I don't do "last monday" or similar yet, but I can extend it to that too
if people want).
It was kind of fun trying to write code that uses such totally relaxed
"understanding" of dates yet tries to get it right for the trivial cases.
The result should be mixed with a few strange preprocessor tricks, and be
submitted for the IOCCC ;)
Feel free to try it out, and see how many strange dates it gets right. Or
wrong.
And if you find some interesting (and valid - not "interesting" as in
"strange", but "interesting" as in "I'd be interested in actually doing
this) thing it gets wrong - usually by not understanding it and silently
just doing some strange things - please holler.
Now, as usual this certainly hasn't been getting a lot of testing. But my
code always works, no?
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-15 04:29:06 +01:00
|
|
|
}
|
2009-08-31 04:26:05 +02:00
|
|
|
|
|
|
|
unsigned long approxidate_relative(const char *date, const struct timeval *tv)
|
|
|
|
{
|
2010-06-03 22:28:55 +02:00
|
|
|
unsigned long timestamp;
|
|
|
|
int offset;
|
2010-01-26 20:58:00 +01:00
|
|
|
int errors = 0;
|
2009-08-31 04:26:05 +02:00
|
|
|
|
2010-07-15 18:22:57 +02:00
|
|
|
if (!parse_date_basic(date, ×tamp, &offset))
|
2010-06-03 22:28:55 +02:00
|
|
|
return timestamp;
|
2010-01-26 20:58:00 +01:00
|
|
|
return approxidate_str(date, tv, &errors);
|
2009-08-31 04:26:05 +02:00
|
|
|
}
|
|
|
|
|
2010-01-26 20:58:00 +01:00
|
|
|
unsigned long approxidate_careful(const char *date, int *error_ret)
|
2009-08-31 04:26:05 +02:00
|
|
|
{
|
|
|
|
struct timeval tv;
|
2010-06-03 22:28:55 +02:00
|
|
|
unsigned long timestamp;
|
|
|
|
int offset;
|
2010-01-26 20:58:00 +01:00
|
|
|
int dummy = 0;
|
|
|
|
if (!error_ret)
|
|
|
|
error_ret = &dummy;
|
2009-08-31 04:26:05 +02:00
|
|
|
|
2010-07-15 18:22:57 +02:00
|
|
|
if (!parse_date_basic(date, ×tamp, &offset)) {
|
2010-01-26 20:58:00 +01:00
|
|
|
*error_ret = 0;
|
2010-06-03 22:28:55 +02:00
|
|
|
return timestamp;
|
2010-01-26 20:58:00 +01:00
|
|
|
}
|
2009-08-31 04:26:05 +02:00
|
|
|
|
|
|
|
gettimeofday(&tv, NULL);
|
2010-01-26 20:58:00 +01:00
|
|
|
return approxidate_str(date, &tv, error_ret);
|
2009-08-31 04:26:05 +02:00
|
|
|
}
|
2014-02-24 08:39:45 +01:00
|
|
|
|
|
|
|
int date_overflows(unsigned long t)
|
|
|
|
{
|
|
|
|
time_t sys;
|
|
|
|
|
|
|
|
/* If we overflowed our unsigned long, that's bad... */
|
|
|
|
if (t == ULONG_MAX)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ...but we also are going to feed the result to system
|
|
|
|
* functions that expect time_t, which is often "signed long".
|
|
|
|
* Make sure that we fit into time_t, as well.
|
|
|
|
*/
|
|
|
|
sys = t;
|
|
|
|
return t != sys || (t < 1) != (sys < 1);
|
|
|
|
}
|