git: update to v2.10.2 again

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 4912fa55bd5628791f6bc4685f17f4219cc264bf..b57ea60c4cf2113d294808360465777224edd395 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -79,7 +79,7 @@ static void print_modtime(struct cgit_repo *repo)
 {
        time_t t;
        if (get_repo_modtime(repo, &t))
 {
        time_t t;
        if (get_repo_modtime(repo, &t))

-               cgit_print_age(t, -1, NULL);
+               cgit_print_age(t, 0, -1);

 }
 
 static int is_match(struct cgit_repo *repo)
 }
 
 static int is_match(struct cgit_repo *repo)


@@ -115,6 +115,17 @@ static int is_visible(struct cgit_repo *repo)
        return 1;
 }
 
        return 1;
 }
 

+static int any_repos_visible(void)
+{
+       int i;
+
+       for (i = 0; i < cgit_repolist.count; i++) {
+               if (is_visible(&cgit_repolist.repos[i]))
+                       return 1;
+       }
+       return 0;
+}
+

 static void print_sort_header(const char *title, const char *sort)
 {
        char *currenturl = cgit_currenturl();
 static void print_sort_header(const char *title, const char *sort)
 {
        char *currenturl = cgit_currenturl();


@@ -264,8 +275,14 @@ void cgit_print_repolist(void)
        int i, columns = 3, hits = 0, header = 0;
        char *last_section = NULL;
        char *section;
        int i, columns = 3, hits = 0, header = 0;
        char *last_section = NULL;
        char *section;

+       char *repourl;

        int sorted = 0;
 
        int sorted = 0;
 

+       if (!any_repos_visible()) {
+               cgit_print_error_page(404, "Not found", "No repositories found");
+               return;
+       }
+

        if (ctx.cfg.enable_index_links)
                ++columns;
        if (ctx.cfg.enable_index_owner)
        if (ctx.cfg.enable_index_links)
                ++columns;
        if (ctx.cfg.enable_index_owner)


@@ -304,7 +321,7 @@ void cgit_print_repolist(void)
                    (last_section != NULL && section == NULL) ||
                    (last_section != NULL && section != NULL &&
                     strcmp(section, last_section)))) {
                    (last_section != NULL && section == NULL) ||
                    (last_section != NULL && section != NULL &&
                     strcmp(section, last_section)))) {

-                       htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
+                       htmlf("<tr class='nohover-highlight'><td colspan='%d' class='reposection'>",

                              columns);
                        html_txt(section);
                        html("</td></tr>");
                              columns);
                        html_txt(section);
                        html("</td></tr>");


@@ -314,7 +331,9 @@ void cgit_print_repolist(void)
                      !sorted && section ? "sublevel-repo" : "toplevel-repo");
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                html("</td><td>");
                      !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);
+               repourl = cgit_repourl(ctx.repo->url);
+               html_link_open(repourl, NULL, NULL);
+               free(repourl);

                html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
                html_link_close();
                html("</td><td>");
                html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
                html_link_close();
                html("</td><td>");


@@ -324,13 +343,15 @@ void cgit_print_repolist(void)
                                html_txt(ctx.repo->owner);
                                cgit_close_filter(ctx.repo->owner_filter);
                        } else {
                                html_txt(ctx.repo->owner);
                                cgit_close_filter(ctx.repo->owner_filter);
                        } else {

+                               char *currenturl = cgit_currenturl();

                                html("<a href='");
                                html("<a href='");

-                               html_attr(cgit_currenturl());
+                               html_attr(currenturl);

                                html("?q=");
                                html_url_arg(ctx.repo->owner);
                                html("'>");
                                html_txt(ctx.repo->owner);
                                html("</a>");
                                html("?q=");
                                html_url_arg(ctx.repo->owner);
                                html("'>");
                                html_txt(ctx.repo->owner);
                                html("</a>");

+                               free(currenturl);

                        }
                        html("</td><td>");
                }
                        }
                        html("</td><td>");
                }


@@ -347,9 +368,7 @@ void cgit_print_repolist(void)
                html("</tr>\n");
        }
        html("</table>");
                html("</tr>\n");
        }
        html("</table>");

-       if (!hits)
-               cgit_print_error("No repositories found");
-       else if (hits > ctx.cfg.max_repo_count)
+       if (hits > ctx.cfg.max_repo_count)

                print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search, ctx.qry.sort);
        cgit_print_docend();
 }
                print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search, ctx.qry.sort);
        cgit_print_docend();
 }