X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/502d71072a813e6fadb2e59fb47c2782b542674a..7937d06090dd5e19145ec6fa8befc5770954b30c:/ui-summary.c diff --git a/ui-summary.c b/ui-summary.c index c684628..97f1b57 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -10,6 +10,44 @@ static int header; +static int cmp_age(int age1, int age2) +{ + if (age1 != 0 && age2 != 0) + return age2 - age1; + + if (age1 == 0 && age2 == 0) + return 0; + + if (age1 == 0) + return +1; + + return -1; +} + +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) +{ + struct refinfo *r1 = *(struct refinfo **)a; + struct refinfo *r2 = *(struct refinfo **)b; + + return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date); +} + static void cgit_print_branch(struct refinfo *ref) { struct commit *commit; @@ -128,7 +166,7 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, return 0; } -static void cgit_print_branches() +void cgit_print_branches(int maxcount) { struct reflist list; int i; @@ -141,11 +179,20 @@ static void cgit_print_branches() list.refs = NULL; list.alloc = list.count = 0; for_each_branch_ref(cgit_refs_cb, &list); - for(i=0; i 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 list.count) + maxcount = list.count; print_tag_header(); - for(i=0; i"); if (cgit_summary_log > 0) html(" "); - cgit_print_branches(); + cgit_print_branches(cgit_summary_branches); html(" "); - cgit_print_tags(); + cgit_print_tags(cgit_summary_tags); html(""); }