summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-stats.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ui-stats.c b/ui-stats.c
index 1104485..9fc06d3 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -193,219 +193,218 @@ static int cmp_total_commits(const void *a1, const void *a2)
193 const struct authorstat *auth1 = i1->util; 193 const struct authorstat *auth1 = i1->util;
194 const struct authorstat *auth2 = i2->util; 194 const struct authorstat *auth2 = i2->util;
195 195
196 return auth2->total - auth1->total; 196 return auth2->total - auth1->total;
197} 197}
198 198
199/* Walk the commit DAG and collect number of commits per author per 199/* Walk the commit DAG and collect number of commits per author per
200 * timeperiod into a nested string_list collection. 200 * timeperiod into a nested string_list collection.
201 */ 201 */
202struct string_list collect_stats(struct cgit_context *ctx, 202struct string_list collect_stats(struct cgit_context *ctx,
203 struct cgit_period *period) 203 struct cgit_period *period)
204{ 204{
205 struct string_list authors; 205 struct string_list authors;
206 struct rev_info rev; 206 struct rev_info rev;
207 struct commit *commit; 207 struct commit *commit;
208 const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL}; 208 const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL};
209 int argc = 3; 209 int argc = 3;
210 time_t now; 210 time_t now;
211 long i; 211 long i;
212 struct tm *tm; 212 struct tm *tm;
213 char tmp[11]; 213 char tmp[11];
214 214
215 time(&now); 215 time(&now);
216 tm = gmtime(&now); 216 tm = gmtime(&now);
217 period->trunc(tm); 217 period->trunc(tm);
218 for (i = 1; i < period->count; i++) 218 for (i = 1; i < period->count; i++)
219 period->dec(tm); 219 period->dec(tm);
220 strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm); 220 strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm);
221 argv[2] = xstrdup(fmt("--since=%s", tmp)); 221 argv[2] = xstrdup(fmt("--since=%s", tmp));
222 if (ctx->qry.path) { 222 if (ctx->qry.path) {
223 argv[3] = "--"; 223 argv[3] = "--";
224 argv[4] = ctx->qry.path; 224 argv[4] = ctx->qry.path;
225 argc += 2; 225 argc += 2;
226 } 226 }
227 init_revisions(&rev, NULL); 227 init_revisions(&rev, NULL);
228 rev.abbrev = DEFAULT_ABBREV; 228 rev.abbrev = DEFAULT_ABBREV;
229 rev.commit_format = CMIT_FMT_DEFAULT; 229 rev.commit_format = CMIT_FMT_DEFAULT;
230 rev.no_merges = 1; 230 rev.no_merges = 1;
231 rev.verbose_header = 1; 231 rev.verbose_header = 1;
232 rev.show_root_diff = 0; 232 rev.show_root_diff = 0;
233 setup_revisions(argc, argv, &rev, NULL); 233 setup_revisions(argc, argv, &rev, NULL);
234 prepare_revision_walk(&rev); 234 prepare_revision_walk(&rev);
235 memset(&authors, 0, sizeof(authors)); 235 memset(&authors, 0, sizeof(authors));
236 while ((commit = get_revision(&rev)) != NULL) { 236 while ((commit = get_revision(&rev)) != NULL) {
237 add_commit(&authors, commit, period); 237 add_commit(&authors, commit, period);
238 free(commit->buffer); 238 free(commit->buffer);
239 free_commit_list(commit->parents); 239 free_commit_list(commit->parents);
240 } 240 }
241 return authors; 241 return authors;
242} 242}
243 243
244void print_combined_authorrow(struct string_list *authors, int from, int to, 244void print_combined_authorrow(struct string_list *authors, int from, int to,
245 const char *name, const char *leftclass, const char *centerclass, 245 const char *name, const char *leftclass, const char *centerclass,
246 const char *rightclass, struct cgit_period *period) 246 const char *rightclass, struct cgit_period *period)
247{ 247{
248 struct string_list_item *author; 248 struct string_list_item *author;
249 struct authorstat *authorstat; 249 struct authorstat *authorstat;
250 struct string_list *items; 250 struct string_list *items;
251 struct string_list_item *date; 251 struct string_list_item *date;
252 time_t now; 252 time_t now;
253 long i, j, total, subtotal; 253 long i, j, total, subtotal;
254 struct tm *tm; 254 struct tm *tm;
255 char *tmp; 255 char *tmp;
256 256
257 time(&now); 257 time(&now);
258 tm = gmtime(&now); 258 tm = gmtime(&now);
259 period->trunc(tm); 259 period->trunc(tm);
260 for (i = 1; i < period->count; i++) 260 for (i = 1; i < period->count; i++)
261 period->dec(tm); 261 period->dec(tm);
262 262
263 total = 0; 263 total = 0;
264 htmlf("<tr><td class='%s'>%s</td>", leftclass, 264 htmlf("<tr><td class='%s'>%s</td>", leftclass,
265 fmt(name, to - from + 1)); 265 fmt(name, to - from + 1));
266 for (j = 0; j < period->count; j++) { 266 for (j = 0; j < period->count; j++) {
267 tmp = period->pretty(tm); 267 tmp = period->pretty(tm);
268 period->inc(tm); 268 period->inc(tm);
269 subtotal = 0; 269 subtotal = 0;
270 for (i = from; i <= to; i++) { 270 for (i = from; i <= to; i++) {
271 author = &authors->items[i]; 271 author = &authors->items[i];
272 authorstat = author->util; 272 authorstat = author->util;
273 items = &authorstat->list; 273 items = &authorstat->list;
274 date = string_list_lookup(tmp, items); 274 date = string_list_lookup(tmp, items);
275 if (date) 275 if (date)
276 subtotal += (size_t)date->util; 276 subtotal += (size_t)date->util;
277 } 277 }
278 htmlf("<td class='%s'>%d</td>", centerclass, subtotal); 278 htmlf("<td class='%s'>%d</td>", centerclass, subtotal);
279 total += subtotal; 279 total += subtotal;
280 } 280 }
281 htmlf("<td class='%s'>%d</td></tr>", rightclass, total); 281 htmlf("<td class='%s'>%d</td></tr>", rightclass, total);
282} 282}
283 283
284void print_authors(struct string_list *authors, int top, 284void print_authors(struct string_list *authors, int top,
285 struct cgit_period *period) 285 struct cgit_period *period)
286{ 286{
287 struct string_list_item *author; 287 struct string_list_item *author;
288 struct authorstat *authorstat; 288 struct authorstat *authorstat;
289 struct string_list *items; 289 struct string_list *items;
290 struct string_list_item *date; 290 struct string_list_item *date;
291 time_t now; 291 time_t now;
292 long i, j, total; 292 long i, j, total;
293 struct tm *tm; 293 struct tm *tm;
294 char *tmp; 294 char *tmp;
295 295
296 time(&now); 296 time(&now);
297 tm = gmtime(&now); 297 tm = gmtime(&now);
298 period->trunc(tm); 298 period->trunc(tm);
299 for (i = 1; i < period->count; i++) 299 for (i = 1; i < period->count; i++)
300 period->dec(tm); 300 period->dec(tm);
301 301
302 html("<table class='stats'><tr><th>Author</th>"); 302 html("<table class='stats'><tr><th>Author</th>");
303 for (j = 0; j < period->count; j++) { 303 for (j = 0; j < period->count; j++) {
304 tmp = period->pretty(tm); 304 tmp = period->pretty(tm);
305 htmlf("<th>%s</th>", tmp); 305 htmlf("<th>%s</th>", tmp);
306 period->inc(tm); 306 period->inc(tm);
307 } 307 }
308 html("<th>Total</th></tr>\n"); 308 html("<th>Total</th></tr>\n");
309 309
310 if (top <= 0 || top > authors->nr) 310 if (top <= 0 || top > authors->nr)
311 top = authors->nr; 311 top = authors->nr;
312 312
313 for (i = 0; i < top; i++) { 313 for (i = 0; i < top; i++) {
314 author = &authors->items[i]; 314 author = &authors->items[i];
315 html("<tr><td class='left'>"); 315 html("<tr><td class='left'>");
316 html_txt(author->string); 316 html_txt(author->string);
317 html("</td>"); 317 html("</td>");
318 authorstat = author->util; 318 authorstat = author->util;
319 items = &authorstat->list; 319 items = &authorstat->list;
320 total = 0; 320 total = 0;
321 for (j = 0; j < period->count; j++) 321 for (j = 0; j < period->count; j++)
322 period->dec(tm); 322 period->dec(tm);
323 for (j = 0; j < period->count; j++) { 323 for (j = 0; j < period->count; j++) {
324 tmp = period->pretty(tm); 324 tmp = period->pretty(tm);
325 period->inc(tm); 325 period->inc(tm);
326 date = string_list_lookup(tmp, items); 326 date = string_list_lookup(tmp, items);
327 if (!date) 327 if (!date)
328 html("<td>0</td>"); 328 html("<td>0</td>");
329 else { 329 else {
330 htmlf("<td>%d</td>", date->util); 330 htmlf("<td>%d</td>", date->util);
331 total += (size_t)date->util; 331 total += (size_t)date->util;
332 } 332 }
333 } 333 }
334 htmlf("<td class='sum'>%d</td></tr>", total); 334 htmlf("<td class='sum'>%d</td></tr>", total);
335 } 335 }
336 336
337 if (top < authors->nr) 337 if (top < authors->nr)
338 print_combined_authorrow(authors, top, authors->nr - 1, 338 print_combined_authorrow(authors, top, authors->nr - 1,
339 "Others (%d)", "left", "", "sum", period); 339 "Others (%d)", "left", "", "sum", period);
340 340
341 print_combined_authorrow(authors, 0, authors->nr - 1, "Total", 341 print_combined_authorrow(authors, 0, authors->nr - 1, "Total",
342 "total", "sum", "sum", period); 342 "total", "sum", "sum", period);
343 html("</table>"); 343 html("</table>");
344} 344}
345 345
346/* Create a sorted string_list with one entry per author. The util-field 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 347 * for each author is another string_list which is used to calculate the
348 * number of commits per time-interval. 348 * number of commits per time-interval.
349 */ 349 */
350void cgit_show_stats(struct cgit_context *ctx) 350void cgit_show_stats(struct cgit_context *ctx)
351{ 351{
352 struct string_list authors; 352 struct string_list authors;
353 struct cgit_period *period; 353 struct cgit_period *period;
354 int top, i; 354 int top, i;
355 const char *code = "w"; 355 const char *code = "w";
356 356
357 if (ctx->qry.period) 357 if (ctx->qry.period)
358 code = ctx->qry.period; 358 code = ctx->qry.period;
359 359
360 i = cgit_find_stats_period(code, &period); 360 i = cgit_find_stats_period(code, &period);
361 if (!i) { 361 if (!i) {
362 cgit_print_error(fmt("Unknown statistics type: %c", code)); 362 cgit_print_error(fmt("Unknown statistics type: %c", code));
363 return; 363 return;
364 } 364 }
365 if (i > ctx->repo->max_stats) { 365 if (i > ctx->repo->max_stats) {
366 cgit_print_error(fmt("Statistics type disabled: %s", 366 cgit_print_error(fmt("Statistics type disabled: %s",
367 period->name)); 367 period->name));
368 return; 368 return;
369 } 369 }
370 authors = collect_stats(ctx, period); 370 authors = collect_stats(ctx, period);
371 qsort(authors.items, authors.nr, sizeof(struct string_list_item), 371 qsort(authors.items, authors.nr, sizeof(struct string_list_item),
372 cmp_total_commits); 372 cmp_total_commits);
373 373
374 top = ctx->qry.ofs; 374 top = ctx->qry.ofs;
375 if (!top) 375 if (!top)
376 top = 10; 376 top = 10;
377 htmlf("<h2>Commits per author per %s", period->name); 377 htmlf("<h2>Commits per author per %s", period->name);
378 if (ctx->qry.path) { 378 if (ctx->qry.path) {
379 html(" (path '"); 379 html(" (path '");
380 html_txt(ctx->qry.path); 380 html_txt(ctx->qry.path);
381 html("')"); 381 html("')");
382 } 382 }
383 html("</h2>"); 383 html("</h2>");
384 384
385 html("<form method='get' action='.' style='float: right; text-align: right;'>"); 385 html("<form method='get' action='' style='float: right; text-align: right;'>");
386 if (strcmp(ctx->qry.head, ctx->repo->defbranch)) 386 cgit_add_hidden_formfields(1, 0, "stats");
387 htmlf("<input type='hidden' name='h' value='%s'/>", ctx->qry.head);
388 if (ctx->repo->max_stats > 1) { 387 if (ctx->repo->max_stats > 1) {
389 html("Period: "); 388 html("Period: ");
390 html("<select name='period' onchange='this.form.submit();'>"); 389 html("<select name='period' onchange='this.form.submit();'>");
391 for (i = 0; i < ctx->repo->max_stats; i++) 390 for (i = 0; i < ctx->repo->max_stats; i++)
392 htmlf("<option value='%c'%s>%s</option>", 391 htmlf("<option value='%c'%s>%s</option>",
393 periods[i].code, 392 periods[i].code,
394 period == &periods[i] ? " selected" : "", 393 period == &periods[i] ? " selected" : "",
395 periods[i].name); 394 periods[i].name);
396 html("</select><br/><br/>"); 395 html("</select><br/><br/>");
397 } 396 }
398 html("Authors: "); 397 html("Authors: ");
399 html(""); 398 html("");
400 html("<select name='ofs' onchange='this.form.submit();'>"); 399 html("<select name='ofs' onchange='this.form.submit();'>");
401 htmlf("<option value='10'%s>10</option>", top == 10 ? " selected" : ""); 400 htmlf("<option value='10'%s>10</option>", top == 10 ? " selected" : "");
402 htmlf("<option value='25'%s>25</option>", top == 25 ? " selected" : ""); 401 htmlf("<option value='25'%s>25</option>", top == 25 ? " selected" : "");
403 htmlf("<option value='50'%s>50</option>", top == 50 ? " selected" : ""); 402 htmlf("<option value='50'%s>50</option>", top == 50 ? " selected" : "");
404 htmlf("<option value='100'%s>100</option>", top == 100 ? " selected" : ""); 403 htmlf("<option value='100'%s>100</option>", top == 100 ? " selected" : "");
405 htmlf("<option value='-1'%s>All</option>", top == -1 ? " selected" : ""); 404 htmlf("<option value='-1'%s>All</option>", top == -1 ? " selected" : "");
406 html("</select>"); 405 html("</select>");
407 html("<noscript>&nbsp;&nbsp;<input type='submit' value='Reload'/></noscript>"); 406 html("<noscript>&nbsp;&nbsp;<input type='submit' value='Reload'/></noscript>");
408 html("</form>"); 407 html("</form>");
409 print_authors(&authors, top, period); 408 print_authors(&authors, top, period);
410} 409}
411 410