aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2007-05-23 06:25:25 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2007-05-23 06:25:25 (JST)
commit57f6a8bf0de6c112cabc1d8e20ade2698bd886b7 (patch)
tree281f1b4c6716b7632efe46607fc951d888e2fb5f
parent237ef7b06d461ddf27b21cd13bfcb50befa4a916 (diff)
downloadcgit-57f6a8bf0de6c112cabc1d8e20ade2698bd886b7.zip
cgit-57f6a8bf0de6c112cabc1d8e20ade2698bd886b7.tar.gz
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.h1
-rw-r--r--shared.c3
-rw-r--r--ui-repolist.c40
3 files changed, 43 insertions, 1 deletions
diff --git a/cgit.h b/cgit.h
index 4da2d3d..3938633 100644
--- a/cgit.h
+++ b/cgit.h
@@ -110,6 +110,7 @@ extern char *cgit_logo;
110extern char *cgit_index_header; 110extern char *cgit_index_header;
111extern char *cgit_logo_link; 111extern char *cgit_logo_link;
112extern char *cgit_module_link; 112extern char *cgit_module_link;
113extern char *cgit_agefile;
113extern char *cgit_virtual_root; 114extern char *cgit_virtual_root;
114extern char *cgit_script_name; 115extern char *cgit_script_name;
115extern char *cgit_cache_root; 116extern char *cgit_cache_root;
diff --git a/shared.c b/shared.c
index 65af11a..ce3ca4f 100644
--- a/shared.c
+++ b/shared.c
@@ -18,6 +18,7 @@ char *cgit_logo = "/git-logo.png";
18char *cgit_index_header = NULL; 18char *cgit_index_header = NULL;
19char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 19char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
20char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; 20char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
21char *cgit_agefile = "info/web/last-modified";
21char *cgit_virtual_root = NULL; 22char *cgit_virtual_root = NULL;
22char *cgit_script_name = CGIT_SCRIPT_NAME; 23char *cgit_script_name = CGIT_SCRIPT_NAME;
23char *cgit_cache_root = "/var/cache/cgit"; 24char *cgit_cache_root = "/var/cache/cgit";
@@ -162,6 +163,8 @@ void cgit_global_config_cb(const char *name, const char *value)
162 cgit_max_repodesc_len = atoi(value); 163 cgit_max_repodesc_len = atoi(value);
163 else if (!strcmp(name, "max-commit-count")) 164 else if (!strcmp(name, "max-commit-count"))
164 cgit_max_commit_count = atoi(value); 165 cgit_max_commit_count = atoi(value);
166 else if (!strcmp(name, "agefile"))
167 cgit_agefile = xstrdup(value);
165 else if (!strcmp(name, "repo.group")) 168 else if (!strcmp(name, "repo.group"))
166 cgit_repo_group = xstrdup(value); 169 cgit_repo_group = xstrdup(value);
167 else if (!strcmp(name, "repo.url")) 170 else if (!strcmp(name, "repo.url"))
diff --git a/ui-repolist.c b/ui-repolist.c
index f5e087f..573c730 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -7,6 +7,41 @@
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include <time.h>
11
12
13time_t read_agefile(char *path)
14{
15 FILE *f;
16 static char buf[64], buf2[64];
17 struct tm tm;
18
19 if (!(f = fopen(path, "r")))
20 return -1;
21 fgets(buf, sizeof(buf), f);
22 fclose(f);
23 if (parse_date(buf, buf2, sizeof(buf2)))
24 return strtoul(buf2, NULL, 10);
25 else
26 return 0;
27}
28
29static void print_modtime(struct repoinfo *repo)
30{
31 char *path;
32 struct stat s;
33
34 path = fmt("%s/%s", repo->path, cgit_agefile);
35 if (stat(path, &s) == 0) {
36 cgit_print_age(read_agefile(path), -1, NULL);
37 return;
38 }
39
40 path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
41 if (stat(path, &s) != 0)
42 return;
43 cgit_print_age(s.st_mtime, -1, NULL);
44}
10 45
11void cgit_print_repolist(struct cacheitem *item) 46void cgit_print_repolist(struct cacheitem *item)
12{ 47{
@@ -19,7 +54,7 @@ void cgit_print_repolist(struct cacheitem *item)
19 54
20 html("<table class='list nowrap'>"); 55 html("<table class='list nowrap'>");
21 if (cgit_index_header) { 56 if (cgit_index_header) {
22 html("<tr class='nohover'><td colspan='4' class='include-block'>"); 57 html("<tr class='nohover'><td colspan='5' class='include-block'>");
23 html_include(cgit_index_header); 58 html_include(cgit_index_header);
24 html("</td></tr>"); 59 html("</td></tr>");
25 } 60 }
@@ -27,6 +62,7 @@ void cgit_print_repolist(struct cacheitem *item)
27 "<th class='left'>Name</th>" 62 "<th class='left'>Name</th>"
28 "<th class='left'>Description</th>" 63 "<th class='left'>Description</th>"
29 "<th class='left'>Owner</th>" 64 "<th class='left'>Owner</th>"
65 "<th class='left'>Idle</th>"
30 "<th>Links</th></tr>\n"); 66 "<th>Links</th></tr>\n");
31 67
32 for (i=0; i<cgit_repolist.count; i++) { 68 for (i=0; i<cgit_repolist.count; i++) {
@@ -50,6 +86,8 @@ void cgit_print_repolist(struct cacheitem *item)
50 html("</td><td>"); 86 html("</td><td>");
51 html_txt(repo->owner); 87 html_txt(repo->owner);
52 html("</td><td>"); 88 html("</td><td>");
89 print_modtime(repo);
90 html("</td><td>");
53 html_link_open(cgit_repourl(repo->url), 91 html_link_open(cgit_repourl(repo->url),
54 "Summary", "button"); 92 "Summary", "button");
55 html("S</a>"); 93 html("S</a>");