Inspired by an earlier patch on the list by Tom Xue, but I think
this is done in a much more maintainable way.
It still remains to be seen if this feature makes sense, though.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
date.c | 27 ++++++++++++++++++++++-----
t/t0006-date.sh | 2 ++
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/date.c b/date.c
index b6ff04e..f897955 100644
--- a/date.c
+++ b/date.c
@@ -166,7 +166,7 @@ void show_date_relative(unsigned long time, int tz,
struct { const char *s, *p; } msg_years_only;
struct { const char *s, *p; } msg_years_months;
struct { const char *s, *p; } msg_years;
- } msg[1] = {
+ } msg[2] = {
{
{ "%lu second ago", "%lu seconds ago" },
{ "%lu minute ago", "%lu minutes ago" },
@@ -182,14 +182,31 @@ void show_date_relative(unsigned long time, int tz,
"%s, %lu months ago"
},
{ "%lu year ago", "%lu years ago" },
- }
+ },
+ {
+ { "%lu second in the future", "%lu seconds in the future" },
+ { "%lu minute in the future", "%lu minutes in the future" },
+ { "%lu hour in the future", "%lu hours in the future" },
+ { "%lu day in the future", "%lu days in the future" },
+ { "%lu week in the future", "%lu weeks in the future" },
+ { "%lu month in the future", "%lu months in the future" },
+ { "%lu year", "%lu years" },
+ {
+ /* TRANSLATORS: "%s" is "<n> years" */
+ "%s, %lu month in the future",
+ /* TRANSLATORS: "%s" is "<n> years" */
+ "%s, %lu months in the future"
+ },
+ { "%lu year in the future", "%lu years in the future" },
+ },
};
if (now->tv_sec < time) {
- strbuf_addstr(timebuf, _("in the future"));
- return;
+ diff = time - now->tv_sec;
+ pf = 1; /* in the future */
+ } else {
+ diff = now->tv_sec - time;
}
- diff = now->tv_sec - time;
switch (format_relative_date(diff, &rd)) {
case rd_seconds:
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 1d29810..eef932c 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -26,6 +26,8 @@ check_show 55188000 '1 year, 9 months ago'
check_show 630000000 '20 years ago'
check_show 31449600 '12 months ago'
check_show 62985600 '2 years ago'
+check_show -5 '5 seconds in the future'
+check_show -55188000 '1 year, 9 months in the future'
check_parse() {
echo "$1 -> $2" >expect
--
1.7.12.rc3.69.gaf0166d
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html