From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Jan 2015 22:01:18 +0000 (-0800)
Subject: Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint
X-Git-Tag: v2.2.2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9ea21fa89c3b0762189d2d6e4689b8e09940aad4?ds=inline;hp=-c

Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint

* jk/approxidate-avoid-y-d-m-over-future-dates:
approxidate: allow ISO-like dates far in the future
pass TIME_DATE_NOW to approxidate future-check
---

9ea21fa89c3b0762189d2d6e4689b8e09940aad4
diff --combined date.c
index 59dfe579c6,f82a86506d..3eba2dfe88
--- a/date.c
+++ b/date.c
@@@ -200,16 -200,7 +200,16 @@@ const char *show_date(unsigned long tim
  				tm->tm_mday,
  				tm->tm_hour, tm->tm_min, tm->tm_sec,
  				tz);
 -	else if (mode == DATE_RFC2822)
 +	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)
  		strbuf_addf(&timebuf, "%.3s, %d %.3s %d %02d:%02d:%02d %+05d",
  			weekday_names[tm->tm_wday], tm->tm_mday,
  			month_names[tm->tm_mon], tm->tm_year + 1900,
@@@ -405,9 -396,9 +405,9 @@@ static int is_date(int year, int month
  	return 0;
  }
  
- static int match_multi_number(unsigned long num, char c, const char *date, char *end, struct tm *tm)
+ static int match_multi_number(unsigned long num, char c, const char *date,
+ 			      char *end, struct tm *tm, time_t now)
  {
- 	time_t now;
  	struct tm now_tm;
  	struct tm *refuse_future;
  	long num2, num3;
@@@ -433,17 -424,18 +433,18 @@@
  	case '-':
  	case '/':
  	case '.':
- 		now = time(NULL);
+ 		if (!now)
+ 			now = time(NULL);
  		refuse_future = NULL;
  		if (gmtime_r(&now, &now_tm))
  			refuse_future = &now_tm;
  
  		if (num > 70) {
  			/* yyyy-mm-dd? */
- 			if (is_date(num, num2, num3, refuse_future, now, tm))
+ 			if (is_date(num, num2, num3, NULL, now, tm))
  				break;
  			/* yyyy-dd-mm? */
- 			if (is_date(num, num3, num2, refuse_future, now, tm))
+ 			if (is_date(num, num3, num2, NULL, now, tm))
  				break;
  		}
  		/* Our eastern European friends say dd.mm.yy[yy]
@@@ -513,7 -505,7 +514,7 @@@ static int match_digit(const char *date
  	case '/':
  	case '-':
  		if (isdigit(end[1])) {
- 			int match = match_multi_number(num, *end, date, end, tm);
+ 			int match = match_multi_number(num, *end, date, end, tm, 0);
  			if (match)
  				return match;
  		}
@@@ -614,7 -606,7 +615,7 @@@ static int match_tz(const char *date, i
  	return end - date;
  }
  
 -static int date_string(unsigned long date, int offset, char *buf, int len)
 +static void date_string(unsigned long date, int offset, struct strbuf *buf)
  {
  	int sign = '+';
  
@@@ -622,7 -614,7 +623,7 @@@
  		offset = -offset;
  		sign = '-';
  	}
 -	return snprintf(buf, len, "%lu %c%02d%02d", date, sign, offset / 60, offset % 60);
 +	strbuf_addf(buf, "%lu %c%02d%02d", date, sign, offset / 60, offset % 60);
  }
  
  /*
@@@ -744,14 -736,13 +745,14 @@@ int parse_expiry_date(const char *date
  	return errors;
  }
  
 -int parse_date(const char *date, char *result, int maxlen)
 +int parse_date(const char *date, struct strbuf *result)
  {
  	unsigned long timestamp;
  	int offset;
  	if (parse_date_basic(date, &timestamp, &offset))
  		return -1;
 -	return date_string(timestamp, offset, result, maxlen);
 +	date_string(timestamp, offset, result);
 +	return 0;
  }
  
  enum date_mode parse_date_format(const char *format)
@@@ -761,9 -752,6 +762,9 @@@
  	else if (!strcmp(format, "iso8601") ||
  		 !strcmp(format, "iso"))
  		return DATE_ISO8601;
 +	else if (!strcmp(format, "iso8601-strict") ||
 +		 !strcmp(format, "iso-strict"))
 +		return DATE_ISO8601_STRICT;
  	else if (!strcmp(format, "rfc2822") ||
  		 !strcmp(format, "rfc"))
  		return DATE_RFC2822;
@@@ -779,7 -767,7 +780,7 @@@
  		die("unknown date format %s", format);
  }
  
 -void datestamp(char *buf, int bufsize)
 +void datestamp(struct strbuf *out)
  {
  	time_t now;
  	int offset;
@@@ -789,7 -777,7 +790,7 @@@
  	offset = tm_to_time_t(localtime(&now)) - now;
  	offset /= 60;
  
 -	date_string(now, offset, buf, bufsize);
 +	date_string(now, offset, out);
  }
  
  /*
@@@ -1013,7 -1001,8 +1014,8 @@@ static const char *approxidate_alpha(co
  	return end;
  }
  
- static const char *approxidate_digit(const char *date, struct tm *tm, int *num)
+ static const char *approxidate_digit(const char *date, struct tm *tm, int *num,
+ 				     time_t now)
  {
  	char *end;
  	unsigned long number = strtoul(date, &end, 10);
@@@ -1024,7 -1013,8 +1026,8 @@@
  	case '/':
  	case '-':
  		if (isdigit(end[1])) {
- 			int match = match_multi_number(number, *end, date, end, tm);
+ 			int match = match_multi_number(number, *end, date, end,
+ 						       tm, now);
  			if (match)
  				return date + match;
  		}
@@@ -1087,7 -1077,7 +1090,7 @@@ static unsigned long approxidate_str(co
  		date++;
  		if (isdigit(c)) {
  			pending_number(&tm, &number);
- 			date = approxidate_digit(date-1, &tm, &number);
+ 			date = approxidate_digit(date-1, &tm, &number, time_sec);
  			touched = 1;
  			continue;
  		}