Use cgit_print_age() on summary and log pages

Update the pages to show relative dates instead of yyyy-mm-dd hh:mm:ss

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

2 files changed, 6 insertions, 10 deletions

diff --git a/ui-log.c b/ui-log.c
index 4237921..c80fd73 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,132 +1,128 @@
 /* ui-log.c: functions for log output
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 int files, lines;
 
 void count_lines(char *line, int size)
 {
         if (size>0 && (line[0] == '+' || line[0] == '-'))
                 lines++;
 }
 
 void inspect_files(struct diff_filepair *pair)
 {
         files++;
         if (cgit_repo->enable_log_linecount)
                 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
 void print_commit(struct commit *commit)
 {
-        char buf[32];
         struct commitinfo *info;
-        struct tm *time;
 
         info = cgit_parse_commit(commit);
-        time = gmtime(&commit->date);
         html("<tr><td>");
-        strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", time);
-        html_txt(buf);
+        cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
         html("</td><td>");
         char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1));
         char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
         html_link_open(url, NULL, NULL);
         html_ntxt(cgit_max_msg_len, info->subject);
         html_link_close();
         if (cgit_repo->enable_log_filecount) {
                 files = 0;
                 lines = 0;
                 cgit_diff_commit(commit, inspect_files);
                 html("</td><td class='right'>");
                 htmlf("%d", files);
                 if (cgit_repo->enable_log_linecount) {
                         html("</td><td class='right'>");
                         htmlf("%d", lines);
                 }
         }
         html("</td><td>");
         html_txt(info->author);
         html("</td></tr>\n");
         cgit_free_commitinfo(info);
 }
 
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
 {
         struct rev_info rev;
         struct commit *commit;
         const char *argv[] = {NULL, tip, NULL, NULL, NULL};
         int argc = 2;
         int i;
 
         if (grep)
                 argv[argc++] = fmt("--grep=%s", grep);
         if (path) {
                 argv[argc++] = "--";
                 argv[argc++] = path;
         }
         init_revisions(&rev, NULL);
         rev.abbrev = DEFAULT_ABBREV;
         rev.commit_format = CMIT_FMT_DEFAULT;
         rev.verbose_header = 1;
         rev.show_root_diff = 0;
         setup_revisions(argc, argv, &rev, NULL);
         if (rev.grep_filter) {
                 rev.grep_filter->regflags |= REG_ICASE;
                 compile_grep_patterns(rev.grep_filter);
         }
         prepare_revision_walk(&rev);
 
         html("<table class='list nowrap'>");
-        html("<tr class='nohover'><th class='left'>Date</th>"
+        html("<tr class='nohover'><th class='left'>Age</th>"
              "<th class='left'>Message</th>");
 
         if (cgit_repo->enable_log_filecount) {
                 html("<th class='left'>Files</th>");
                 if (cgit_repo->enable_log_linecount)
                         html("<th class='left'>Lines</th>");
         }
         html("<th class='left'>Author</th></tr>\n");
 
         if (ofs<0)
                 ofs = 0;
 
         for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
                 free(commit->buffer);
                 commit->buffer = NULL;
                 free_commit_list(commit->parents);
                 commit->parents = NULL;
         }
 
         for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
                 print_commit(commit);
                 free(commit->buffer);
                 commit->buffer = NULL;
                 free_commit_list(commit->parents);
                 commit->parents = NULL;
         }
         html("</table>\n");
 
         html("<div class='pager'>");
         if (ofs > 0) {
                 html("&nbsp;<a href='");
                 html(cgit_pageurl(cgit_query_repo, cgit_query_page,
                                   fmt("h=%s&ofs=%d", tip, ofs-cnt)));
                 html("'>[prev]</a>&nbsp;");
                }
 
         if ((commit = get_revision(&rev)) != NULL) {
                 html("&nbsp;<a href='");
                 html(cgit_pageurl(cgit_query_repo, "log",
                                   fmt("h=%s&ofs=%d", tip, ofs+cnt)));
                 html("'>[next]</a>&nbsp;");
         }
         html("</div>");
 }
diff --git a/ui-summary.c b/ui-summary.c
index 20394de..5799773 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,210 +1,210 @@
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 static int header;
 
 static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                                 int flags, void *cb_data)
 {
         struct commit *commit;
         struct commitinfo *info;
         char buf[256], *url;
 
         strncpy(buf, refname, sizeof(buf));
         commit = lookup_commit(sha1);
         if (commit && !parse_commit(commit)){
                 info = cgit_parse_commit(commit);
                 html("<tr><td>");
                 url = cgit_pageurl(cgit_query_repo, "log",
                                    fmt("h=%s", refname));
                 html_link_open(url, NULL, NULL);
                 html_txt(buf);
                 html_link_close();
                 html("</td><td>");
-                cgit_print_date(commit->date, FMT_LONGDATE);
+                cgit_print_age(commit->date, -1, NULL);
                 html("</td><td>");
                 html_txt(info->author);
                 html("</td><td>");
                 url = cgit_pageurl(cgit_query_repo, "commit",
                                    fmt("h=%s", sha1_to_hex(sha1)));
                 html_link_open(url, NULL, NULL);
                 html_ntxt(cgit_max_msg_len, info->subject);
                 html_link_close();
                 html("</td></tr>\n");
                 cgit_free_commitinfo(info);
         } else {
                 html("<tr><td>");
                 html_txt(buf);
                 html("</td><td colspan='3'>");
                 htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
                 html("</td></tr>\n");
         }
         return 0;
 }
 
 
 static void cgit_print_object_ref(struct object *obj)
 {
         char *page, *arg, *url;
 
         if (obj->type == OBJ_COMMIT) {
                 page = "commit";
                 arg = "h";
         } else if (obj->type == OBJ_TREE) {
                 page = "tree";
                 arg = "id";
         } else {
                 page = "view";
                 arg = "id";
         }
 
         url = cgit_pageurl(cgit_query_repo, page,
                            fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
         html_link_open(url, NULL, NULL);
         htmlf("%s %s", typename(obj->type),
               sha1_to_hex(obj->sha1));
         html_link_close();
 }
 
 static void print_tag_header()
 {
         html("<tr class='nohover'><th class='left'>Tag</th>"
-             "<th class='left'>Created</th>"
+             "<th class='left'>Age</th>"
              "<th class='left'>Author</th>"
              "<th class='left'>Reference</th></tr>\n");
         header = 1;
 }
 
 static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
                                 int flags, void *cb_data)
 {
         struct tag *tag;
         struct taginfo *info;
         struct object *obj;
         char buf[256], *url;
 
         strncpy(buf, refname, sizeof(buf));
         obj = parse_object(sha1);
         if (!obj)
                 return 1;
         if (obj->type == OBJ_TAG) {
                 tag = lookup_tag(sha1);
                 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                         return 2;
                 if (!header)
                         print_tag_header();
                 html("<tr><td>");
                 url = cgit_pageurl(cgit_query_repo, "view",
                                    fmt("id=%s", sha1_to_hex(sha1)));
                 html_link_open(url, NULL, NULL);
                 html_txt(buf);
                 html_link_close();
                 html("</td><td>");
                 if (info->tagger_date > 0)
-                        cgit_print_date(info->tagger_date, FMT_LONGDATE);
+                        cgit_print_age(info->tagger_date, -1, NULL);
                 html("</td><td>");
                 if (info->tagger)
                         html(info->tagger);
                 html("</td><td>");
                 cgit_print_object_ref(tag->tagged);
                 html("</td></tr>\n");
         } else {
                 if (!header)
                         print_tag_header();
                 html("<tr><td>");
                 html_txt(buf);
                 html("</td><td colspan='2'/><td>");
                 cgit_print_object_ref(obj);
                 html("</td></tr>\n");
         }
         return 0;
 }
 
 static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
                                  int flags, void *cb_data)
 {
         struct tag *tag;
         struct taginfo *info;
         struct object *obj;
         char buf[256], *url;
         unsigned char fileid[20];
 
         if (prefixcmp(refname, "refs/archives"))
                 return 0;
         strncpy(buf, refname+14, sizeof(buf));
         obj = parse_object(sha1);
         if (!obj)
                 return 1;
         if (obj->type == OBJ_TAG) {
                 tag = lookup_tag(sha1);
                 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                         return 0;
                 hashcpy(fileid, tag->tagged->sha1);
         } else if (obj->type != OBJ_BLOB) {
                 return 0;
         } else {
                 hashcpy(fileid, sha1);
         }
         if (!header) {
                 html("<table>");
                 html("<tr><th>Downloads</th></tr>");
                 header = 1;
         }
         html("<tr><td>");
         url = cgit_pageurl(cgit_query_repo, "blob",
                            fmt("id=%s&path=%s", sha1_to_hex(fileid),
                                buf));
         html_link_open(url, NULL, NULL);
         html_txt(buf);
         html_link_close();
         html("</td><tr>");
         return 0;
 }
 
 static void cgit_print_branches()
 {
         html("<tr class='nohover'><th class='left'>Branch</th>"
-             "<th class='left'>Updated</th>"
+             "<th class='left'>Idle</th>"
              "<th class='left'>Author</th>"
              "<th class='left'>Head commit</th></tr>\n");
         for_each_branch_ref(cgit_print_branch_cb, NULL);
 }
 
 static void cgit_print_tags()
 {
         header = 0;
         for_each_tag_ref(cgit_print_tag_cb, NULL);
 }
 
 static void cgit_print_archives()
 {
         header = 0;
         for_each_ref(cgit_print_archive_cb, NULL);
         if (header)
                 html("</table>");
 }
 
 void cgit_print_summary()
 {
         html("<table class='list nowrap'>");
         html("<tr class='nohover'><td id='summary' colspan='3'>");
         html("<h2>");
         html_txt(cgit_repo->name);
         html(" - ");
         html_txt(cgit_repo->desc);
         html("</h2>");
         html("</td><td id='archivelist'>");
         cgit_print_archives();
         html("</td></tr>");
         cgit_print_branches();
         html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
         cgit_print_tags();
         html("</table>");
 }