author | Lars Hjemli <hjemli@gmail.com> | 2008-12-07 10:45:28 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-07 10:45:28 (UTC) |
commit | c6a6aa2186daf39814baa0e71378c2e9e1041002 (patch) (unidiff) | |
tree | efd65ff67657677745b3d98f3840a4f93ce0f44c | |
parent | f86a23ff537258d36bf8f1876fa7a4bede6673d8 (diff) | |
download | cgit-c6a6aa2186daf39814baa0e71378c2e9e1041002.zip cgit-c6a6aa2186daf39814baa0e71378c2e9e1041002.tar.gz cgit-c6a6aa2186daf39814baa0e71378c2e9e1041002.tar.bz2 |
ui-stats: enable path-filtered stats
When a path is specified on the querystring the commit statistics will
now be filtered by this path.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-stats.c | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -192,32 +192,38 @@ static int cmp_total_commits(const void *a1, const void *a2) | |||
192 | struct string_list collect_stats(struct cgit_context *ctx, | 192 | struct string_list collect_stats(struct cgit_context *ctx, |
193 | struct Period *period) | 193 | struct Period *period) |
194 | { | 194 | { |
195 | struct string_list authors; | 195 | struct string_list authors; |
196 | struct rev_info rev; | 196 | struct rev_info rev; |
197 | struct commit *commit; | 197 | struct commit *commit; |
198 | const char *argv[] = {NULL, ctx->qry.head, NULL, NULL}; | 198 | const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL}; |
199 | int argc = 3; | ||
199 | time_t now; | 200 | time_t now; |
200 | long i; | 201 | long i; |
201 | struct tm *tm; | 202 | struct tm *tm; |
202 | char tmp[11]; | 203 | char tmp[11]; |
203 | 204 | ||
204 | time(&now); | 205 | time(&now); |
205 | tm = gmtime(&now); | 206 | tm = gmtime(&now); |
206 | period->trunc(tm); | 207 | period->trunc(tm); |
207 | for (i = 1; i < period->count; i++) | 208 | for (i = 1; i < period->count; i++) |
208 | period->dec(tm); | 209 | period->dec(tm); |
209 | strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm); | 210 | strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm); |
210 | argv[2] = xstrdup(fmt("--since=%s", tmp)); | 211 | argv[2] = xstrdup(fmt("--since=%s", tmp)); |
212 | if (ctx->qry.path) { | ||
213 | argv[3] = "--"; | ||
214 | argv[4] = ctx->qry.path; | ||
215 | argc += 2; | ||
216 | } | ||
211 | init_revisions(&rev, NULL); | 217 | init_revisions(&rev, NULL); |
212 | rev.abbrev = DEFAULT_ABBREV; | 218 | rev.abbrev = DEFAULT_ABBREV; |
213 | rev.commit_format = CMIT_FMT_DEFAULT; | 219 | rev.commit_format = CMIT_FMT_DEFAULT; |
214 | rev.no_merges = 1; | 220 | rev.no_merges = 1; |
215 | rev.verbose_header = 1; | 221 | rev.verbose_header = 1; |
216 | rev.show_root_diff = 0; | 222 | rev.show_root_diff = 0; |
217 | setup_revisions(3, argv, &rev, NULL); | 223 | setup_revisions(argc, argv, &rev, NULL); |
218 | prepare_revision_walk(&rev); | 224 | prepare_revision_walk(&rev); |
219 | memset(&authors, 0, sizeof(authors)); | 225 | memset(&authors, 0, sizeof(authors)); |
220 | while ((commit = get_revision(&rev)) != NULL) { | 226 | while ((commit = get_revision(&rev)) != NULL) { |
221 | add_commit(&authors, commit, period); | 227 | add_commit(&authors, commit, period); |
222 | free(commit->buffer); | 228 | free(commit->buffer); |
223 | free_commit_list(commit->parents); | 229 | free_commit_list(commit->parents); |
@@ -348,13 +354,19 @@ void cgit_show_stats(struct cgit_context *ctx) | |||
348 | qsort(authors.items, authors.nr, sizeof(struct string_list_item), | 354 | qsort(authors.items, authors.nr, sizeof(struct string_list_item), |
349 | cmp_total_commits); | 355 | cmp_total_commits); |
350 | 356 | ||
351 | top = ctx->qry.ofs; | 357 | top = ctx->qry.ofs; |
352 | if (!top) | 358 | if (!top) |
353 | top = 10; | 359 | top = 10; |
354 | htmlf("<h2>Commits per author per %s</h2>", period->name); | 360 | htmlf("<h2>Commits per author per %s", period->name); |
361 | if (ctx->qry.path) { | ||
362 | html(" (path '"); | ||
363 | html_txt(ctx->qry.path); | ||
364 | html("')"); | ||
365 | } | ||
366 | html("</h2>"); | ||
355 | 367 | ||
356 | html("<form method='get' action='.' style='float: right; text-align: right;'>"); | 368 | html("<form method='get' action='.' style='float: right; text-align: right;'>"); |
357 | if (strcmp(ctx->qry.head, ctx->repo->defbranch)) | 369 | if (strcmp(ctx->qry.head, ctx->repo->defbranch)) |
358 | htmlf("<input type='hidden' name='h' value='%s'/>", ctx->qry.head); | 370 | htmlf("<input type='hidden' name='h' value='%s'/>", ctx->qry.head); |
359 | html("Period: "); | 371 | html("Period: "); |
360 | html("<select name='period' onchange='this.form.submit();'>"); | 372 | html("<select name='period' onchange='this.form.submit();'>"); |