-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | cgit.c | 8 | ||||
-rw-r--r-- | cgit.css | 104 | ||||
-rw-r--r-- | cgit.h | 3 | ||||
-rw-r--r-- | cgitrc.5.txt | 17 | ||||
-rw-r--r-- | cmd.c | 7 | ||||
-rw-r--r-- | shared.c | 1 | ||||
-rwxr-xr-x | tests/t0104-tree.sh | 4 | ||||
-rw-r--r-- | ui-shared.c | 15 | ||||
-rw-r--r-- | ui-shared.h | 5 | ||||
-rw-r--r-- | ui-stats.c | 410 | ||||
-rw-r--r-- | ui-stats.h | 27 | ||||
-rw-r--r-- | ui-tree.c | 34 |
13 files changed, 604 insertions, 32 deletions
@@ -81,24 +81,25 @@ OBJECTS += shared.o | |||
81 | OBJECTS += ui-atom.o | 81 | OBJECTS += ui-atom.o |
82 | OBJECTS += ui-blob.o | 82 | OBJECTS += ui-blob.o |
83 | OBJECTS += ui-clone.o | 83 | OBJECTS += ui-clone.o |
84 | OBJECTS += ui-commit.o | 84 | OBJECTS += ui-commit.o |
85 | OBJECTS += ui-diff.o | 85 | OBJECTS += ui-diff.o |
86 | OBJECTS += ui-log.o | 86 | OBJECTS += ui-log.o |
87 | OBJECTS += ui-patch.o | 87 | OBJECTS += ui-patch.o |
88 | OBJECTS += ui-plain.o | 88 | OBJECTS += ui-plain.o |
89 | OBJECTS += ui-refs.o | 89 | 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 |
96 | 97 | ||
97 | ifdef NEEDS_LIBICONV | 98 | ifdef NEEDS_LIBICONV |
98 | EXTLIBS += -liconv | 99 | EXTLIBS += -liconv |
99 | endif | 100 | endif |
100 | 101 | ||
101 | 102 | ||
102 | .PHONY: all libgit test install uninstall clean force-version get-git | 103 | .PHONY: all libgit test install uninstall clean force-version get-git |
103 | 104 | ||
104 | all: cgit | 105 | all: cgit |
@@ -3,24 +3,25 @@ | |||
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "cache.h" | 10 | #include "cache.h" |
11 | #include "cmd.h" | 11 | #include "cmd.h" |
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; |
18 | 19 | ||
19 | void config_cb(const char *name, const char *value) | 20 | void config_cb(const char *name, const char *value) |
20 | { | 21 | { |
21 | if (!strcmp(name, "root-title")) | 22 | if (!strcmp(name, "root-title")) |
22 | ctx.cfg.root_title = xstrdup(value); | 23 | ctx.cfg.root_title = xstrdup(value); |
23 | else if (!strcmp(name, "root-desc")) | 24 | else if (!strcmp(name, "root-desc")) |
24 | ctx.cfg.root_desc = xstrdup(value); | 25 | ctx.cfg.root_desc = xstrdup(value); |
25 | else if (!strcmp(name, "root-readme")) | 26 | else if (!strcmp(name, "root-readme")) |
26 | ctx.cfg.root_readme = xstrdup(value); | 27 | ctx.cfg.root_readme = xstrdup(value); |
@@ -45,24 +46,26 @@ void config_cb(const char *name, const char *value) | |||
45 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 46 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
46 | ctx.cfg.virtual_root = ""; | 47 | ctx.cfg.virtual_root = ""; |
47 | } else if (!strcmp(name, "nocache")) | 48 | } else if (!strcmp(name, "nocache")) |
48 | ctx.cfg.nocache = atoi(value); | 49 | ctx.cfg.nocache = atoi(value); |
49 | else if (!strcmp(name, "snapshots")) | 50 | else if (!strcmp(name, "snapshots")) |
50 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 51 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
51 | else if (!strcmp(name, "enable-index-links")) | 52 | else if (!strcmp(name, "enable-index-links")) |
52 | ctx.cfg.enable_index_links = atoi(value); | 53 | ctx.cfg.enable_index_links = atoi(value); |
53 | else if (!strcmp(name, "enable-log-filecount")) | 54 | else if (!strcmp(name, "enable-log-filecount")) |
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")) |
60 | ctx.cfg.cache_root = xstrdup(value); | 63 | ctx.cfg.cache_root = xstrdup(value); |
61 | else if (!strcmp(name, "cache-root-ttl")) | 64 | else if (!strcmp(name, "cache-root-ttl")) |
62 | ctx.cfg.cache_root_ttl = atoi(value); | 65 | ctx.cfg.cache_root_ttl = atoi(value); |
63 | else if (!strcmp(name, "cache-repo-ttl")) | 66 | else if (!strcmp(name, "cache-repo-ttl")) |
64 | ctx.cfg.cache_repo_ttl = atoi(value); | 67 | ctx.cfg.cache_repo_ttl = atoi(value); |
65 | else if (!strcmp(name, "cache-static-ttl")) | 68 | else if (!strcmp(name, "cache-static-ttl")) |
66 | ctx.cfg.cache_static_ttl = atoi(value); | 69 | ctx.cfg.cache_static_ttl = atoi(value); |
67 | else if (!strcmp(name, "cache-dynamic-ttl")) | 70 | else if (!strcmp(name, "cache-dynamic-ttl")) |
68 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 71 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
@@ -103,24 +106,26 @@ void config_cb(const char *name, const char *value) | |||
103 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 106 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
104 | ctx.repo->desc = xstrdup(value); | 107 | ctx.repo->desc = xstrdup(value); |
105 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 108 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
106 | ctx.repo->owner = xstrdup(value); | 109 | ctx.repo->owner = xstrdup(value); |
107 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 110 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
108 | ctx.repo->defbranch = xstrdup(value); | 111 | ctx.repo->defbranch = xstrdup(value); |
109 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 112 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
110 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 113 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
111 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 114 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
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) { |
118 | if (*value == '/') | 123 | if (*value == '/') |
119 | ctx.repo->readme = xstrdup(value); | 124 | ctx.repo->readme = xstrdup(value); |
120 | else | 125 | else |
121 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 126 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
122 | } else if (!strcmp(name, "include")) | 127 | } else if (!strcmp(name, "include")) |
123 | parse_configfile(value, config_cb); | 128 | parse_configfile(value, config_cb); |
124 | } | 129 | } |
125 | 130 | ||
126 | static void querystring_cb(const char *name, const char *value) | 131 | static void querystring_cb(const char *name, const char *value) |
@@ -149,47 +154,50 @@ static void querystring_cb(const char *name, const char *value) | |||
149 | } else if (!strcmp(name, "ofs")) { | 154 | } else if (!strcmp(name, "ofs")) { |
150 | ctx.qry.ofs = atoi(value); | 155 | ctx.qry.ofs = atoi(value); |
151 | } else if (!strcmp(name, "path")) { | 156 | } else if (!strcmp(name, "path")) { |
152 | ctx.qry.path = trim_end(value, '/'); | 157 | ctx.qry.path = trim_end(value, '/'); |
153 | } else if (!strcmp(name, "name")) { | 158 | } else if (!strcmp(name, "name")) { |
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); |
157 | } else if (!strcmp(name, "s")){ | 162 | } else if (!strcmp(name, "s")){ |
158 | ctx.qry.sort = xstrdup(value); | 163 | ctx.qry.sort = xstrdup(value); |
159 | } else if (!strcmp(name, "showmsg")) { | 164 | } else if (!strcmp(name, "showmsg")) { |
160 | ctx.qry.showmsg = atoi(value); | 165 | ctx.qry.showmsg = atoi(value); |
166 | } else if (!strcmp(name, "period")) { | ||
167 | ctx.qry.period = xstrdup(value); | ||
161 | } | 168 | } |
162 | } | 169 | } |
163 | 170 | ||
164 | static void prepare_context(struct cgit_context *ctx) | 171 | static void prepare_context(struct cgit_context *ctx) |
165 | { | 172 | { |
166 | memset(ctx, 0, sizeof(ctx)); | 173 | memset(ctx, 0, sizeof(ctx)); |
167 | ctx->cfg.agefile = "info/web/last-modified"; | 174 | ctx->cfg.agefile = "info/web/last-modified"; |
168 | ctx->cfg.nocache = 0; | 175 | ctx->cfg.nocache = 0; |
169 | ctx->cfg.cache_size = 0; | 176 | ctx->cfg.cache_size = 0; |
170 | ctx->cfg.cache_dynamic_ttl = 5; | 177 | ctx->cfg.cache_dynamic_ttl = 5; |
171 | ctx->cfg.cache_max_create_time = 5; | 178 | ctx->cfg.cache_max_create_time = 5; |
172 | ctx->cfg.cache_repo_ttl = 5; | 179 | ctx->cfg.cache_repo_ttl = 5; |
173 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 180 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
174 | ctx->cfg.cache_root_ttl = 5; | 181 | ctx->cfg.cache_root_ttl = 5; |
175 | ctx->cfg.cache_static_ttl = -1; | 182 | ctx->cfg.cache_static_ttl = -1; |
176 | ctx->cfg.css = "/cgit.css"; | 183 | ctx->cfg.css = "/cgit.css"; |
177 | ctx->cfg.logo = "/git-logo.png"; | 184 | ctx->cfg.logo = "/git-logo.png"; |
178 | ctx->cfg.local_time = 0; | 185 | ctx->cfg.local_time = 0; |
179 | ctx->cfg.max_repo_count = 50; | 186 | ctx->cfg.max_repo_count = 50; |
180 | ctx->cfg.max_commit_count = 50; | 187 | ctx->cfg.max_commit_count = 50; |
181 | ctx->cfg.max_lock_attempts = 5; | 188 | ctx->cfg.max_lock_attempts = 5; |
182 | ctx->cfg.max_msg_len = 80; | 189 | ctx->cfg.max_msg_len = 80; |
183 | ctx->cfg.max_repodesc_len = 80; | 190 | ctx->cfg.max_repodesc_len = 80; |
191 | ctx->cfg.max_stats = 0; | ||
184 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 192 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
185 | ctx->cfg.renamelimit = -1; | 193 | ctx->cfg.renamelimit = -1; |
186 | ctx->cfg.robots = "index, nofollow"; | 194 | ctx->cfg.robots = "index, nofollow"; |
187 | ctx->cfg.root_title = "Git repository browser"; | 195 | ctx->cfg.root_title = "Git repository browser"; |
188 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 196 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
189 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 197 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
190 | ctx->cfg.summary_branches = 10; | 198 | ctx->cfg.summary_branches = 10; |
191 | ctx->cfg.summary_log = 10; | 199 | ctx->cfg.summary_log = 10; |
192 | ctx->cfg.summary_tags = 10; | 200 | ctx->cfg.summary_tags = 10; |
193 | ctx->page.mimetype = "text/html"; | 201 | ctx->page.mimetype = "text/html"; |
194 | ctx->page.charset = PAGE_ENCODING; | 202 | ctx->page.charset = PAGE_ENCODING; |
195 | ctx->page.filename = NULL; | 203 | ctx->page.filename = NULL; |
@@ -227,44 +227,49 @@ td.ls-size { | |||
227 | } | 227 | } |
228 | 228 | ||
229 | td.ls-mode { | 229 | td.ls-mode { |
230 | font-family: monospace; | 230 | font-family: monospace; |
231 | width: 10em; | 231 | width: 10em; |
232 | } | 232 | } |
233 | 233 | ||
234 | table.blob { | 234 | table.blob { |
235 | margin-top: 0.5em; | 235 | margin-top: 0.5em; |
236 | border-top: solid 1px black; | 236 | border-top: solid 1px black; |
237 | } | 237 | } |
238 | 238 | ||
239 | table.blob td.no { | 239 | table.blob td.lines { |
240 | border-right: solid 1px black; | 240 | margin: 0; padding: 0; |
241 | vertical-align: top; | ||
241 | color: black; | 242 | color: black; |
243 | } | ||
244 | |||
245 | table.blob td.linenumbers { | ||
246 | margin: 0; padding: 0; | ||
247 | vertical-align: top; | ||
248 | border-right: 1px solid gray; | ||
242 | background-color: #eee; | 249 | background-color: #eee; |
243 | text-align: right; | ||
244 | } | 250 | } |
245 | 251 | ||
246 | table.blob td.no a { | 252 | table.blob pre { |
247 | color: black; | 253 | padding: 0; margin: 0; |
248 | } | 254 | } |
249 | 255 | ||
250 | table.blob td.no a:hover { | 256 | table.blob a.no { |
251 | color: black; | 257 | color: gray; |
258 | text-align: right; | ||
252 | text-decoration: none; | 259 | text-decoration: none; |
253 | } | 260 | } |
254 | 261 | ||
255 | table.blob td.txt { | 262 | table.blob a.no a:hover { |
256 | white-space: pre; | 263 | color: black; |
257 | font-family: monospace; | ||
258 | padding-left: 0.5em; | ||
259 | } | 264 | } |
260 | 265 | ||
261 | table.nowrap td { | 266 | table.nowrap td { |
262 | white-space: nowrap; | 267 | white-space: nowrap; |
263 | } | 268 | } |
264 | 269 | ||
265 | table.commit-info { | 270 | table.commit-info { |
266 | border-collapse: collapse; | 271 | border-collapse: collapse; |
267 | margin-top: 1.5em; | 272 | margin-top: 1.5em; |
268 | } | 273 | } |
269 | 274 | ||
270 | table.commit-info th { | 275 | table.commit-info th { |
@@ -491,12 +496,89 @@ a.remote-deco { | |||
491 | } | 496 | } |
492 | a.deco { | 497 | a.deco { |
493 | margin: 0px 0.5em; | 498 | margin: 0px 0.5em; |
494 | padding: 0px 0.25em; | 499 | padding: 0px 0.25em; |
495 | background-color: #ff8888; | 500 | background-color: #ff8888; |
496 | border: solid 1px #770000; | 501 | border: solid 1px #770000; |
497 | } | 502 | } |
498 | 503 | ||
499 | div.commit-subject a { | 504 | div.commit-subject a { |
500 | margin-left: 1em; | 505 | margin-left: 1em; |
501 | font-size: 75%; | 506 | font-size: 75%; |
502 | } | 507 | } |
508 | |||
509 | table.stats { | ||
510 | border: solid 1px black; | ||
511 | border-collapse: collapse; | ||
512 | } | ||
513 | |||
514 | table.stats th { | ||
515 | text-align: left; | ||
516 | padding: 1px 0.5em; | ||
517 | background-color: #eee; | ||
518 | border: solid 1px black; | ||
519 | } | ||
520 | |||
521 | table.stats td { | ||
522 | text-align: right; | ||
523 | padding: 1px 0.5em; | ||
524 | border: solid 1px black; | ||
525 | } | ||
526 | |||
527 | table.stats td.total { | ||
528 | font-weight: bold; | ||
529 | text-align: left; | ||
530 | } | ||
531 | |||
532 | table.stats td.sum { | ||
533 | color: #c00; | ||
534 | font-weight: bold; | ||
535 | /*background-color: #eee; */ | ||
536 | } | ||
537 | |||
538 | table.stats td.left { | ||
539 | text-align: left; | ||
540 | } | ||
541 | |||
542 | table.vgraph { | ||
543 | border-collapse: separate; | ||
544 | border: solid 1px black; | ||
545 | height: 200px; | ||
546 | } | ||
547 | |||
548 | table.vgraph th { | ||
549 | background-color: #eee; | ||
550 | font-weight: bold; | ||
551 | border: solid 1px white; | ||
552 | padding: 1px 0.5em; | ||
553 | } | ||
554 | |||
555 | table.vgraph td { | ||
556 | vertical-align: bottom; | ||
557 | padding: 0px 10px; | ||
558 | } | ||
559 | |||
560 | table.vgraph div.bar { | ||
561 | background-color: #eee; | ||
562 | } | ||
563 | |||
564 | table.hgraph { | ||
565 | border: solid 1px black; | ||
566 | width: 800px; | ||
567 | } | ||
568 | |||
569 | table.hgraph th { | ||
570 | background-color: #eee; | ||
571 | font-weight: bold; | ||
572 | border: solid 1px black; | ||
573 | padding: 1px 0.5em; | ||
574 | } | ||
575 | |||
576 | table.hgraph td { | ||
577 | vertical-align: center; | ||
578 | padding: 2px 2px; | ||
579 | } | ||
580 | |||
581 | table.hgraph div.bar { | ||
582 | background-color: #eee; | ||
583 | height: 1em; | ||
584 | } | ||
@@ -52,24 +52,25 @@ struct cgit_repo { | |||
52 | char *name; | 52 | char *name; |
53 | char *path; | 53 | char *path; |
54 | char *desc; | 54 | char *desc; |
55 | char *owner; | 55 | char *owner; |
56 | char *defbranch; | 56 | char *defbranch; |
57 | char *group; | 57 | char *group; |
58 | char *module_link; | 58 | char *module_link; |
59 | char *readme; | 59 | char *readme; |
60 | char *clone_url; | 60 | char *clone_url; |
61 | int snapshots; | 61 | int snapshots; |
62 | int enable_log_filecount; | 62 | int enable_log_filecount; |
63 | int enable_log_linecount; | 63 | int enable_log_linecount; |
64 | int max_stats; | ||
64 | time_t mtime; | 65 | time_t mtime; |
65 | }; | 66 | }; |
66 | 67 | ||
67 | struct cgit_repolist { | 68 | struct cgit_repolist { |
68 | int length; | 69 | int length; |
69 | int count; | 70 | int count; |
70 | struct cgit_repo *repos; | 71 | struct cgit_repo *repos; |
71 | }; | 72 | }; |
72 | 73 | ||
73 | struct commitinfo { | 74 | struct commitinfo { |
74 | struct commit *commit; | 75 | struct commit *commit; |
75 | char *author; | 76 | char *author; |
@@ -111,24 +112,25 @@ struct cgit_query { | |||
111 | char *raw; | 112 | char *raw; |
112 | char *repo; | 113 | char *repo; |
113 | char *page; | 114 | char *page; |
114 | char *search; | 115 | char *search; |
115 | char *grep; | 116 | char *grep; |
116 | char *head; | 117 | char *head; |
117 | char *sha1; | 118 | char *sha1; |
118 | char *sha2; | 119 | char *sha2; |
119 | char *path; | 120 | char *path; |
120 | char *name; | 121 | char *name; |
121 | char *mimetype; | 122 | char *mimetype; |
122 | char *url; | 123 | char *url; |
124 | char *period; | ||
123 | int ofs; | 125 | int ofs; |
124 | int nohead; | 126 | int nohead; |
125 | char *sort; | 127 | char *sort; |
126 | int showmsg; | 128 | int showmsg; |
127 | }; | 129 | }; |
128 | 130 | ||
129 | struct cgit_config { | 131 | struct cgit_config { |
130 | char *agefile; | 132 | char *agefile; |
131 | char *cache_root; | 133 | char *cache_root; |
132 | char *clone_prefix; | 134 | char *clone_prefix; |
133 | char *css; | 135 | char *css; |
134 | char *favicon; | 136 | char *favicon; |
@@ -151,24 +153,25 @@ struct cgit_config { | |||
151 | int cache_repo_ttl; | 153 | int cache_repo_ttl; |
152 | int cache_root_ttl; | 154 | int cache_root_ttl; |
153 | int cache_static_ttl; | 155 | int cache_static_ttl; |
154 | int enable_index_links; | 156 | int enable_index_links; |
155 | int enable_log_filecount; | 157 | int enable_log_filecount; |
156 | int enable_log_linecount; | 158 | int enable_log_linecount; |
157 | int local_time; | 159 | int local_time; |
158 | int max_repo_count; | 160 | int max_repo_count; |
159 | int max_commit_count; | 161 | int max_commit_count; |
160 | int max_lock_attempts; | 162 | int max_lock_attempts; |
161 | int max_msg_len; | 163 | int max_msg_len; |
162 | int max_repodesc_len; | 164 | int max_repodesc_len; |
165 | int max_stats; | ||
163 | int nocache; | 166 | int nocache; |
164 | int renamelimit; | 167 | int renamelimit; |
165 | int snapshots; | 168 | int snapshots; |
166 | int summary_branches; | 169 | int summary_branches; |
167 | int summary_log; | 170 | int summary_log; |
168 | int summary_tags; | 171 | int summary_tags; |
169 | }; | 172 | }; |
170 | 173 | ||
171 | struct cgit_page { | 174 | struct cgit_page { |
172 | time_t modified; | 175 | time_t modified; |
173 | time_t expires; | 176 | time_t expires; |
174 | size_t size; | 177 | size_t size; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index ab9ab66..09f56a6 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -120,24 +120,29 @@ max-commit-count | |||
120 | max-message-length | 120 | max-message-length |
121 | Specifies the maximum number of commit message characters to display in | 121 | Specifies the maximum number of commit message characters to display in |
122 | "log" view. Default value: "80". | 122 | "log" view. Default value: "80". |
123 | 123 | ||
124 | max-repo-count | 124 | max-repo-count |
125 | Specifies the number of entries to list per page on therepository | 125 | Specifies the number of entries to list per page on therepository |
126 | index page. Default value: "50". | 126 | index page. Default value: "50". |
127 | 127 | ||
128 | max-repodesc-length | 128 | max-repodesc-length |
129 | Specifies the maximum number of repo description characters to display | 129 | Specifies the maximum number of repo description characters to display |
130 | on the repository index page. Default value: "80". | 130 | on the repository index page. Default value: "80". |
131 | 131 | ||
132 | max-stats | ||
133 | Set the default maximum statistics period. Valid values are "week", | ||
134 | "month", "quarter" and "year". If unspecified, statistics are | ||
135 | disabled. Default value: none. See also: "repo.max-stats". | ||
136 | |||
132 | module-link | 137 | module-link |
133 | Text which will be used as the formatstring for a hyperlink when a | 138 | Text which will be used as the formatstring for a hyperlink when a |
134 | submodule is printed in a directory listing. The arguments for the | 139 | submodule is printed in a directory listing. The arguments for the |
135 | formatstring are the path and SHA1 of the submodule commit. Default | 140 | formatstring are the path and SHA1 of the submodule commit. Default |
136 | value: "./?repo=%s&page=commit&id=%s" | 141 | value: "./?repo=%s&page=commit&id=%s" |
137 | 142 | ||
138 | nocache | 143 | nocache |
139 | If set to the value "1" caching will be disabled. This settings is | 144 | If set to the value "1" caching will be disabled. This settings is |
140 | deprecated, and will not be honored starting with cgit-1.0. Default | 145 | deprecated, and will not be honored starting with cgit-1.0. Default |
141 | value: "0". | 146 | value: "0". |
142 | 147 | ||
143 | renamelimit | 148 | renamelimit |
@@ -209,24 +214,29 @@ repo.defbranch | |||
209 | 214 | ||
210 | repo.desc | 215 | repo.desc |
211 | The value to show as repository description. Default value: none. | 216 | The value to show as repository description. Default value: none. |
212 | 217 | ||
213 | repo.enable-log-filecount | 218 | repo.enable-log-filecount |
214 | A flag which can be used to disable the global setting | 219 | A flag which can be used to disable the global setting |
215 | `enable-log-filecount'. Default value: none. | 220 | `enable-log-filecount'. Default value: none. |
216 | 221 | ||
217 | repo.enable-log-linecount | 222 | repo.enable-log-linecount |
218 | A flag which can be used to disable the global setting | 223 | A flag which can be used to disable the global setting |
219 | `enable-log-linecount'. Default value: none. | 224 | `enable-log-linecount'. Default value: none. |
220 | 225 | ||
226 | repo.max-stats | ||
227 | Override the default maximum statistics period. Valid values are equal | ||
228 | to the values specified for the global "max-stats" setting. Default | ||
229 | value: none. | ||
230 | |||
221 | repo.name | 231 | repo.name |
222 | The value to show as repository name. Default value: <repo.url>. | 232 | The value to show as repository name. Default value: <repo.url>. |
223 | 233 | ||
224 | repo.owner | 234 | repo.owner |
225 | A value used to identify the owner of the repository. Default value: | 235 | A value used to identify the owner of the repository. Default value: |
226 | none. | 236 | none. |
227 | 237 | ||
228 | repo.path | 238 | repo.path |
229 | An absolute path to the repository directory. For non-bare repositories | 239 | An absolute path to the repository directory. For non-bare repositories |
230 | this is the .git-directory. Default value: none. | 240 | this is the .git-directory. Default value: none. |
231 | 241 | ||
232 | repo.readme | 242 | repo.readme |
@@ -267,24 +277,28 @@ enable-log-filecount=1 | |||
267 | # Show number of added/removed lines per commit on the log pages | 277 | # Show number of added/removed lines per commit on the log pages |
268 | enable-log-linecount=1 | 278 | enable-log-linecount=1 |
269 | 279 | ||
270 | 280 | ||
271 | # Add a cgit favicon | 281 | # Add a cgit favicon |
272 | favicon=/favicon.ico | 282 | favicon=/favicon.ico |
273 | 283 | ||
274 | 284 | ||
275 | # Use a custom logo | 285 | # Use a custom logo |
276 | logo=/img/mylogo.png | 286 | logo=/img/mylogo.png |
277 | 287 | ||
278 | 288 | ||
289 | # Enable statistics per week, month and quarter | ||
290 | max-stats=quarter | ||
291 | |||
292 | |||
279 | # Set the title and heading of the repository index page | 293 | # Set the title and heading of the repository index page |
280 | root-title=foobar.com git repositories | 294 | root-title=foobar.com git repositories |
281 | 295 | ||
282 | 296 | ||
283 | # Set a subheading for the repository index page | 297 | # Set a subheading for the repository index page |
284 | root-desc=tracking the foobar development | 298 | root-desc=tracking the foobar development |
285 | 299 | ||
286 | 300 | ||
287 | # Include some more info about foobar.com on the index page | 301 | # Include some more info about foobar.com on the index page |
288 | root-readme=/var/www/htdocs/about.html | 302 | root-readme=/var/www/htdocs/about.html |
289 | 303 | ||
290 | 304 | ||
@@ -339,24 +353,27 @@ repo.desc=the dscm | |||
339 | 353 | ||
340 | 354 | ||
341 | repo.url=linux | 355 | repo.url=linux |
342 | repo.path=/pub/git/linux.git | 356 | repo.path=/pub/git/linux.git |
343 | repo.desc=the kernel | 357 | repo.desc=the kernel |
344 | 358 | ||
345 | # Disable adhoc downloads of this repo | 359 | # Disable adhoc downloads of this repo |
346 | repo.snapshots=0 | 360 | repo.snapshots=0 |
347 | 361 | ||
348 | # Disable line-counts for this repo | 362 | # Disable line-counts for this repo |
349 | repo.enable-log-linecount=0 | 363 | repo.enable-log-linecount=0 |
350 | 364 | ||
365 | # Restrict the max statistics period for this repo | ||
366 | repo.max-stats=month | ||
367 | |||
351 | 368 | ||
352 | BUGS | 369 | BUGS |
353 | ---- | 370 | ---- |
354 | Comments currently cannot appear on the same line as a setting; the comment | 371 | Comments currently cannot appear on the same line as a setting; the comment |
355 | will be included as part of the value. E.g. this line: | 372 | will be included as part of the value. E.g. this line: |
356 | 373 | ||
357 | robots=index # allow indexing | 374 | robots=index # allow indexing |
358 | 375 | ||
359 | will generate the following html element: | 376 | will generate the following html element: |
360 | 377 | ||
361 | <meta name='robots' content='index # allow indexing'/> | 378 | <meta name='robots' content='index # allow indexing'/> |
362 | 379 | ||
@@ -12,24 +12,25 @@ | |||
12 | #include "ui-shared.h" | 12 | #include "ui-shared.h" |
13 | #include "ui-atom.h" | 13 | #include "ui-atom.h" |
14 | #include "ui-blob.h" | 14 | #include "ui-blob.h" |
15 | #include "ui-clone.h" | 15 | #include "ui-clone.h" |
16 | #include "ui-commit.h" | 16 | #include "ui-commit.h" |
17 | #include "ui-diff.h" | 17 | #include "ui-diff.h" |
18 | #include "ui-log.h" | 18 | #include "ui-log.h" |
19 | #include "ui-patch.h" | 19 | #include "ui-patch.h" |
20 | #include "ui-plain.h" | 20 | #include "ui-plain.h" |
21 | #include "ui-refs.h" | 21 | #include "ui-refs.h" |
22 | #include "ui-repolist.h" | 22 | #include "ui-repolist.h" |
23 | #include "ui-snapshot.h" | 23 | #include "ui-snapshot.h" |
24 | #include "ui-stats.h" | ||
24 | #include "ui-summary.h" | 25 | #include "ui-summary.h" |
25 | #include "ui-tag.h" | 26 | #include "ui-tag.h" |
26 | #include "ui-tree.h" | 27 | #include "ui-tree.h" |
27 | 28 | ||
28 | static void HEAD_fn(struct cgit_context *ctx) | 29 | static void HEAD_fn(struct cgit_context *ctx) |
29 | { | 30 | { |
30 | cgit_clone_head(ctx); | 31 | cgit_clone_head(ctx); |
31 | } | 32 | } |
32 | 33 | ||
33 | static void atom_fn(struct cgit_context *ctx) | 34 | static void atom_fn(struct cgit_context *ctx) |
34 | { | 35 | { |
35 | cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); | 36 | cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); |
@@ -99,24 +100,29 @@ static void plain_fn(struct cgit_context *ctx) | |||
99 | 100 | ||
100 | static void refs_fn(struct cgit_context *ctx) | 101 | static void refs_fn(struct cgit_context *ctx) |
101 | { | 102 | { |
102 | cgit_print_refs(); | 103 | cgit_print_refs(); |
103 | } | 104 | } |
104 | 105 | ||
105 | static void snapshot_fn(struct cgit_context *ctx) | 106 | static void snapshot_fn(struct cgit_context *ctx) |
106 | { | 107 | { |
107 | cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, ctx->qry.path, | 108 | cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, ctx->qry.path, |
108 | ctx->repo->snapshots, ctx->qry.nohead); | 109 | ctx->repo->snapshots, ctx->qry.nohead); |
109 | } | 110 | } |
110 | 111 | ||
112 | static void stats_fn(struct cgit_context *ctx) | ||
113 | { | ||
114 | cgit_show_stats(ctx); | ||
115 | } | ||
116 | |||
111 | static void summary_fn(struct cgit_context *ctx) | 117 | static void summary_fn(struct cgit_context *ctx) |
112 | { | 118 | { |
113 | cgit_print_summary(); | 119 | cgit_print_summary(); |
114 | } | 120 | } |
115 | 121 | ||
116 | static void tag_fn(struct cgit_context *ctx) | 122 | static void tag_fn(struct cgit_context *ctx) |
117 | { | 123 | { |
118 | cgit_print_tag(ctx->qry.sha1); | 124 | cgit_print_tag(ctx->qry.sha1); |
119 | } | 125 | } |
120 | 126 | ||
121 | static void tree_fn(struct cgit_context *ctx) | 127 | static void tree_fn(struct cgit_context *ctx) |
122 | { | 128 | { |
@@ -135,24 +141,25 @@ struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) | |||
135 | def_cmd(blob, 1, 0), | 141 | def_cmd(blob, 1, 0), |
136 | def_cmd(commit, 1, 1), | 142 | def_cmd(commit, 1, 1), |
137 | def_cmd(diff, 1, 1), | 143 | def_cmd(diff, 1, 1), |
138 | def_cmd(info, 1, 0), | 144 | def_cmd(info, 1, 0), |
139 | def_cmd(log, 1, 1), | 145 | def_cmd(log, 1, 1), |
140 | def_cmd(ls_cache, 0, 0), | 146 | def_cmd(ls_cache, 0, 0), |
141 | def_cmd(objects, 1, 0), | 147 | def_cmd(objects, 1, 0), |
142 | def_cmd(patch, 1, 0), | 148 | def_cmd(patch, 1, 0), |
143 | def_cmd(plain, 1, 0), | 149 | def_cmd(plain, 1, 0), |
144 | def_cmd(refs, 1, 1), | 150 | def_cmd(refs, 1, 1), |
145 | def_cmd(repolist, 0, 0), | 151 | def_cmd(repolist, 0, 0), |
146 | def_cmd(snapshot, 1, 0), | 152 | def_cmd(snapshot, 1, 0), |
153 | def_cmd(stats, 1, 1), | ||
147 | def_cmd(summary, 1, 1), | 154 | def_cmd(summary, 1, 1), |
148 | def_cmd(tag, 1, 1), | 155 | def_cmd(tag, 1, 1), |
149 | def_cmd(tree, 1, 1), | 156 | def_cmd(tree, 1, 1), |
150 | }; | 157 | }; |
151 | int i; | 158 | int i; |
152 | 159 | ||
153 | if (ctx->qry.page == NULL) { | 160 | if (ctx->qry.page == NULL) { |
154 | if (ctx->repo) | 161 | if (ctx->repo) |
155 | ctx->qry.page = "summary"; | 162 | ctx->qry.page = "summary"; |
156 | else | 163 | else |
157 | ctx->qry.page = "repolist"; | 164 | ctx->qry.page = "repolist"; |
158 | } | 165 | } |
@@ -49,24 +49,25 @@ struct cgit_repo *cgit_add_repo(const char *url) | |||
49 | 49 | ||
50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
51 | ret->url = trim_end(url, '/'); | 51 | ret->url = trim_end(url, '/'); |
52 | ret->name = ret->url; | 52 | ret->name = ret->url; |
53 | ret->path = NULL; | 53 | ret->path = NULL; |
54 | ret->desc = "[no description]"; | 54 | ret->desc = "[no description]"; |
55 | ret->owner = NULL; | 55 | ret->owner = NULL; |
56 | ret->group = ctx.cfg.repo_group; | 56 | ret->group = ctx.cfg.repo_group; |
57 | ret->defbranch = "master"; | 57 | ret->defbranch = "master"; |
58 | ret->snapshots = ctx.cfg.snapshots; | 58 | ret->snapshots = ctx.cfg.snapshots; |
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->max_stats = ctx.cfg.max_stats; | ||
61 | ret->module_link = ctx.cfg.module_link; | 62 | ret->module_link = ctx.cfg.module_link; |
62 | ret->readme = NULL; | 63 | ret->readme = NULL; |
63 | ret->mtime = -1; | 64 | ret->mtime = -1; |
64 | return ret; | 65 | return ret; |
65 | } | 66 | } |
66 | 67 | ||
67 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 68 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
68 | { | 69 | { |
69 | int i; | 70 | int i; |
70 | struct cgit_repo *repo; | 71 | struct cgit_repo *repo; |
71 | 72 | ||
72 | for (i=0; i<cgit_repolist.count; i++) { | 73 | for (i=0; i<cgit_repolist.count; i++) { |
diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh index 33f4eb0..2ce1251 100755 --- a/tests/t0104-tree.sh +++ b/tests/t0104-tree.sh | |||
@@ -2,29 +2,29 @@ | |||
2 | 2 | ||
3 | . ./setup.sh | 3 | . ./setup.sh |
4 | 4 | ||
5 | prepare_tests "Check content on tree page" | 5 | prepare_tests "Check content on tree page" |
6 | 6 | ||
7 | run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp' | 7 | run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp' |
8 | run_test 'find file-1' 'grep -e "file-1" trash/tmp' | 8 | run_test 'find file-1' 'grep -e "file-1" trash/tmp' |
9 | run_test 'find file-50' 'grep -e "file-50" trash/tmp' | 9 | run_test 'find file-50' 'grep -e "file-50" trash/tmp' |
10 | 10 | ||
11 | run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp' | 11 | run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp' |
12 | 12 | ||
13 | run_test 'find line 1' ' | 13 | run_test 'find line 1' ' |
14 | grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp | 14 | grep -e "<a class=.no. id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp |
15 | ' | 15 | ' |
16 | 16 | ||
17 | run_test 'no line 2' ' | 17 | run_test 'no line 2' ' |
18 | ! grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp | 18 | ! grep -e "<a class=.no. id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp |
19 | ' | 19 | ' |
20 | 20 | ||
21 | run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp' | 21 | run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp' |
22 | 22 | ||
23 | run_test 'verify a+b link' ' | 23 | run_test 'verify a+b link' ' |
24 | grep -e "/foo+bar/tree/a+b" trash/tmp | 24 | grep -e "/foo+bar/tree/a+b" trash/tmp |
25 | ' | 25 | ' |
26 | 26 | ||
27 | run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp' | 27 | run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp' |
28 | 28 | ||
29 | run_test 'verify a+b?h=1+2 link' ' | 29 | run_test 'verify a+b?h=1+2 link' ' |
30 | grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp | 30 | grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp |
diff --git a/ui-shared.c b/ui-shared.c index fba1ba6..4f28512 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -360,24 +360,30 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
360 | } | 360 | } |
361 | html("'>"); | 361 | html("'>"); |
362 | html_txt(name); | 362 | html_txt(name); |
363 | html("</a>"); | 363 | html("</a>"); |
364 | } | 364 | } |
365 | 365 | ||
366 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 366 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
367 | char *rev) | 367 | char *rev) |
368 | { | 368 | { |
369 | reporevlink("patch", name, title, class, head, rev, NULL); | 369 | reporevlink("patch", name, title, class, head, rev, NULL); |
370 | } | 370 | } |
371 | 371 | ||
372 | void cgit_stats_link(char *name, char *title, char *class, char *head, | ||
373 | char *path) | ||
374 | { | ||
375 | reporevlink("stats", name, title, class, head, NULL, path); | ||
376 | } | ||
377 | |||
372 | void cgit_object_link(struct object *obj) | 378 | void cgit_object_link(struct object *obj) |
373 | { | 379 | { |
374 | char *page, *shortrev, *fullrev, *name; | 380 | char *page, *shortrev, *fullrev, *name; |
375 | 381 | ||
376 | fullrev = sha1_to_hex(obj->sha1); | 382 | fullrev = sha1_to_hex(obj->sha1); |
377 | shortrev = xstrdup(fullrev); | 383 | shortrev = xstrdup(fullrev); |
378 | shortrev[10] = '\0'; | 384 | shortrev[10] = '\0'; |
379 | if (obj->type == OBJ_COMMIT) { | 385 | if (obj->type == OBJ_COMMIT) { |
380 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, | 386 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, |
381 | ctx.qry.head, fullrev); | 387 | ctx.qry.head, fullrev); |
382 | return; | 388 | return; |
383 | } else if (obj->type == OBJ_TREE) | 389 | } else if (obj->type == OBJ_TREE) |
@@ -548,25 +554,25 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, | |||
548 | html("<h1>download</h1>\n"); | 554 | html("<h1>download</h1>\n"); |
549 | *header = 1; | 555 | *header = 1; |
550 | } | 556 | } |
551 | url = cgit_pageurl(ctx.qry.repo, "blob", | 557 | url = cgit_pageurl(ctx.qry.repo, "blob", |
552 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 558 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
553 | buf)); | 559 | buf)); |
554 | html_link_open(url, NULL, "menu"); | 560 | html_link_open(url, NULL, "menu"); |
555 | html_txt(strlpart(buf, 20)); | 561 | html_txt(strlpart(buf, 20)); |
556 | html_link_close(); | 562 | html_link_close(); |
557 | return 0; | 563 | return 0; |
558 | } | 564 | } |
559 | 565 | ||
560 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 566 | void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) |
561 | { | 567 | { |
562 | char *url; | 568 | char *url; |
563 | 569 | ||
564 | if (!ctx.cfg.virtual_root) { | 570 | if (!ctx.cfg.virtual_root) { |
565 | url = fmt("%s/%s", ctx.qry.repo, page); | 571 | url = fmt("%s/%s", ctx.qry.repo, page); |
566 | if (ctx.qry.path) | 572 | if (ctx.qry.path) |
567 | url = fmt("%s/%s", url, ctx.qry.path); | 573 | url = fmt("%s/%s", url, ctx.qry.path); |
568 | html_hidden("url", url); | 574 | html_hidden("url", url); |
569 | } | 575 | } |
570 | 576 | ||
571 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && | 577 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && |
572 | strcmp(ctx.qry.head, ctx.repo->defbranch)) | 578 | strcmp(ctx.qry.head, ctx.repo->defbranch)) |
@@ -610,25 +616,25 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
610 | html_attr(cgit_rooturl()); | 616 | html_attr(cgit_rooturl()); |
611 | html("'><img src='"); | 617 | html("'><img src='"); |
612 | html_attr(ctx->cfg.logo); | 618 | html_attr(ctx->cfg.logo); |
613 | html("' alt='cgit logo'/></a></td>\n"); | 619 | html("' alt='cgit logo'/></a></td>\n"); |
614 | 620 | ||
615 | html("<td class='main'>"); | 621 | html("<td class='main'>"); |
616 | if (ctx->repo) { | 622 | if (ctx->repo) { |
617 | cgit_index_link("index", NULL, NULL, NULL, 0); | 623 | cgit_index_link("index", NULL, NULL, NULL, 0); |
618 | html(" : "); | 624 | html(" : "); |
619 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); | 625 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); |
620 | html("</td><td class='form'>"); | 626 | html("</td><td class='form'>"); |
621 | html("<form method='get' action=''>\n"); | 627 | html("<form method='get' action=''>\n"); |
622 | add_hidden_formfields(0, 1, ctx->qry.page); | 628 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); |
623 | html("<select name='h' onchange='this.form.submit();'>\n"); | 629 | html("<select name='h' onchange='this.form.submit();'>\n"); |
624 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 630 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
625 | html("</select> "); | 631 | html("</select> "); |
626 | html("<input type='submit' name='' value='switch'/>"); | 632 | html("<input type='submit' name='' value='switch'/>"); |
627 | html("</form>"); | 633 | html("</form>"); |
628 | } else | 634 | } else |
629 | html_txt(ctx->cfg.root_title); | 635 | html_txt(ctx->cfg.root_title); |
630 | html("</td></tr>\n"); | 636 | html("</td></tr>\n"); |
631 | 637 | ||
632 | html("<tr><td class='sub'>"); | 638 | html("<tr><td class='sub'>"); |
633 | if (ctx->repo) { | 639 | if (ctx->repo) { |
634 | html_txt(ctx->repo->desc); | 640 | html_txt(ctx->repo->desc); |
@@ -647,35 +653,38 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
647 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 653 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), |
648 | ctx->qry.head); | 654 | ctx->qry.head); |
649 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 655 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
650 | ctx->qry.sha1, NULL); | 656 | ctx->qry.sha1, NULL); |
651 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 657 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
652 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); | 658 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
653 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 659 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
654 | ctx->qry.sha1, NULL); | 660 | ctx->qry.sha1, NULL); |
655 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 661 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
656 | ctx->qry.head, ctx->qry.sha1); | 662 | ctx->qry.head, ctx->qry.sha1); |
657 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 663 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
658 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 664 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
665 | if (ctx->repo->max_stats) | ||
666 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), | ||
667 | ctx->qry.head, NULL); | ||
659 | if (ctx->repo->readme) | 668 | if (ctx->repo->readme) |
660 | reporevlink("about", "about", NULL, | 669 | reporevlink("about", "about", NULL, |
661 | hc(cmd, "about"), ctx->qry.head, NULL, | 670 | hc(cmd, "about"), ctx->qry.head, NULL, |
662 | NULL); | 671 | NULL); |
663 | html("</td><td class='form'>"); | 672 | html("</td><td class='form'>"); |
664 | html("<form class='right' method='get' action='"); | 673 | html("<form class='right' method='get' action='"); |
665 | if (ctx->cfg.virtual_root) | 674 | if (ctx->cfg.virtual_root) |
666 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 675 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
667 | ctx->qry.path, NULL)); | 676 | ctx->qry.path, NULL)); |
668 | html("'>\n"); | 677 | html("'>\n"); |
669 | add_hidden_formfields(1, 0, "log"); | 678 | cgit_add_hidden_formfields(1, 0, "log"); |
670 | html("<select name='qt'>\n"); | 679 | html("<select name='qt'>\n"); |
671 | html_option("grep", "log msg", ctx->qry.grep); | 680 | html_option("grep", "log msg", ctx->qry.grep); |
672 | html_option("author", "author", ctx->qry.grep); | 681 | html_option("author", "author", ctx->qry.grep); |
673 | html_option("committer", "committer", ctx->qry.grep); | 682 | html_option("committer", "committer", ctx->qry.grep); |
674 | html("</select>\n"); | 683 | html("</select>\n"); |
675 | html("<input class='txt' type='text' size='10' name='q' value='"); | 684 | html("<input class='txt' type='text' size='10' name='q' value='"); |
676 | html_attr(ctx->qry.search); | 685 | html_attr(ctx->qry.search); |
677 | html("'/>\n"); | 686 | html("'/>\n"); |
678 | html("<input type='submit' value='search'/>\n"); | 687 | html("<input type='submit' value='search'/>\n"); |
679 | html("</form>\n"); | 688 | html("</form>\n"); |
680 | } else { | 689 | } else { |
681 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 690 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); |
diff --git a/ui-shared.h b/ui-shared.h index 2ab53ae..5a3821f 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
@@ -21,26 +21,29 @@ extern void cgit_log_link(char *name, char *title, char *class, char *head, | |||
21 | char *rev, char *path, int ofs, char *grep, | 21 | char *rev, char *path, int ofs, char *grep, |
22 | char *pattern, int showmsg); | 22 | char *pattern, int showmsg); |
23 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 23 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
24 | char *rev); | 24 | char *rev); |
25 | extern void cgit_patch_link(char *name, char *title, char *class, char *head, | 25 | extern void cgit_patch_link(char *name, char *title, char *class, char *head, |
26 | char *rev); | 26 | char *rev); |
27 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, | 27 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, |
28 | char *rev, char *path); | 28 | char *rev, char *path); |
29 | extern void cgit_snapshot_link(char *name, char *title, char *class, | 29 | extern void cgit_snapshot_link(char *name, char *title, char *class, |
30 | char *head, char *rev, char *archivename); | 30 | char *head, char *rev, char *archivename); |
31 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 31 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
32 | char *new_rev, char *old_rev, char *path); | 32 | char *new_rev, char *old_rev, char *path); |
33 | extern void cgit_stats_link(char *name, char *title, char *class, char *head, | ||
34 | char *path); | ||
33 | extern void cgit_object_link(struct object *obj); | 35 | extern void cgit_object_link(struct object *obj); |
34 | 36 | ||
35 | extern void cgit_print_error(char *msg); | 37 | extern void cgit_print_error(char *msg); |
36 | extern void cgit_print_date(time_t secs, char *format, int local_time); | 38 | extern void cgit_print_date(time_t secs, char *format, int local_time); |
37 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); | 39 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); |
38 | extern void cgit_print_http_headers(struct cgit_context *ctx); | 40 | extern void cgit_print_http_headers(struct cgit_context *ctx); |
39 | extern void cgit_print_docstart(struct cgit_context *ctx); | 41 | extern void cgit_print_docstart(struct cgit_context *ctx); |
40 | extern void cgit_print_docend(); | 42 | extern void cgit_print_docend(); |
41 | extern void cgit_print_pageheader(struct cgit_context *ctx); | 43 | extern void cgit_print_pageheader(struct cgit_context *ctx); |
42 | extern void cgit_print_filemode(unsigned short mode); | 44 | extern void cgit_print_filemode(unsigned short mode); |
43 | extern void cgit_print_snapshot_links(const char *repo, const char *head, | 45 | extern void cgit_print_snapshot_links(const char *repo, const char *head, |
44 | const char *hex, int snapshots); | 46 | const char *hex, int snapshots); |
45 | 47 | extern void cgit_add_hidden_formfields(int incl_head, int incl_search, | |
48 | char *page); | ||
46 | #endif /* UI_SHARED_H */ | 49 | #endif /* UI_SHARED_H */ |
diff --git a/ui-stats.c b/ui-stats.c new file mode 100644 index 0000000..9fc06d3 --- a/dev/null +++ b/ui-stats.c | |||
@@ -0,0 +1,410 @@ | |||
1 | #include <string-list.h> | ||
2 | |||
3 | #include "cgit.h" | ||
4 | #include "html.h" | ||
5 | #include "ui-shared.h" | ||
6 | #include "ui-stats.h" | ||
7 | |||
8 | #define MONTHS 6 | ||
9 | |||
10 | struct authorstat { | ||
11 | long total; | ||
12 | struct string_list list; | ||
13 | }; | ||
14 | |||
15 | #define DAY_SECS (60 * 60 * 24) | ||
16 | #define WEEK_SECS (DAY_SECS * 7) | ||
17 | |||
18 | static void trunc_week(struct tm *tm) | ||
19 | { | ||
20 | time_t t = timegm(tm); | ||
21 | t -= ((tm->tm_wday + 6) % 7) * DAY_SECS; | ||
22 | gmtime_r(&t, tm); | ||
23 | } | ||
24 | |||
25 | static void dec_week(struct tm *tm) | ||
26 | { | ||
27 | time_t t = timegm(tm); | ||
28 | t -= WEEK_SECS; | ||
29 | gmtime_r(&t, tm); | ||
30 | } | ||
31 | |||
32 | static void inc_week(struct tm *tm) | ||
33 | { | ||
34 | time_t t = timegm(tm); | ||
35 | t += WEEK_SECS; | ||
36 | gmtime_r(&t, tm); | ||
37 | } | ||
38 | |||
39 | static char *pretty_week(struct tm *tm) | ||
40 | { | ||
41 | static char buf[10]; | ||
42 | |||
43 | strftime(buf, sizeof(buf), "W%V %G", tm); | ||
44 | return buf; | ||
45 | } | ||
46 | |||
47 | static void trunc_month(struct tm *tm) | ||
48 | { | ||
49 | tm->tm_mday = 1; | ||
50 | } | ||
51 | |||
52 | static void dec_month(struct tm *tm) | ||
53 | { | ||
54 | tm->tm_mon--; | ||
55 | if (tm->tm_mon < 0) { | ||
56 | tm->tm_year--; | ||
57 | tm->tm_mon = 11; | ||
58 | } | ||
59 | } | ||
60 | |||
61 | static void inc_month(struct tm *tm) | ||
62 | { | ||
63 | tm->tm_mon++; | ||
64 | if (tm->tm_mon > 11) { | ||
65 | tm->tm_year++; | ||
66 | tm->tm_mon = 0; | ||
67 | } | ||
68 | } | ||
69 | |||
70 | static char *pretty_month(struct tm *tm) | ||
71 | { | ||
72 | static const char *months[] = { | ||
73 | "Jan", "Feb", "Mar", "Apr", "May", "Jun", | ||
74 | "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" | ||
75 | }; | ||
76 | return fmt("%s %d", months[tm->tm_mon], tm->tm_year + 1900); | ||
77 | } | ||
78 | |||
79 | static void trunc_quarter(struct tm *tm) | ||
80 | { | ||
81 | trunc_month(tm); | ||
82 | while(tm->tm_mon % 3 != 0) | ||
83 | dec_month(tm); | ||
84 | } | ||
85 | |||
86 | static void dec_quarter(struct tm *tm) | ||
87 | { | ||
88 | dec_month(tm); | ||
89 | dec_month(tm); | ||
90 | dec_month(tm); | ||
91 | } | ||
92 | |||
93 | static void inc_quarter(struct tm *tm) | ||
94 | { | ||
95 | inc_month(tm); | ||
96 | inc_month(tm); | ||
97 | inc_month(tm); | ||
98 | } | ||
99 | |||
100 | static char *pretty_quarter(struct tm *tm) | ||
101 | { | ||
102 | return fmt("Q%d %d", tm->tm_mon / 3 + 1, tm->tm_year + 1900); | ||
103 | } | ||
104 | |||
105 | static void trunc_year(struct tm *tm) | ||
106 | { | ||
107 | trunc_month(tm); | ||
108 | tm->tm_mon = 0; | ||
109 | } | ||
110 | |||
111 | static void dec_year(struct tm *tm) | ||
112 | { | ||
113 | tm->tm_year--; | ||
114 | } | ||
115 | |||
116 | static void inc_year(struct tm *tm) | ||
117 | { | ||
118 | tm->tm_year++; | ||
119 | } | ||
120 | |||
121 | static char *pretty_year(struct tm *tm) | ||
122 | { | ||
123 | return fmt("%d", tm->tm_year + 1900); | ||
124 | } | ||
125 | |||
126 | struct cgit_period periods[] = { | ||
127 | {'w', "week", 12, 4, trunc_week, dec_week, inc_week, pretty_week}, | ||
128 | {'m', "month", 12, 4, trunc_month, dec_month, inc_month, pretty_month}, | ||
129 | {'q', "quarter", 12, 4, trunc_quarter, dec_quarter, inc_quarter, pretty_quarter}, | ||
130 | {'y', "year", 12, 4, trunc_year, dec_year, inc_year, pretty_year}, | ||
131 | }; | ||
132 | |||
133 | /* Given a period code or name, return a period index (1, 2, 3 or 4) | ||
134 | * and update the period pointer to the correcsponding struct. | ||
135 | * If no matching code is found, return 0. | ||
136 | */ | ||
137 | int cgit_find_stats_period(const char *expr, struct cgit_period **period) | ||
138 | { | ||
139 | int i; | ||
140 | char code = '\0'; | ||
141 | |||
142 | if (!expr) | ||
143 | return 0; | ||
144 | |||
145 | if (strlen(expr) == 1) | ||
146 | code = expr[0]; | ||
147 | |||
148 | for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++) | ||
149 | if (periods[i].code == code || !strcmp(periods[i].name, expr)) { | ||
150 | if (period) | ||
151 | *period = &periods[i]; | ||
152 | return i+1; | ||
153 | } | ||
154 | return 0; | ||
155 | } | ||
156 | |||
157 | static void add_commit(struct string_list *authors, struct commit *commit, | ||
158 | struct cgit_period *period) | ||
159 | { | ||
160 | struct commitinfo *info; | ||
161 | struct string_list_item *author, *item; | ||
162 | struct authorstat *authorstat; | ||
163 | struct string_list *items; | ||
164 | char *tmp; | ||
165 | struct tm *date; | ||
166 | time_t t; | ||
167 | |||
168 | info = cgit_parse_commit(commit); | ||
169 | tmp = xstrdup(info->author); | ||
170 | author = string_list_insert(tmp, authors); | ||
171 | if (!author->util) | ||
172 | author->util = xcalloc(1, sizeof(struct authorstat)); | ||
173 | else | ||
174 | free(tmp); | ||
175 | authorstat = author->util; | ||
176 | items = &authorstat->list; | ||
177 | t = info->committer_date; | ||
178 | date = gmtime(&t); | ||
179 | period->trunc(date); | ||
180 | tmp = xstrdup(period->pretty(date)); | ||
181 | item = string_list_insert(tmp, items); | ||
182 | if (item->util) | ||
183 | free(tmp); | ||
184 | item->util++; | ||
185 | authorstat->total++; | ||
186 | cgit_free_commitinfo(info); | ||
187 | } | ||
188 | |||
189 | static int cmp_total_commits(const void *a1, const void *a2) | ||
190 | { | ||
191 | const struct string_list_item *i1 = a1; | ||
192 | const struct string_list_item *i2 = a2; | ||
193 | const struct authorstat *auth1 = i1->util; | ||
194 | const struct authorstat *auth2 = i2->util; | ||
195 | |||
196 | return auth2->total - auth1->total; | ||
197 | } | ||
198 | |||
199 | /* Walk the commit DAG and collect number of commits per author per | ||
200 | * timeperiod into a nested string_list collection. | ||
201 | */ | ||
202 | struct string_list collect_stats(struct cgit_context *ctx, | ||
203 | struct cgit_period *period) | ||
204 | { | ||
205 | struct string_list authors; | ||
206 | struct rev_info rev; | ||
207 | struct commit *commit; | ||
208 | const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL}; | ||
209 | int argc = 3; | ||
210 | time_t now; | ||
211 | long i; | ||
212 | struct tm *tm; | ||
213 | char tmp[11]; | ||
214 | |||
215 | time(&now); | ||
216 | tm = gmtime(&now); | ||
217 | period->trunc(tm); | ||
218 | for (i = 1; i < period->count; i++) | ||
219 | period->dec(tm); | ||
220 | strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm); | ||
221 | argv[2] = xstrdup(fmt("--since=%s", tmp)); | ||
222 | if (ctx->qry.path) { | ||
223 | argv[3] = "--"; | ||
224 | argv[4] = ctx->qry.path; | ||
225 | argc += 2; | ||
226 | } | ||
227 | init_revisions(&rev, NULL); | ||
228 | rev.abbrev = DEFAULT_ABBREV; | ||
229 | rev.commit_format = CMIT_FMT_DEFAULT; | ||
230 | rev.no_merges = 1; | ||
231 | rev.verbose_header = 1; | ||
232 | rev.show_root_diff = 0; | ||
233 | setup_revisions(argc, argv, &rev, NULL); | ||
234 | prepare_revision_walk(&rev); | ||
235 | memset(&authors, 0, sizeof(authors)); | ||
236 | while ((commit = get_revision(&rev)) != NULL) { | ||
237 | add_commit(&authors, commit, period); | ||
238 | free(commit->buffer); | ||
239 | free_commit_list(commit->parents); | ||
240 | } | ||
241 | return authors; | ||
242 | } | ||
243 | |||
244 | void print_combined_authorrow(struct string_list *authors, int from, int to, | ||
245 | const char *name, const char *leftclass, const char *centerclass, | ||
246 | const char *rightclass, struct cgit_period *period) | ||
247 | { | ||
248 | struct string_list_item *author; | ||
249 | struct authorstat *authorstat; | ||
250 | struct string_list *items; | ||
251 | struct string_list_item *date; | ||
252 | time_t now; | ||
253 | long i, j, total, subtotal; | ||
254 | struct tm *tm; | ||
255 | char *tmp; | ||
256 | |||
257 | time(&now); | ||
258 | tm = gmtime(&now); | ||
259 | period->trunc(tm); | ||
260 | for (i = 1; i < period->count; i++) | ||
261 | period->dec(tm); | ||
262 | |||
263 | total = 0; | ||
264 | htmlf("<tr><td class='%s'>%s</td>", leftclass, | ||
265 | fmt(name, to - from + 1)); | ||
266 | for (j = 0; j < period->count; j++) { | ||
267 | tmp = period->pretty(tm); | ||
268 | period->inc(tm); | ||
269 | subtotal = 0; | ||
270 | for (i = from; i <= to; i++) { | ||
271 | author = &authors->items[i]; | ||
272 | authorstat = author->util; | ||
273 | items = &authorstat->list; | ||
274 | date = string_list_lookup(tmp, items); | ||
275 | if (date) | ||
276 | subtotal += (size_t)date->util; | ||
277 | } | ||
278 | htmlf("<td class='%s'>%d</td>", centerclass, subtotal); | ||
279 | total += subtotal; | ||
280 | } | ||
281 | htmlf("<td class='%s'>%d</td></tr>", rightclass, total); | ||
282 | } | ||
283 | |||
284 | void print_authors(struct string_list *authors, int top, | ||
285 | struct cgit_period *period) | ||
286 | { | ||
287 | struct string_list_item *author; | ||
288 | struct authorstat *authorstat; | ||
289 | struct string_list *items; | ||
290 | struct string_list_item *date; | ||
291 | time_t now; | ||
292 | long i, j, total; | ||
293 | struct tm *tm; | ||
294 | char *tmp; | ||
295 | |||
296 | time(&now); | ||
297 | tm = gmtime(&now); | ||
298 | period->trunc(tm); | ||
299 | for (i = 1; i < period->count; i++) | ||
300 | period->dec(tm); | ||
301 | |||
302 | html("<table class='stats'><tr><th>Author</th>"); | ||
303 | for (j = 0; j < period->count; j++) { | ||
304 | tmp = period->pretty(tm); | ||
305 | htmlf("<th>%s</th>", tmp); | ||
306 | period->inc(tm); | ||
307 | } | ||
308 | html("<th>Total</th></tr>\n"); | ||
309 | |||
310 | if (top <= 0 || top > authors->nr) | ||
311 | top = authors->nr; | ||
312 | |||
313 | for (i = 0; i < top; i++) { | ||
314 | author = &authors->items[i]; | ||
315 | html("<tr><td class='left'>"); | ||
316 | html_txt(author->string); | ||
317 | html("</td>"); | ||
318 | authorstat = author->util; | ||
319 | items = &authorstat->list; | ||
320 | total = 0; | ||
321 | for (j = 0; j < period->count; j++) | ||
322 | period->dec(tm); | ||
323 | for (j = 0; j < period->count; j++) { | ||
324 | tmp = period->pretty(tm); | ||
325 | period->inc(tm); | ||
326 | date = string_list_lookup(tmp, items); | ||
327 | if (!date) | ||
328 | html("<td>0</td>"); | ||
329 | else { | ||
330 | htmlf("<td>%d</td>", date->util); | ||
331 | total += (size_t)date->util; | ||
332 | } | ||
333 | } | ||
334 | htmlf("<td class='sum'>%d</td></tr>", total); | ||
335 | } | ||
336 | |||
337 | if (top < authors->nr) | ||
338 | print_combined_authorrow(authors, top, authors->nr - 1, | ||
339 | "Others (%d)", "left", "", "sum", period); | ||
340 | |||
341 | print_combined_authorrow(authors, 0, authors->nr - 1, "Total", | ||
342 | "total", "sum", "sum", period); | ||
343 | html("</table>"); | ||
344 | } | ||
345 | |||
346 | /* Create a sorted string_list with one entry per author. The util-field | ||
347 | * for each author is another string_list which is used to calculate the | ||
348 | * number of commits per time-interval. | ||
349 | */ | ||
350 | void cgit_show_stats(struct cgit_context *ctx) | ||
351 | { | ||
352 | struct string_list authors; | ||
353 | struct cgit_period *period; | ||
354 | int top, i; | ||
355 | const char *code = "w"; | ||
356 | |||
357 | if (ctx->qry.period) | ||
358 | code = ctx->qry.period; | ||
359 | |||
360 | i = cgit_find_stats_period(code, &period); | ||
361 | if (!i) { | ||
362 | cgit_print_error(fmt("Unknown statistics type: %c", code)); | ||
363 | return; | ||
364 | } | ||
365 | if (i > ctx->repo->max_stats) { | ||
366 | cgit_print_error(fmt("Statistics type disabled: %s", | ||
367 | period->name)); | ||
368 | return; | ||
369 | } | ||
370 | authors = collect_stats(ctx, period); | ||
371 | qsort(authors.items, authors.nr, sizeof(struct string_list_item), | ||
372 | cmp_total_commits); | ||
373 | |||
374 | top = ctx->qry.ofs; | ||
375 | if (!top) | ||
376 | top = 10; | ||
377 | htmlf("<h2>Commits per author per %s", period->name); | ||
378 | if (ctx->qry.path) { | ||
379 | html(" (path '"); | ||
380 | html_txt(ctx->qry.path); | ||
381 | html("')"); | ||
382 | } | ||
383 | html("</h2>"); | ||
384 | |||
385 | html("<form method='get' action='' style='float: right; text-align: right;'>"); | ||
386 | cgit_add_hidden_formfields(1, 0, "stats"); | ||
387 | if (ctx->repo->max_stats > 1) { | ||
388 | html("Period: "); | ||
389 | html("<select name='period' onchange='this.form.submit();'>"); | ||
390 | for (i = 0; i < ctx->repo->max_stats; i++) | ||
391 | htmlf("<option value='%c'%s>%s</option>", | ||
392 | periods[i].code, | ||
393 | period == &periods[i] ? " selected" : "", | ||
394 | periods[i].name); | ||
395 | html("</select><br/><br/>"); | ||
396 | } | ||
397 | html("Authors: "); | ||
398 | html(""); | ||
399 | html("<select name='ofs' onchange='this.form.submit();'>"); | ||
400 | htmlf("<option value='10'%s>10</option>", top == 10 ? " selected" : ""); | ||
401 | htmlf("<option value='25'%s>25</option>", top == 25 ? " selected" : ""); | ||
402 | htmlf("<option value='50'%s>50</option>", top == 50 ? " selected" : ""); | ||
403 | htmlf("<option value='100'%s>100</option>", top == 100 ? " selected" : ""); | ||
404 | htmlf("<option value='-1'%s>All</option>", top == -1 ? " selected" : ""); | ||
405 | html("</select>"); | ||
406 | html("<noscript> <input type='submit' value='Reload'/></noscript>"); | ||
407 | html("</form>"); | ||
408 | print_authors(&authors, top, period); | ||
409 | } | ||
410 | |||
diff --git a/ui-stats.h b/ui-stats.h new file mode 100644 index 0000000..4f13dba --- a/dev/null +++ b/ui-stats.h | |||
@@ -0,0 +1,27 @@ | |||
1 | #ifndef UI_STATS_H | ||
2 | #define UI_STATS_H | ||
3 | |||
4 | #include "cgit.h" | ||
5 | |||
6 | struct cgit_period { | ||
7 | const char code; | ||
8 | const char *name; | ||
9 | int max_periods; | ||
10 | int count; | ||
11 | |||
12 | /* Convert a tm value to the first day in the period */ | ||
13 | void (*trunc)(struct tm *tm); | ||
14 | |||
15 | /* Update tm value to start of next/previous period */ | ||
16 | void (*dec)(struct tm *tm); | ||
17 | void (*inc)(struct tm *tm); | ||
18 | |||
19 | /* Pretty-print a tm value */ | ||
20 | char *(*pretty)(struct tm *tm); | ||
21 | }; | ||
22 | |||
23 | extern int cgit_find_stats_period(const char *expr, struct cgit_period **period); | ||
24 | |||
25 | extern void cgit_show_stats(struct cgit_context *ctx); | ||
26 | |||
27 | #endif /* UI_STATS_H */ | ||
@@ -9,65 +9,66 @@ | |||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | 12 | ||
13 | char *curr_rev; | 13 | char *curr_rev; |
14 | char *match_path; | 14 | char *match_path; |
15 | int header = 0; | 15 | int header = 0; |
16 | 16 | ||
17 | static void print_object(const unsigned char *sha1, char *path) | 17 | static void print_object(const unsigned char *sha1, char *path) |
18 | { | 18 | { |
19 | enum object_type type; | 19 | enum object_type type; |
20 | char *buf; | 20 | char *buf; |
21 | unsigned long size, lineno, start, idx; | 21 | unsigned long size, lineno, idx; |
22 | const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>"; | 22 | const char *numberfmt = "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n"; |
23 | 23 | ||
24 | type = sha1_object_info(sha1, &size); | 24 | type = sha1_object_info(sha1, &size); |
25 | if (type == OBJ_BAD) { | 25 | if (type == OBJ_BAD) { |
26 | cgit_print_error(fmt("Bad object name: %s", | 26 | cgit_print_error(fmt("Bad object name: %s", |
27 | sha1_to_hex(sha1))); | 27 | sha1_to_hex(sha1))); |
28 | return; | 28 | return; |
29 | } | 29 | } |
30 | 30 | ||
31 | buf = read_sha1_file(sha1, &type, &size); | 31 | buf = read_sha1_file(sha1, &type, &size); |
32 | if (!buf) { | 32 | if (!buf) { |
33 | cgit_print_error(fmt("Error reading object %s", | 33 | cgit_print_error(fmt("Error reading object %s", |
34 | sha1_to_hex(sha1))); | 34 | sha1_to_hex(sha1))); |
35 | return; | 35 | return; |
36 | } | 36 | } |
37 | 37 | ||
38 | html(" ("); | 38 | html(" ("); |
39 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, | 39 | cgit_plain_link("plain", NULL, NULL, ctx.qry.head, |
40 | curr_rev, path); | 40 | curr_rev, path); |
41 | htmlf(")<br/>blob: %s", sha1_to_hex(sha1)); | 41 | htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1)); |
42 | 42 | ||
43 | html("<table summary='blob content' class='blob'>\n"); | 43 | html("<table summary='blob content' class='blob'>\n"); |
44 | html("<tr>\n"); | ||
45 | |||
46 | html("<td class='linenumbers'><pre>"); | ||
44 | idx = 0; | 47 | idx = 0; |
45 | start = 0; | ||
46 | lineno = 0; | 48 | lineno = 0; |
47 | while(idx < size) { | 49 | htmlf(numberfmt, ++lineno); |
50 | while(idx < size - 1) { // skip absolute last newline | ||
48 | if (buf[idx] == '\n') { | 51 | if (buf[idx] == '\n') { |
49 | buf[idx] = '\0'; | 52 | htmlf(numberfmt, ++lineno); |
50 | htmlf(linefmt, ++lineno); | ||
51 | html_txt(buf + start); | ||
52 | html("</td></tr>\n"); | ||
53 | start = idx + 1; | ||
54 | } | 53 | } |
55 | idx++; | 54 | idx++; |
56 | } | 55 | } |
57 | if (start < idx) { | 56 | html("</pre></td>\n"); |
58 | htmlf(linefmt, ++lineno); | 57 | |
59 | html_txt(buf + start); | 58 | html("<td class='lines'><pre><code>"); |
60 | } | 59 | html_txt(buf); |
61 | html("</td></tr>\n"); | 60 | html("</code></pre></td>\n"); |
61 | |||
62 | html("</tr>\n"); | ||
62 | html("</table>\n"); | 63 | html("</table>\n"); |
63 | } | 64 | } |
64 | 65 | ||
65 | 66 | ||
66 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, | 67 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
67 | const char *pathname, unsigned int mode, int stage, | 68 | const char *pathname, unsigned int mode, int stage, |
68 | void *cbdata) | 69 | void *cbdata) |
69 | { | 70 | { |
70 | char *name; | 71 | char *name; |
71 | char *fullpath; | 72 | char *fullpath; |
72 | enum object_type type; | 73 | enum object_type type; |
73 | unsigned long size = 0; | 74 | unsigned long size = 0; |
@@ -100,24 +101,27 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, | |||
100 | } else if (S_ISDIR(mode)) { | 101 | } else if (S_ISDIR(mode)) { |
101 | cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, | 102 | cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, |
102 | curr_rev, fullpath); | 103 | curr_rev, fullpath); |
103 | } else { | 104 | } else { |
104 | cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, | 105 | cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head, |
105 | curr_rev, fullpath); | 106 | curr_rev, fullpath); |
106 | } | 107 | } |
107 | htmlf("</td><td class='ls-size'>%li</td>", size); | 108 | htmlf("</td><td class='ls-size'>%li</td>", size); |
108 | 109 | ||
109 | html("<td>"); | 110 | html("<td>"); |
110 | cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, | 111 | cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev, |
111 | fullpath, 0, NULL, NULL, ctx.qry.showmsg); | 112 | fullpath, 0, NULL, NULL, ctx.qry.showmsg); |
113 | if (ctx.repo->max_stats) | ||
114 | cgit_stats_link("stats", NULL, "button", ctx.qry.head, | ||
115 | fullpath); | ||
112 | html("</td></tr>\n"); | 116 | html("</td></tr>\n"); |
113 | free(name); | 117 | free(name); |
114 | return 0; | 118 | return 0; |
115 | } | 119 | } |
116 | 120 | ||
117 | static void ls_head() | 121 | static void ls_head() |
118 | { | 122 | { |
119 | html("<table summary='tree listing' class='list'>\n"); | 123 | html("<table summary='tree listing' class='list'>\n"); |
120 | html("<tr class='nohover'>"); | 124 | html("<tr class='nohover'>"); |
121 | html("<th class='left'>Mode</th>"); | 125 | html("<th class='left'>Mode</th>"); |
122 | html("<th class='left'>Name</th>"); | 126 | html("<th class='left'>Name</th>"); |
123 | html("<th class='right'>Size</th>"); | 127 | html("<th class='right'>Size</th>"); |