aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--cgit.c6
-rw-r--r--cgit.css77
-rw-r--r--cgit.h3
-rw-r--r--cgitrc.5.txt8
-rw-r--r--cmd.c10
-rw-r--r--shared.c1
-rw-r--r--ui-shared.c3
-rw-r--r--ui-stats.c380
-rw-r--r--ui-stats.h8
10 files changed, 497 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 561af76..f426f98 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,7 @@ OBJECTS += ui-refs.o
68OBJECTS += ui-repolist.o 68OBJECTS += ui-repolist.o
69OBJECTS += ui-shared.o 69OBJECTS += ui-shared.o
70OBJECTS += ui-snapshot.o 70OBJECTS += ui-snapshot.o
71OBJECTS += ui-stats.o
71OBJECTS += ui-summary.o 72OBJECTS += ui-summary.o
72OBJECTS += ui-tag.o 73OBJECTS += ui-tag.o
73OBJECTS += ui-tree.o 74OBJECTS += ui-tree.o
diff --git a/cgit.c b/cgit.c
index c82587b..22b6d7c 100644
--- a/cgit.c
+++ b/cgit.c
@@ -54,6 +54,8 @@ void config_cb(const char *name, const char *value)
54 ctx.cfg.enable_log_filecount = atoi(value); 54 ctx.cfg.enable_log_filecount = atoi(value);
55 else if (!strcmp(name, "enable-log-linecount")) 55 else if (!strcmp(name, "enable-log-linecount"))
56 ctx.cfg.enable_log_linecount = atoi(value); 56 ctx.cfg.enable_log_linecount = atoi(value);
57 else if (!strcmp(name, "enable-stats"))
58 ctx.cfg.enable_stats = atoi(value);
57 else if (!strcmp(name, "cache-size")) 59 else if (!strcmp(name, "cache-size"))
58 ctx.cfg.cache_size = atoi(value); 60 ctx.cfg.cache_size = atoi(value);
59 else if (!strcmp(name, "cache-root")) 61 else if (!strcmp(name, "cache-root"))
@@ -112,6 +114,8 @@ void config_cb(const char *name, const char *value)
112 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); 114 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
113 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) 115 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
114 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); 116 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
117 else if (ctx.repo && !strcmp(name, "repo.enable-stats"))
118 ctx.repo->enable_stats = ctx.cfg.enable_stats && atoi(value);
115 else if (ctx.repo && !strcmp(name, "repo.module-link")) 119 else if (ctx.repo && !strcmp(name, "repo.module-link"))
116 ctx.repo->module_link= xstrdup(value); 120 ctx.repo->module_link= xstrdup(value);
117 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { 121 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
@@ -154,6 +158,8 @@ static void querystring_cb(const char *name, const char *value)
154 ctx.qry.name = xstrdup(value); 158 ctx.qry.name = xstrdup(value);
155 } else if (!strcmp(name, "mimetype")) { 159 } else if (!strcmp(name, "mimetype")) {
156 ctx.qry.mimetype = xstrdup(value); 160 ctx.qry.mimetype = xstrdup(value);
161 } else if (!strcmp(name, "period")) {
162 ctx.qry.period = xstrdup(value);
157 } 163 }
158} 164}
159 165
diff --git a/cgit.css b/cgit.css
index a37d218..ef30fbf 100644
--- a/cgit.css
+++ b/cgit.css
@@ -456,3 +456,80 @@ div.footer {
456 font-size: 80%; 456 font-size: 80%;
457 color: #ccc; 457 color: #ccc;
458} 458}
459table.stats {
460 border: solid 1px black;
461 border-collapse: collapse;
462}
463
464table.stats th {
465 text-align: left;
466 padding: 1px 0.5em;
467 background-color: #eee;
468 border: solid 1px black;
469}
470
471table.stats td {
472 text-align: right;
473 padding: 1px 0.5em;
474 border: solid 1px black;
475}
476
477table.stats td.total {
478 font-weight: bold;
479 text-align: left;
480}
481
482table.stats td.sum {
483 color: #c00;
484 font-weight: bold;
485/* background-color: #eee; */
486}
487
488table.stats td.left {
489 text-align: left;
490}
491
492table.vgraph {
493 border-collapse: separate;
494 border: solid 1px black;
495 height: 200px;
496}
497
498table.vgraph th {
499 background-color: #eee;
500 font-weight: bold;
501 border: solid 1px white;
502 padding: 1px 0.5em;
503}
504
505table.vgraph td {
506 vertical-align: bottom;
507 padding: 0px 10px;
508}
509
510table.vgraph div.bar {
511 background-color: #eee;
512}
513
514table.hgraph {
515 border: solid 1px black;
516 width: 800px;
517}
518
519table.hgraph th {
520 background-color: #eee;
521 font-weight: bold;
522 border: solid 1px black;
523 padding: 1px 0.5em;
524}
525
526table.hgraph td {
527 vertical-align: center;
528 padding: 2px 2px;
529}
530
531table.hgraph div.bar {
532 background-color: #eee;
533 height: 1em;
534}
535
diff --git a/cgit.h b/cgit.h
index 91db98a..85045c4 100644
--- a/cgit.h
+++ b/cgit.h
@@ -61,6 +61,7 @@ struct cgit_repo {
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 enable_stats;
64}; 65};
65 66
66struct cgit_repolist { 67struct cgit_repolist {
@@ -119,6 +120,7 @@ struct cgit_query {
119 char *name; 120 char *name;
120 char *mimetype; 121 char *mimetype;
121 char *url; 122 char *url;
123 char *period;
122 int ofs; 124 int ofs;
123 int nohead; 125 int nohead;
124}; 126};
@@ -151,6 +153,7 @@ struct cgit_config {
151 int enable_index_links; 153 int enable_index_links;
152 int enable_log_filecount; 154 int enable_log_filecount;
153 int enable_log_linecount; 155 int enable_log_linecount;
156 int enable_stats;
154 int local_time; 157 int local_time;
155 int max_repo_count; 158 int max_repo_count;
156 int max_commit_count; 159 int max_commit_count;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 7887b02..60d3ea4 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -74,6 +74,10 @@ enable-log-linecount
74 and removed lines for each commit on the repository log page. Default 74 and removed lines for each commit on the repository log page. Default
75 value: "0". 75 value: "0".
76 76
77enable-stats
78 Globally enable/disable statistics for each repository. Default
79 value: "0".
80
77favicon 81favicon
78 Url used as link to a shortcut icon for cgit. If specified, it is 82 Url used as link to a shortcut icon for cgit. If specified, it is
79 suggested to use the value "/favicon.ico" since certain browsers will 83 suggested to use the value "/favicon.ico" since certain browsers will
@@ -218,6 +222,10 @@ repo.enable-log-linecount
218 A flag which can be used to disable the global setting 222 A flag which can be used to disable the global setting
219 `enable-log-linecount'. Default value: none. 223 `enable-log-linecount'. Default value: none.
220 224
225repo.enable-stats
226 A flag which can be used to disable the global setting
227 `enable-stats'. Default value: none.
228
221repo.name 229repo.name
222 The value to show as repository name. Default value: <repo.url>. 230 The value to show as repository name. Default value: <repo.url>.
223 231
diff --git a/cmd.c b/cmd.c
index 5b3c14c..744bf84 100644
--- a/cmd.c
+++ b/cmd.c
@@ -21,6 +21,7 @@
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"
@@ -109,6 +110,14 @@ static void snapshot_fn(struct cgit_context *ctx)
109 ctx->repo->snapshots, ctx->qry.nohead); 110 ctx->repo->snapshots, ctx->qry.nohead);
110} 111}
111 112
113static void stats_fn(struct cgit_context *ctx)
114{
115 if (ctx->repo->enable_stats)
116 cgit_show_stats(ctx);
117 else
118 cgit_print_error("Stats disabled for this repo");
119}
120
112static void summary_fn(struct cgit_context *ctx) 121static void summary_fn(struct cgit_context *ctx)
113{ 122{
114 cgit_print_summary(); 123 cgit_print_summary();
@@ -145,6 +154,7 @@ struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
145 def_cmd(refs, 1, 1), 154 def_cmd(refs, 1, 1),
146 def_cmd(repolist, 0, 0), 155 def_cmd(repolist, 0, 0),
147 def_cmd(snapshot, 1, 0), 156 def_cmd(snapshot, 1, 0),
157 def_cmd(stats, 1, 1),
148 def_cmd(summary, 1, 1), 158 def_cmd(summary, 1, 1),
149 def_cmd(tag, 1, 1), 159 def_cmd(tag, 1, 1),
150 def_cmd(tree, 1, 1), 160 def_cmd(tree, 1, 1),
diff --git a/shared.c b/shared.c
index f5875e4..37333f0 100644
--- a/shared.c
+++ b/shared.c
@@ -58,6 +58,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
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->enable_stats = ctx.cfg.enable_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 return ret; 64 return ret;
diff --git a/ui-shared.c b/ui-shared.c
index 224e5f3..0e688a0 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -641,6 +641,9 @@ void cgit_print_pageheader(struct cgit_context *ctx)
641 ctx->qry.head, ctx->qry.sha1); 641 ctx->qry.head, ctx->qry.sha1);
642 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, 642 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
643 ctx->qry.sha1, ctx->qry.sha2, NULL); 643 ctx->qry.sha1, ctx->qry.sha2, NULL);
644 if (ctx->repo->enable_stats)
645 reporevlink("stats", "stats", NULL, hc(cmd, "stats"),
646 ctx->qry.head, NULL, NULL);
644 if (ctx->repo->readme) 647 if (ctx->repo->readme)
645 reporevlink("about", "about", NULL, 648 reporevlink("about", "about", NULL,
646 hc(cmd, "about"), ctx->qry.head, NULL, 649 hc(cmd, "about"), ctx->qry.head, NULL,
diff --git a/ui-stats.c b/ui-stats.c
new file mode 100644
index 0000000..9150840
--- /dev/null
+++ b/ui-stats.c
@@ -0,0 +1,380 @@
1#include "cgit.h"
2#include "html.h"
3#include <string-list.h>
4
5#define MONTHS 6
6
7struct Period {
8 const char code;
9 const char *name;
10 int max_periods;
11 int count;
12
13 /* Convert a tm value to the first day in the period */
14 void (*trunc)(struct tm *tm);
15
16 /* Update tm value to start of next/previous period */
17 void (*dec)(struct tm *tm);
18 void (*inc)(struct tm *tm);
19
20 /* Pretty-print a tm value */
21 char *(*pretty)(struct tm *tm);
22};
23
24struct authorstat {
25 long total;
26 struct string_list list;
27};
28
29#define DAY_SECS (60 * 60 * 24)
30#define WEEK_SECS (DAY_SECS * 7)
31
32static void trunc_week(struct tm *tm)
33{
34 time_t t = timegm(tm);
35 t -= ((tm->tm_wday + 6) % 7) * DAY_SECS;
36 gmtime_r(&t, tm);
37}
38
39static void dec_week(struct tm *tm)
40{
41 time_t t = timegm(tm);
42 t -= WEEK_SECS;
43 gmtime_r(&t, tm);
44}
45
46static void inc_week(struct tm *tm)
47{
48 time_t t = timegm(tm);
49 t += WEEK_SECS;
50 gmtime_r(&t, tm);
51}
52
53static char *pretty_week(struct tm *tm)
54{
55 static char buf[10];
56
57 strftime(buf, sizeof(buf), "W%V %G", tm);
58 return buf;
59}
60
61static void trunc_month(struct tm *tm)
62{
63 tm->tm_mday = 1;
64}
65
66static void dec_month(struct tm *tm)
67{
68 tm->tm_mon--;
69 if (tm->tm_mon < 0) {
70 tm->tm_year--;
71 tm->tm_mon = 11;
72 }
73}
74
75static void inc_month(struct tm *tm)
76{
77 tm->tm_mon++;
78 if (tm->tm_mon > 11) {
79 tm->tm_year++;
80 tm->tm_mon = 0;
81 }
82}
83
84static char *pretty_month(struct tm *tm)
85{
86 static const char *months[] = {
87 "Jan", "Feb", "Mar", "Apr", "May", "Jun",
88 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
89 };
90 return fmt("%s %d", months[tm->tm_mon], tm->tm_year + 1900);
91}
92
93static void trunc_quarter(struct tm *tm)
94{
95 trunc_month(tm);
96 while(tm->tm_mon % 3 != 0)
97 dec_month(tm);
98}
99
100static void dec_quarter(struct tm *tm)
101{
102 dec_month(tm);
103 dec_month(tm);
104 dec_month(tm);
105}
106
107static void inc_quarter(struct tm *tm)
108{
109 inc_month(tm);
110 inc_month(tm);
111 inc_month(tm);
112}
113
114static char *pretty_quarter(struct tm *tm)
115{
116 return fmt("Q%d %d", tm->tm_mon / 3 + 1, tm->tm_year + 1900);
117}
118
119static void trunc_year(struct tm *tm)
120{
121 trunc_month(tm);
122 tm->tm_mon = 0;
123}
124
125static void dec_year(struct tm *tm)
126{
127 tm->tm_year--;
128}
129
130static void inc_year(struct tm *tm)
131{
132 tm->tm_year++;
133}
134
135static char *pretty_year(struct tm *tm)
136{
137 return fmt("%d", tm->tm_year + 1900);
138}
139
140struct Period periods[] = {
141 {'w', "week", 12, 4, trunc_week, dec_week, inc_week, pretty_week},
142 {'m', "month", 12, 4, trunc_month, dec_month, inc_month, pretty_month},
143 {'q', "quarter", 12, 4, trunc_quarter, dec_quarter, inc_quarter, pretty_quarter},
144 {'y', "year", 12, 4, trunc_year, dec_year, inc_year, pretty_year},
145};
146
147static void add_commit(struct string_list *authors, struct commit *commit,
148 struct Period *period)
149{
150 struct commitinfo *info;
151 struct string_list_item *author, *item;
152 struct authorstat *authorstat;
153 struct string_list *items;
154 char *tmp;
155 struct tm *date;
156 time_t t;
157
158 info = cgit_parse_commit(commit);
159 tmp = xstrdup(info->author);
160 author = string_list_insert(tmp, authors);
161 if (!author->util)
162 author->util = xcalloc(1, sizeof(struct authorstat));
163 else
164 free(tmp);
165 authorstat = author->util;
166 items = &authorstat->list;
167 t = info->committer_date;
168 date = gmtime(&t);
169 period->trunc(date);
170 tmp = xstrdup(period->pretty(date));
171 item = string_list_insert(tmp, items);
172 if (item->util)
173 free(tmp);
174 item->util++;
175 authorstat->total++;
176 cgit_free_commitinfo(info);
177}
178
179static int cmp_total_commits(const void *a1, const void *a2)
180{
181 const struct string_list_item *i1 = a1;
182 const struct string_list_item *i2 = a2;
183 const struct authorstat *auth1 = i1->util;
184 const struct authorstat *auth2 = i2->util;
185
186 return auth2->total - auth1->total;
187}
188
189/* Walk the commit DAG and collect number of commits per author per
190 * timeperiod into a nested string_list collection.
191 */
192struct string_list collect_stats(struct cgit_context *ctx,
193 struct Period *period)
194{
195 struct string_list authors;
196 struct rev_info rev;
197 struct commit *commit;
198 const char *argv[] = {NULL, ctx->qry.head, NULL, NULL};
199 time_t now;
200 long i;
201 struct tm *tm;
202 char tmp[11];
203
204 time(&now);
205 tm = gmtime(&now);
206 period->trunc(tm);
207 for (i = 1; i < period->count; i++)
208 period->dec(tm);
209 strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm);
210 argv[2] = xstrdup(fmt("--since=%s", tmp));
211 init_revisions(&rev, NULL);
212 rev.abbrev = DEFAULT_ABBREV;
213 rev.commit_format = CMIT_FMT_DEFAULT;
214 rev.no_merges = 1;
215 rev.verbose_header = 1;
216 rev.show_root_diff = 0;
217 setup_revisions(3, argv, &rev, NULL);
218 prepare_revision_walk(&rev);
219 memset(&authors, 0, sizeof(authors));
220 while ((commit = get_revision(&rev)) != NULL) {
221 add_commit(&authors, commit, period);
222 free(commit->buffer);
223 free_commit_list(commit->parents);
224 }
225 return authors;
226}
227
228void print_combined_authorrow(struct string_list *authors, int from, int to,
229 const char *name, const char *leftclass, const char *centerclass,
230 const char *rightclass, struct Period *period)
231{
232 struct string_list_item *author;
233 struct authorstat *authorstat;
234 struct string_list *items;
235 struct string_list_item *date;
236 time_t now;
237 long i, j, total, subtotal;
238 struct tm *tm;
239 char *tmp;
240
241 time(&now);
242 tm = gmtime(&now);
243 period->trunc(tm);
244 for (i = 1; i < period->count; i++)
245 period->dec(tm);
246
247 total = 0;
248 htmlf("<tr><td class='%s'>%s</td>", leftclass,
249 fmt(name, to - from + 1));
250 for (j = 0; j < period->count; j++) {
251 tmp = period->pretty(tm);
252 period->inc(tm);
253 subtotal = 0;
254 for (i = from; i <= to; i++) {
255 author = &authors->items[i];
256 authorstat = author->util;
257 items = &authorstat->list;
258 date = string_list_lookup(tmp, items);
259 if (date)
260 subtotal += (size_t)date->util;
261 }
262 htmlf("<td class='%s'>%d</td>", centerclass, subtotal);
263 total += subtotal;
264 }
265 htmlf("<td class='%s'>%d</td></tr>", rightclass, total);
266}
267
268void print_authors(struct string_list *authors, int top, struct Period *period)
269{
270 struct string_list_item *author;
271 struct authorstat *authorstat;
272 struct string_list *items;
273 struct string_list_item *date;
274 time_t now;
275 long i, j, total;
276 struct tm *tm;
277 char *tmp;
278
279 time(&now);
280 tm = gmtime(&now);
281 period->trunc(tm);
282 for (i = 1; i < period->count; i++)
283 period->dec(tm);
284
285 html("<table class='stats'><tr><th>Author</th>");
286 for (j = 0; j < period->count; j++) {
287 tmp = period->pretty(tm);
288 htmlf("<th>%s</th>", tmp);
289 period->inc(tm);
290 }
291 html("<th>Total</th></tr>\n");
292
293 if (top <= 0 || top > authors->nr)
294 top = authors->nr;
295
296 for (i = 0; i < top; i++) {
297 author = &authors->items[i];
298 html("<tr><td class='left'>");
299 html_txt(author->string);
300 html("</td>");
301 authorstat = author->util;
302 items = &authorstat->list;
303 total = 0;
304 for (j = 0; j < period->count; j++)
305 period->dec(tm);
306 for (j = 0; j < period->count; j++) {
307 tmp = period->pretty(tm);
308 period->inc(tm);
309 date = string_list_lookup(tmp, items);
310 if (!date)
311 html("<td>0</td>");
312 else {
313 htmlf("<td>%d</td>", date->util);
314 total += (size_t)date->util;
315 }
316 }
317 htmlf("<td class='sum'>%d</td></tr>", total);
318 }
319
320 if (top < authors->nr)
321 print_combined_authorrow(authors, top, authors->nr - 1,
322 "Others (%d)", "left", "", "sum", period);
323
324 print_combined_authorrow(authors, 0, authors->nr - 1, "Total",
325 "total", "sum", "sum", period);
326 html("</table>");
327}
328
329/* Create a sorted string_list with one entry per author. The util-field
330 * for each author is another string_list which is used to calculate the
331 * number of commits per time-interval.
332 */
333void cgit_show_stats(struct cgit_context *ctx)
334{
335 struct string_list authors;
336 struct Period *period;
337 int top, i;
338
339 period = &periods[0];
340 if (ctx->qry.period) {
341 for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++)
342 if (periods[i].code == ctx->qry.period[0]) {
343 period = &periods[i];
344 break;
345 }
346 }
347 authors = collect_stats(ctx, period);
348 qsort(authors.items, authors.nr, sizeof(struct string_list_item),
349 cmp_total_commits);
350
351 top = ctx->qry.ofs;
352 if (!top)
353 top = 10;
354 htmlf("<h2>Commits per author per %s</h2>", period->name);
355
356 html("<form method='get' action='.' style='float: right; text-align: right;'>");
357 if (strcmp(ctx->qry.head, ctx->repo->defbranch))
358 htmlf("<input type='hidden' name='h' value='%s'/>", ctx->qry.head);
359 html("Period: ");
360 html("<select name='period' onchange='this.form.submit();'>");
361 for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++)
362 htmlf("<option value='%c'%s>%s</option>",
363 periods[i].code,
364 period == &periods[i] ? " selected" : "",
365 periods[i].name);
366 html("</select><br/><br/>");
367 html("Authors: ");
368 html("");
369 html("<select name='ofs' onchange='this.form.submit();'>");
370 htmlf("<option value='10'%s>10</option>", top == 10 ? " selected" : "");
371 htmlf("<option value='25'%s>25</option>", top == 25 ? " selected" : "");
372 htmlf("<option value='50'%s>50</option>", top == 50 ? " selected" : "");
373 htmlf("<option value='100'%s>100</option>", top == 100 ? " selected" : "");
374 htmlf("<option value='-1'%s>All</option>", top == -1 ? " selected" : "");
375 html("</select>");
376 html("<noscript>&nbsp;&nbsp;<input type='submit' value='Reload'/></noscript>");
377 html("</form>");
378 print_authors(&authors, top, period);
379}
380
diff --git a/ui-stats.h b/ui-stats.h
new file mode 100644
index 0000000..f1d744c
--- /dev/null
+++ b/ui-stats.h
@@ -0,0 +1,8 @@
1#ifndef UI_STATS_H
2#define UI_STATS_H
3
4#include "cgit.h"
5
6extern void cgit_show_stats(struct cgit_context *ctx);
7
8#endif /* UI_STATS_H */