Show time since last change on index page

When creating the index page, an optional file can be scanned per repository
to obtain a timestamp for last modification within the repo. If such a file
cannot be found, st_mtime for repo.defbranch is used instead.

This information is then printed in a new column, "Idle", using the new
function cgit_print_age().

The new parameter "repo.agefile" can be used to specify (globally) a relative
path to scan (default value is "info/web/last-modified").

The content of the "last-modified" file can be generated by the post-receive
hook with a command like this:

	git-for-each-ref --format="%(committerdate)" --sort=-committerdate \
	--count=1 > $GIT_DIR/info/web/last-modified

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

diff --git a/cgit.h b/cgit.h
index 4da2d3d0d5fd3db235c7064be89e58c48e1ba866..39386332dfdf711ba1a75af789b3a98b07ca8470 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -110,6 +110,7 @@ extern char *cgit_logo;
 extern char *cgit_index_header;
 extern char *cgit_logo_link;
 extern char *cgit_module_link;
+extern char *cgit_agefile;
 extern char *cgit_virtual_root;
 extern char *cgit_script_name;
 extern char *cgit_cache_root;

diff --git a/shared.c b/shared.c
index 65af11a05ac6433189f1da6f40a4bbf6fa96cfda..ce3ca4fae835115544f348f9a9dbd4e3e162cf07 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -18,6 +18,7 @@ char *cgit_logo         = "/git-logo.png";
 char *cgit_index_header = NULL;
 char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
 char *cgit_module_link  = "./?repo=%s&page=commit&id=%s";
+char *cgit_agefile      = "info/web/last-modified";
 char *cgit_virtual_root = NULL;
 char *cgit_script_name  = CGIT_SCRIPT_NAME;
 char *cgit_cache_root   = "/var/cache/cgit";
@@ -162,6 +163,8 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_max_repodesc_len = atoi(value);
        else if (!strcmp(name, "max-commit-count"))
                cgit_max_commit_count = atoi(value);
+       else if (!strcmp(name, "agefile"))
+               cgit_agefile = xstrdup(value);
        else if (!strcmp(name, "repo.group"))
                cgit_repo_group = xstrdup(value);
        else if (!strcmp(name, "repo.url"))

diff --git a/ui-repolist.c b/ui-repolist.c
index f5e087f36564d68dbd78587137d0ace5e33c4902..573c730510cf3f7240aa5e84c82e29a685d47912 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -7,6 +7,41 @@
  */
 
 #include "cgit.h"
+#include <time.h>
+
+
+time_t read_agefile(char *path)
+{
+       FILE *f;
+       static char buf[64], buf2[64];
+       struct tm tm;
+
+       if (!(f = fopen(path, "r")))
+               return -1;
+       fgets(buf, sizeof(buf), f);
+       fclose(f);
+       if (parse_date(buf, buf2, sizeof(buf2)))
+               return strtoul(buf2, NULL, 10);
+       else
+               return 0;
+}
+
+static void print_modtime(struct repoinfo *repo)
+{
+       char *path;
+       struct stat s;
+
+       path = fmt("%s/%s", repo->path, cgit_agefile);
+       if (stat(path, &s) == 0) {
+               cgit_print_age(read_agefile(path), -1, NULL);
+               return;
+       }
+
+       path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
+       if (stat(path, &s) != 0)
+               return;
+       cgit_print_age(s.st_mtime, -1, NULL);
+}
 
 void cgit_print_repolist(struct cacheitem *item)
 {
@@ -19,7 +54,7 @@ void cgit_print_repolist(struct cacheitem *item)
 
        html("<table class='list nowrap'>");
        if (cgit_index_header) {
-               html("<tr class='nohover'><td colspan='4' class='include-block'>");
+               html("<tr class='nohover'><td colspan='5' class='include-block'>");
                html_include(cgit_index_header);
                html("</td></tr>");
        }
@@ -27,6 +62,7 @@ void cgit_print_repolist(struct cacheitem *item)
             "<th class='left'>Name</th>"
             "<th class='left'>Description</th>"
             "<th class='left'>Owner</th>"
+            "<th class='left'>Idle</th>"
             "<th>Links</th></tr>\n");
 
        for (i=0; i<cgit_repolist.count; i++) {
@@ -50,6 +86,8 @@ void cgit_print_repolist(struct cacheitem *item)
                html("</td><td>");
                html_txt(repo->owner);
                html("</td><td>");
+               print_modtime(repo);
+               html("</td><td>");
                html_link_open(cgit_repourl(repo->url),
                               "Summary", "button");
                html("S</a>");