diff options
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | cgit.c | 53 | ||||
-rw-r--r-- | cgit.css | 148 | ||||
-rw-r--r-- | cgit.h | 6 | ||||
-rw-r--r-- | cgitrc.5.txt | 17 | ||||
-rw-r--r-- | cmd.c | 10 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | shared.c | 6 | ||||
-rwxr-xr-x | tests/t0104-tree.sh | 4 | ||||
-rwxr-xr-x | tests/t0105-commit.sh | 2 | ||||
-rwxr-xr-x | tests/t0107-snapshot.sh | 22 | ||||
-rw-r--r-- | ui-commit.c | 4 | ||||
-rw-r--r-- | ui-log.c | 71 | ||||
-rw-r--r-- | ui-log.h | 1 | ||||
-rw-r--r-- | ui-refs.c | 42 | ||||
-rw-r--r-- | ui-repolist.c | 137 | ||||
-rw-r--r-- | ui-shared.c | 44 | ||||
-rw-r--r-- | ui-shared.h | 7 | ||||
-rw-r--r-- | ui-snapshot.c | 100 | ||||
-rw-r--r-- | ui-snapshot.h | 3 | ||||
-rw-r--r-- | ui-stats.c | 410 | ||||
-rw-r--r-- | ui-stats.h | 27 | ||||
-rw-r--r-- | ui-tag.c | 11 | ||||
-rw-r--r-- | ui-tree.c | 36 |
24 files changed, 1007 insertions, 157 deletions
@@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) | |||
5 | CGIT_CONFIG = /etc/cgitrc | 5 | CGIT_CONFIG = /etc/cgitrc |
6 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
7 | SHA1_HEADER = <openssl/sha.h> | 7 | SHA1_HEADER = <openssl/sha.h> |
8 | GIT_VER = 1.6.0.3 | 8 | GIT_VER = 1.6.1 |
9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
10 | INSTALL = install | 10 | INSTALL = install |
11 | 11 | ||
@@ -90,6 +90,7 @@ OBJECTS += ui-refs.o | |||
90 | OBJECTS += ui-repolist.o | 90 | OBJECTS += ui-repolist.o |
91 | OBJECTS += ui-shared.o | 91 | OBJECTS += ui-shared.o |
92 | OBJECTS += ui-snapshot.o | 92 | OBJECTS += ui-snapshot.o |
93 | OBJECTS += ui-stats.o | ||
93 | OBJECTS += ui-summary.o | 94 | OBJECTS += ui-summary.o |
94 | OBJECTS += ui-tag.o | 95 | OBJECTS += ui-tag.o |
95 | OBJECTS += ui-tree.o | 96 | OBJECTS += ui-tree.o |
@@ -12,6 +12,7 @@ | |||
12 | #include "configfile.h" | 12 | #include "configfile.h" |
13 | #include "html.h" | 13 | #include "html.h" |
14 | #include "ui-shared.h" | 14 | #include "ui-shared.h" |
15 | #include "ui-stats.h" | ||
15 | #include "scan-tree.h" | 16 | #include "scan-tree.h" |
16 | 17 | ||
17 | const char *cgit_version = CGIT_VERSION; | 18 | const char *cgit_version = CGIT_VERSION; |
@@ -54,6 +55,8 @@ void config_cb(const char *name, const char *value) | |||
54 | ctx.cfg.enable_log_filecount = atoi(value); | 55 | ctx.cfg.enable_log_filecount = atoi(value); |
55 | else if (!strcmp(name, "enable-log-linecount")) | 56 | else if (!strcmp(name, "enable-log-linecount")) |
56 | ctx.cfg.enable_log_linecount = atoi(value); | 57 | ctx.cfg.enable_log_linecount = atoi(value); |
58 | else if (!strcmp(name, "max-stats")) | ||
59 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | ||
57 | else if (!strcmp(name, "cache-size")) | 60 | else if (!strcmp(name, "cache-size")) |
58 | ctx.cfg.cache_size = atoi(value); | 61 | ctx.cfg.cache_size = atoi(value); |
59 | else if (!strcmp(name, "cache-root")) | 62 | else if (!strcmp(name, "cache-root")) |
@@ -112,6 +115,8 @@ void config_cb(const char *name, const char *value) | |||
112 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 115 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
113 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 116 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
114 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 117 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
118 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) | ||
119 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); | ||
115 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 120 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
116 | ctx.repo->module_link= xstrdup(value); | 121 | ctx.repo->module_link= xstrdup(value); |
117 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 122 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
@@ -154,6 +159,12 @@ static void querystring_cb(const char *name, const char *value) | |||
154 | ctx.qry.name = xstrdup(value); | 159 | ctx.qry.name = xstrdup(value); |
155 | } else if (!strcmp(name, "mimetype")) { | 160 | } else if (!strcmp(name, "mimetype")) { |
156 | ctx.qry.mimetype = xstrdup(value); | 161 | ctx.qry.mimetype = xstrdup(value); |
162 | } else if (!strcmp(name, "s")){ | ||
163 | ctx.qry.sort = xstrdup(value); | ||
164 | } else if (!strcmp(name, "showmsg")) { | ||
165 | ctx.qry.showmsg = atoi(value); | ||
166 | } else if (!strcmp(name, "period")) { | ||
167 | ctx.qry.period = xstrdup(value); | ||
157 | } | 168 | } |
158 | } | 169 | } |
159 | 170 | ||
@@ -177,6 +188,7 @@ static void prepare_context(struct cgit_context *ctx) | |||
177 | ctx->cfg.max_lock_attempts = 5; | 188 | ctx->cfg.max_lock_attempts = 5; |
178 | ctx->cfg.max_msg_len = 80; | 189 | ctx->cfg.max_msg_len = 80; |
179 | ctx->cfg.max_repodesc_len = 80; | 190 | ctx->cfg.max_repodesc_len = 80; |
191 | ctx->cfg.max_stats = 0; | ||
180 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 192 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
181 | ctx->cfg.renamelimit = -1; | 193 | ctx->cfg.renamelimit = -1; |
182 | ctx->cfg.robots = "index, nofollow"; | 194 | ctx->cfg.robots = "index, nofollow"; |
@@ -434,28 +446,29 @@ int main(int argc, const char **argv) | |||
434 | ctx.repo = NULL; | 446 | ctx.repo = NULL; |
435 | http_parse_querystring(ctx.qry.raw, querystring_cb); | 447 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
436 | 448 | ||
437 | /* If virtual-root isn't specified in cgitrc and no url | 449 | /* If virtual-root isn't specified in cgitrc, lets pretend |
438 | * parameter is specified on the querystring, lets pretend | 450 | * that virtual-root equals SCRIPT_NAME. |
439 | * that virtualroot equals SCRIPT_NAME and use PATH_INFO as | ||
440 | * url. This allows cgit to work with virtual urls without | ||
441 | * the need for rewriterules in the webserver (as long as | ||
442 | * PATH_INFO is included in the cache lookup key). | ||
443 | */ | 451 | */ |
444 | if (!ctx.cfg.virtual_root && !ctx.qry.url) { | 452 | if (!ctx.cfg.virtual_root) |
445 | ctx.cfg.virtual_root = ctx.cfg.script_name; | 453 | ctx.cfg.virtual_root = ctx.cfg.script_name; |
446 | path = getenv("PATH_INFO"); | 454 | |
447 | if (path) { | 455 | /* If no url parameter is specified on the querystring, lets |
448 | if (path[0] == '/') | 456 | * use PATH_INFO as url. This allows cgit to work with virtual |
449 | path++; | 457 | * urls without the need for rewriterules in the webserver (as |
450 | ctx.qry.url = xstrdup(path); | 458 | * long as PATH_INFO is included in the cache lookup key). |
451 | if (ctx.qry.raw) { | 459 | */ |
452 | qry = ctx.qry.raw; | 460 | path = getenv("PATH_INFO"); |
453 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); | 461 | if (!ctx.qry.url && path) { |
454 | free(qry); | 462 | if (path[0] == '/') |
455 | } else | 463 | path++; |
456 | ctx.qry.raw = ctx.qry.url; | 464 | ctx.qry.url = xstrdup(path); |
457 | cgit_parse_url(ctx.qry.url); | 465 | if (ctx.qry.raw) { |
458 | } | 466 | qry = ctx.qry.raw; |
467 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); | ||
468 | free(qry); | ||
469 | } else | ||
470 | ctx.qry.raw = ctx.qry.url; | ||
471 | cgit_parse_url(ctx.qry.url); | ||
459 | } | 472 | } |
460 | 473 | ||
461 | ttl = calc_ttl(); | 474 | ttl = calc_ttl(); |
@@ -120,6 +120,10 @@ table.list tr { | |||
120 | background: white; | 120 | background: white; |
121 | } | 121 | } |
122 | 122 | ||
123 | table.list tr.logheader { | ||
124 | background: #eee; | ||
125 | } | ||
126 | |||
123 | table.list tr:hover { | 127 | table.list tr:hover { |
124 | background: #eee; | 128 | background: #eee; |
125 | } | 129 | } |
@@ -143,6 +147,17 @@ table.list td { | |||
143 | padding: 0.1em 0.5em 0.1em 0.5em; | 147 | padding: 0.1em 0.5em 0.1em 0.5em; |
144 | } | 148 | } |
145 | 149 | ||
150 | table.list td.logsubject { | ||
151 | font-family: monospace; | ||
152 | font-weight: bold; | ||
153 | } | ||
154 | |||
155 | table.list td.logmsg { | ||
156 | font-family: monospace; | ||
157 | white-space: pre; | ||
158 | padding: 1em 0em 2em 0em; | ||
159 | } | ||
160 | |||
146 | table.list td a { | 161 | table.list td a { |
147 | color: black; | 162 | color: black; |
148 | } | 163 | } |
@@ -221,26 +236,31 @@ table.blob { | |||
221 | border-top: solid 1px black; | 236 | border-top: solid 1px black; |
222 | } | 237 | } |
223 | 238 | ||