summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-12-07 10:45:28 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-12-07 10:45:28 (UTC)
commitc6a6aa2186daf39814baa0e71378c2e9e1041002 (patch) (side-by-side diff)
treeefd65ff67657677745b3d98f3840a4f93ce0f44c
parentf86a23ff537258d36bf8f1876fa7a4bede6673d8 (diff)
downloadcgit-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>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ui-stats.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/ui-stats.c b/ui-stats.c
index 9150840..3cc8d70 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -150,116 +150,122 @@ static void add_commit(struct string_list *authors, struct commit *commit,
struct commitinfo *info;
struct string_list_item *author, *item;
struct authorstat *authorstat;
struct string_list *items;
char *tmp;
struct tm *date;
time_t t;
info = cgit_parse_commit(commit);
tmp = xstrdup(info->author);
author = string_list_insert(tmp, authors);
if (!author->util)
author->util = xcalloc(1, sizeof(struct authorstat));
else
free(tmp);
authorstat = author->util;
items = &authorstat->list;
t = info->committer_date;
date = gmtime(&t);
period->trunc(date);
tmp = xstrdup(period->pretty(date));
item = string_list_insert(tmp, items);
if (item->util)
free(tmp);
item->util++;
authorstat->total++;
cgit_free_commitinfo(info);
}
static int cmp_total_commits(const void *a1, const void *a2)
{
const struct string_list_item *i1 = a1;
const struct string_list_item *i2 = a2;
const struct authorstat *auth1 = i1->util;
const struct authorstat *auth2 = i2->util;
return auth2->total - auth1->total;
}
/* Walk the commit DAG and collect number of commits per author per
* timeperiod into a nested string_list collection.
*/
struct string_list collect_stats(struct cgit_context *ctx,
struct Period *period)
{
struct string_list authors;
struct rev_info rev;
struct commit *commit;
- const char *argv[] = {NULL, ctx->qry.head, NULL, NULL};
+ const char *argv[] = {NULL, ctx->qry.head, NULL, NULL, NULL, NULL};
+ int argc = 3;
time_t now;
long i;
struct tm *tm;
char tmp[11];
time(&now);
tm = gmtime(&now);
period->trunc(tm);
for (i = 1; i < period->count; i++)
period->dec(tm);
strftime(tmp, sizeof(tmp), "%Y-%m-%d", tm);
argv[2] = xstrdup(fmt("--since=%s", tmp));
+ if (ctx->qry.path) {
+ argv[3] = "--";
+ argv[4] = ctx->qry.path;
+ argc += 2;
+ }
init_revisions(&rev, NULL);
rev.abbrev = DEFAULT_ABBREV;
rev.commit_format = CMIT_FMT_DEFAULT;
rev.no_merges = 1;
rev.verbose_header = 1;
rev.show_root_diff = 0;
- setup_revisions(3, argv, &rev, NULL);
+ setup_revisions(argc, argv, &rev, NULL);
prepare_revision_walk(&rev);
memset(&authors, 0, sizeof(authors));
while ((commit = get_revision(&rev)) != NULL) {
add_commit(&authors, commit, period);
free(commit->buffer);
free_commit_list(commit->parents);
}
return authors;
}
void print_combined_authorrow(struct string_list *authors, int from, int to,
const char *name, const char *leftclass, const char *centerclass,
const char *rightclass, struct Period *period)
{
struct string_list_item *author;
struct authorstat *authorstat;
struct string_list *items;
struct string_list_item *date;
time_t now;
long i, j, total, subtotal;
struct tm *tm;
char *tmp;
time(&now);
tm = gmtime(&now);
period->trunc(tm);
for (i = 1; i < period->count; i++)
period->dec(tm);
total = 0;
htmlf("<tr><td class='%s'>%s</td>", leftclass,
fmt(name, to - from + 1));
for (j = 0; j < period->count; j++) {
tmp = period->pretty(tm);
period->inc(tm);
subtotal = 0;
for (i = from; i <= to; i++) {
author = &authors->items[i];
authorstat = author->util;
items = &authorstat->list;
date = string_list_lookup(tmp, items);
if (date)
subtotal += (size_t)date->util;
}
htmlf("<td class='%s'>%d</td>", centerclass, subtotal);
total += subtotal;
}
htmlf("<td class='%s'>%d</td></tr>", rightclass, total);
@@ -306,75 +312,81 @@ void print_authors(struct string_list *authors, int top, struct Period *period)
for (j = 0; j < period->count; j++) {
tmp = period->pretty(tm);
period->inc(tm);
date = string_list_lookup(tmp, items);
if (!date)
html("<td>0</td>");
else {
htmlf("<td>%d</td>", date->util);
total += (size_t)date->util;
}
}
htmlf("<td class='sum'>%d</td></tr>", total);
}
if (top < authors->nr)
print_combined_authorrow(authors, top, authors->nr - 1,
"Others (%d)", "left", "", "sum", period);
print_combined_authorrow(authors, 0, authors->nr - 1, "Total",
"total", "sum", "sum", period);
html("</table>");
}
/* Create a sorted string_list with one entry per author. The util-field
* for each author is another string_list which is used to calculate the
* number of commits per time-interval.
*/
void cgit_show_stats(struct cgit_context *ctx)
{
struct string_list authors;
struct Period *period;
int top, i;
period = &periods[0];
if (ctx->qry.period) {
for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++)
if (periods[i].code == ctx->qry.period[0]) {
period = &periods[i];
break;
}
}
authors = collect_stats(ctx, period);
qsort(authors.items, authors.nr, sizeof(struct string_list_item),
cmp_total_commits);
top = ctx->qry.ofs;
if (!top)
top = 10;
- htmlf("<h2>Commits per author per %s</h2>", period->name);
+ htmlf("<h2>Commits per author per %s", period->name);
+ if (ctx->qry.path) {
+ html(" (path '");
+ html_txt(ctx->qry.path);
+ html("')");
+ }
+ html("</h2>");
html("<form method='get' action='.' style='float: right; text-align: right;'>");
if (strcmp(ctx->qry.head, ctx->repo->defbranch))
htmlf("<input type='hidden' name='h' value='%s'/>", ctx->qry.head);
html("Period: ");
html("<select name='period' onchange='this.form.submit();'>");
for (i = 0; i < sizeof(periods) / sizeof(periods[0]); i++)
htmlf("<option value='%c'%s>%s</option>",
periods[i].code,
period == &periods[i] ? " selected" : "",
periods[i].name);
html("</select><br/><br/>");
html("Authors: ");
html("");
html("<select name='ofs' onchange='this.form.submit();'>");
htmlf("<option value='10'%s>10</option>", top == 10 ? " selected" : "");
htmlf("<option value='25'%s>25</option>", top == 25 ? " selected" : "");
htmlf("<option value='50'%s>50</option>", top == 50 ? " selected" : "");
htmlf("<option value='100'%s>100</option>", top == 100 ? " selected" : "");
htmlf("<option value='-1'%s>All</option>", top == -1 ? " selected" : "");
html("</select>");
html("<noscript>&nbsp;&nbsp;<input type='submit' value='Reload'/></noscript>");
html("</form>");
print_authors(&authors, top, period);
}