commit 6db9f7f6b17d77932489a53452856224c8ca1645 from: Stefan Sperling date: Tue Dec 10 10:42:22 2019 UTC always show numeric dates in ISO-8601/xkcd-1179 format ok millert tracey sthen commit - 8b3ec12fa0312f7a9ea2f0c4be0e68d0b0e8aabe commit + 6db9f7f6b17d77932489a53452856224c8ca1645 blob - 7d9545d6203fb071fb75093f09629e812f99a53b blob + 67836e9dac99a1e361945334537edee3a628ccf6 --- got/got.c +++ got/got.c @@ -2519,7 +2519,7 @@ blame_cb(void *arg, int nlines, int lineno, struct got committer_time = got_object_commit_get_committer_time(commit); if (localtime_r(&committer_time, &tm) == NULL) return got_error_from_errno("localtime_r"); - if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G/%m/%d", + if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d", &tm) >= sizeof(bline->datebuf)) { err = got_error(GOT_ERR_NO_SPACE); goto done; blob - 8f4e9a17dc61b16779b081d5713cbb26d0e6bcd9 blob + 1b9e7ee2ea383a4eeb2c6525c1219bde54812db7 --- regress/cmdline/blame.sh +++ regress/cmdline/blame.sh @@ -65,7 +65,7 @@ function test_blame_basic { local short_commit2=`trim_obj_id 32 $commit2` local short_commit3=`trim_obj_id 32 $commit3` - d=`date -r $author_time +"%G/%m/%d"` + d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit2 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected echo "3) $short_commit3 $d $GOT_AUTHOR_8 3" >> $testroot/stdout.expected @@ -113,7 +113,7 @@ function test_blame_tag { local short_commit1=`trim_obj_id 32 $commit1` local short_commit2=`trim_obj_id 32 $commit2` - d=`date -r $author_time +"%G/%m/%d"` + d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit2 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected @@ -149,7 +149,7 @@ function test_blame_file_single_line { local short_commit1=`trim_obj_id 32 $commit1` - d=`date -r $author_time +"%G/%m/%d"` + d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout @@ -184,7 +184,7 @@ function test_blame_file_single_line_no_newline { local short_commit1=`trim_obj_id 32 $commit1` - d=`date -r $author_time +"%G/%m/%d"` + d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout @@ -213,7 +213,7 @@ function test_blame_all_lines_replaced { (cd $testroot/wt && got blame alpha > $testroot/stdout) - d=`date -r $author_time +"%G/%m/%d"` + d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit1 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected echo "3) $short_commit1 $d $GOT_AUTHOR_8 3" >> $testroot/stdout.expected @@ -265,7 +265,7 @@ function test_blame_lines_shifted_up { (cd $testroot/wt && got blame alpha > $testroot/stdout) - d=`date -r $author_time +"%G/%m/%d"` + d=`date -r $author_time +"%G-%m-%d"` echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected echo "2) $short_commit1 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected echo "3) $short_commit3 $d $GOT_AUTHOR_8 foo" >> $testroot/stdout.expected @@ -321,7 +321,7 @@ function test_blame_lines_shifted_down { (cd $testroot/wt && got blame alpha > $testroot/stdout) - d=`date -r $author_time +"%G/%m/%d"` + d=`date -r $author_time +"%G-%m-%d"` echo "01) $short_commit1 $d $GOT_AUTHOR_8 1" \ > $testroot/stdout.expected echo "02) $short_commit1 $d $GOT_AUTHOR_8 2" \ @@ -394,7 +394,7 @@ EOF local commit1=`git_show_head $testroot/repo` local short_commit1=`trim_obj_id 32 $commit1` local author_time1=`git_show_author_time $testroot/repo` - local d1=`date -r $author_time1 +"%G/%m/%d"` + local d1=`date -r $author_time1 +"%G-%m-%d"` cat > $testroot/wt/alpha < $testroot/wt/alpha < $testroot/wt/alpha < $testroot/stdout) blob - 06adcabb2455e258935a7f64228a26b3d4073478 blob + db28ea842a1df6aae9cb7bf3074ee8528ff61878 --- tog/tog.c +++ tog/tog.c @@ -1204,7 +1204,7 @@ draw_commit(struct tog_view *view, struct got_commit_o struct tog_colors *colors) { const struct got_error *err = NULL; - char datebuf[10]; /* YY-MM-DD + SPACE + NUL */ + char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */ char *logmsg0 = NULL, *logmsg = NULL; char *author = NULL; wchar_t *wlogmsg = NULL, *wauthor = NULL; @@ -1219,7 +1219,7 @@ draw_commit(struct tog_view *view, struct got_commit_o committer_time = got_object_commit_get_committer_time(commit); if (localtime_r(&committer_time, &tm) == NULL) return got_error_from_errno("localtime_r"); - if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm) + if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) >= sizeof(datebuf)) return got_error(GOT_ERR_NO_SPACE); @@ -1491,7 +1491,7 @@ draw_commits(struct tog_view *view, struct commit_queu char *refs_str = NULL; wchar_t *wline; struct tog_color *tc; - static const size_t date_display_cols = 9; + static const size_t date_display_cols = 12; entry = first; ncommits = 0;