Merge branch 'stable'

[cgit.git] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 7c7aa9bc28a714047ad2863319eb2ad52bc5ea5b..25c36ce39b052bddd62199bf398c5c80ede05cc9 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -6,12 +6,6 @@
  *   (see COPYING for full license text)
  */
 
-/* This is needed for strcasestr to be defined by <string.h> */
-#define _GNU_SOURCE 1
-#include <string.h>
-
-#include <time.h>
-
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
@@ -26,7 +20,7 @@ time_t read_agefile(char *path)
        if (readfile(path, &buf, &size))
                return -1;
 
-       if (parse_date(buf, buf2, sizeof(buf2)))
+       if (parse_date(buf, buf2, sizeof(buf2)) > 0)
                result = strtoul(buf2, NULL, 10);
        else
                result = 0;
@@ -52,11 +46,20 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
        }
 
        path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
-       if (stat(path, &s) == 0)
+       if (stat(path, &s) == 0) {
                *mtime = s.st_mtime;
-       else
-               *mtime = 0;
+               r->mtime = *mtime;
+               return 1;
+       }
 
+       path = fmt("%s/%s", repo->path, "packed-refs");
+       if (stat(path, &s) == 0) {
+               *mtime = s.st_mtime;
+               r->mtime = *mtime;
+               return 1;
+       }
+
+       *mtime = 0;
        r->mtime = *mtime;
        return (r->mtime != 0);
 }
@@ -94,7 +97,7 @@ int is_in_url(struct cgit_repo *repo)
 
 void print_sort_header(const char *title, const char *sort)
 {
-       htmlf("<th class='left'><a href='./?s=%s", sort);
+       htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
        if (ctx.qry.search) {
                html("&q=");
                html_url_arg(ctx.qry.search);
@@ -136,6 +139,18 @@ static int cmp(const char *s1, const char *s2)
        return 0;
 }
 
+static int sort_section(const void *a, const void *b)
+{
+       const struct cgit_repo *r1 = a;
+       const struct cgit_repo *r2 = b;
+       int result;
+
+       result = cmp(r1->section, r2->section);
+       if (!result)
+               result = cmp(r1->name, r2->name);
+       return result;
+}
+
 static int sort_name(const void *a, const void *b)
 {
        const struct cgit_repo *r1 = a;
@@ -178,6 +193,7 @@ struct sortcolumn {
 };
 
 struct sortcolumn sortcolumn[] = {
+       {"section", sort_section},
        {"name", sort_name},
        {"desc", sort_desc},
        {"owner", sort_owner},
@@ -203,7 +219,8 @@ int sort_repolist(char *field)
 void cgit_print_repolist()
 {
        int i, columns = 4, hits = 0, header = 0;
-       char *last_group = NULL;
+       char *last_section = NULL;
+       char *section;
        int sorted = 0;
 
        if (ctx.cfg.enable_index_links)
@@ -219,6 +236,8 @@ void cgit_print_repolist()
 
        if(ctx.qry.sort)
                sorted = sort_repolist(ctx.qry.sort);
+       else
+               sort_repolist("section");
 
        html("<table summary='repository list' class='list nowrap'>");
        for (i=0; i<cgit_repolist.count; i++) {
@@ -232,19 +251,22 @@ void cgit_print_repolist()
                        continue;
                if (!header++)
                        print_header(columns);
+               section = ctx.repo->section;
+               if (section && !strcmp(section, ""))
+                       section = NULL;
                if (!sorted &&
-                   ((last_group == NULL && ctx.repo->group != NULL) ||
-                   (last_group != NULL && ctx.repo->group == NULL) ||
-                   (last_group != NULL && ctx.repo->group != NULL &&
-                    strcmp(ctx.repo->group, last_group)))) {
-                       htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
+                   ((last_section == NULL && section != NULL) ||
+                   (last_section != NULL && section == NULL) ||
+                   (last_section != NULL && section != NULL &&
+                    strcmp(section, last_section)))) {
+                       htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
                              columns);
-                       html_txt(ctx.repo->group);
+                       html_txt(section);
                        html("</td></tr>");
-                       last_group = ctx.repo->group;
+                       last_section = section;
                }
                htmlf("<tr><td class='%s'>",
-                     !sorted && ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
+                     !sorted && section ? "sublevel-repo" : "toplevel-repo");
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                html("</td><td>");
                html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);