| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | shared.c | 3 | ||||
| -rw-r--r-- | ui-summary.c | 31 |
3 files changed, 32 insertions, 3 deletions
@@ -146,2 +146,3 @@ extern int cgit_summary_log; extern int cgit_summary_tags; +extern int cgit_summary_branches; @@ -41,2 +41,3 @@ int cgit_summary_log = 0; int cgit_summary_tags = 0; +int cgit_summary_branches = 0; int cgit_renamelimit = -1; @@ -184,2 +185,4 @@ void cgit_global_config_cb(const char *name, const char *value) cgit_summary_log = atoi(value); + else if (!strcmp(name, "summary-branches")) + cgit_summary_branches = atoi(value); else if (!strcmp(name, "summary-tags")) diff --git a/ui-summary.c b/ui-summary.c index 05170cc..df79d01 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -26,2 +26,18 @@ static int cmp_age(int age1, int age2) +static int cmp_ref_name(const void *a, const void *b) +{ + struct refinfo *r1 = *(struct refinfo **)a; + struct refinfo *r2 = *(struct refinfo **)b; + + return strcmp(r1->refname, r2->refname); +} + +static int cmp_branch_age(const void *a, const void *b) +{ + struct refinfo *r1 = *(struct refinfo **)a; + struct refinfo *r2 = *(struct refinfo **)b; + + return cmp_age(r1->commit->committer_date, r2->commit->committer_date); +} + static int cmp_tag_age(const void *a, const void *b) @@ -152,3 +168,3 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, -static void cgit_print_branches() +static void cgit_print_branches(int maxcount) { @@ -165,3 +181,12 @@ static void cgit_print_branches() for_each_branch_ref(cgit_refs_cb, &list); - for(i=0; i<list.count; i++) + + if (maxcount == 0 || maxcount > list.count) + maxcount = list.count; + + if (maxcount < list.count) { + qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); + qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); + } + + for(i=0; i<maxcount; i++) cgit_print_branch(list.refs[i]); @@ -215,3 +240,3 @@ void cgit_print_summary() html("<tr class='nohover'><td colspan='4'> </td></tr>"); - cgit_print_branches(); + cgit_print_branches(cgit_summary_branches); html("<tr class='nohover'><td colspan='4'> </td></tr>"); |