author | Lars Hjemli <hjemli@gmail.com> | 2007-05-22 21:25:25 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-22 21:25:25 (UTC) |
commit | 57f6a8bf0de6c112cabc1d8e20ade2698bd886b7 (patch) (side-by-side diff) | |
tree | 281f1b4c6716b7632efe46607fc951d888e2fb5f | |
parent | 237ef7b06d461ddf27b21cd13bfcb50befa4a916 (diff) | |
download | cgit-57f6a8bf0de6c112cabc1d8e20ade2698bd886b7.zip cgit-57f6a8bf0de6c112cabc1d8e20ade2698bd886b7.tar.gz cgit-57f6a8bf0de6c112cabc1d8e20ade2698bd886b7.tar.bz2 |
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>
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | shared.c | 3 | ||||
-rw-r--r-- | ui-repolist.c | 40 |
3 files changed, 43 insertions, 1 deletions
@@ -105,16 +105,17 @@ extern struct repoinfo *cgit_repo; extern int cgit_cmd; extern char *cgit_root_title; extern char *cgit_css; 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; extern char *cgit_repo_group; extern int cgit_nocache; extern int cgit_snapshots; extern int cgit_enable_log_filecount; @@ -13,16 +13,17 @@ struct repoinfo *cgit_repo; int cgit_cmd; char *cgit_root_title = "Git repository browser"; char *cgit_css = "/cgit.css"; 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"; char *cgit_repo_group = NULL; int cgit_nocache = 0; int cgit_snapshots = 0; int cgit_enable_log_filecount = 0; @@ -157,16 +158,18 @@ void cgit_global_config_cb(const char *name, const char *value) else if (!strcmp(name, "cache-dynamic-ttl")) cgit_cache_dynamic_ttl = atoi(value); else if (!strcmp(name, "max-message-length")) cgit_max_msg_len = atoi(value); else if (!strcmp(name, "max-repodesc-length")) 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")) cgit_repo = add_repo(value); else if (!strcmp(name, "repo.name")) cgit_repo->name = xstrdup(value); else if (cgit_repo && !strcmp(name, "repo.path")) cgit_repo->path = xstrdup(value); diff --git a/ui-repolist.c b/ui-repolist.c index f5e087f..573c730 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -2,36 +2,72 @@ * * Copyright (C) 2006 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #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) { struct repoinfo *repo; int i; char *last_group = NULL; cgit_print_docstart(cgit_root_title, item); cgit_print_pageheader(cgit_root_title, 0); 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>"); } html("<tr class='nohover'>" "<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++) { repo = &cgit_repolist.repos[i]; if ((last_group == NULL && repo->group != NULL) || (last_group != NULL && repo->group == NULL) || (last_group != NULL && repo->group!= NULL && strcmp(repo->group, last_group))) { @@ -45,16 +81,18 @@ void cgit_print_repolist(struct cacheitem *item) html_link_open(cgit_repourl(repo->url), repo->desc, NULL); html_txt(repo->name); html_link_close(); html("</td><td>"); html_ntxt(cgit_max_repodesc_len, repo->desc); 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>"); html_link_open(cgit_pageurl(repo->name, "log", NULL), "Log", "button"); html("L</a>"); html_link_open(cgit_pageurl(repo->name, "tree", NULL), "Files", "button"); |