Merge branch 'jp/defbranch'

[cgit.git] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index d56654d72a0f076681d0d3d4f2e617c40a4974e0..d946f32cd5354021c45637a0af24e1a7653dff92 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;
@@ -51,12 +45,22 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
                return 1;
        }
 
-       path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
-       if (stat(path, &s) == 0)
+       path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch ?
+                  repo->defbranch : "master");
+       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 +98,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);
@@ -115,13 +119,13 @@ void print_header(int columns)
 }
 
 
-void print_pager(int items, int pagelen, char *search)
+void print_pager(int items, int pagelen, char *search, char *sort)
 {
        int i;
        html("<div class='pager'>");
        for(i = 0; i * pagelen < items; i++)
                cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL,
-                               search, i * pagelen);
+                               search, sort, i * pagelen);
        html("</div>");
 }
 
@@ -217,6 +221,7 @@ void cgit_print_repolist()
 {
        int i, columns = 4, hits = 0, header = 0;
        char *last_section = NULL;
+       char *section;
        int sorted = 0;
 
        if (ctx.cfg.enable_index_links)
@@ -247,19 +252,22 @@ void cgit_print_repolist()
                        continue;
                if (!header++)
                        print_header(columns);
+               section = ctx.repo->section;
+               if (section && !strcmp(section, ""))
+                       section = NULL;
                if (!sorted &&
-                   ((last_section == NULL && ctx.repo->section != NULL) ||
-                   (last_section != NULL && ctx.repo->section == NULL) ||
-                   (last_section != NULL && ctx.repo->section != NULL &&
-                    strcmp(ctx.repo->section, last_section)))) {
+                   ((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->section);
+                       html_txt(section);
                        html("</td></tr>");
-                       last_section = ctx.repo->section;
+                       last_section = section;
                }
                htmlf("<tr><td class='%s'>",
-                     !sorted && ctx.repo->section ? "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);
@@ -284,7 +292,7 @@ void cgit_print_repolist()
        if (!hits)
                cgit_print_error("No repositories found");
        else if (hits > ctx.cfg.max_repo_count)
-               print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search);
+               print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search, ctx.qry.sort);
        cgit_print_docend();
 }