readme: Accept multiple candidates and test them.

[cgit.git] / cgit.c

diff --git a/cgit.c b/cgit.c
index 4dadd97e3d7dbfda597771f26d7e9b4c510c463f..f738b83acd4d442327cc3d721ac367b4d5666f29 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -14,6 +14,8 @@
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-stats.h"
+#include "ui-blob.h"
+#include "ui-summary.h"
 #include "scan-tree.h"
 
 const char *cgit_version = CGIT_VERSION;
@@ -37,10 +39,10 @@ static struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
 
        switch (filtertype) {
                case SOURCE:
+               case ABOUT:
                        extra_args = 1;
                        break;
 
-               case ABOUT:
                case COMMIT:
                default:
                        extra_args = 0;
@@ -84,7 +86,12 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                repo->enable_remote_branches = atoi(value);
        else if (!strcmp(name, "enable-subject-links"))
                repo->enable_subject_links = atoi(value);
-       else if (!strcmp(name, "commit-sort")) {
+       else if (!strcmp(name, "branch-sort")) {
+               if (!strcmp(value, "age"))
+                       repo->branch_sort = 1;
+               if (!strcmp(value, "name"))
+                       repo->branch_sort = 0;
+       } else if (!strcmp(name, "commit-sort")) {
                if (!strcmp(value, "date"))
                        repo->commit_sort = 1;
                if (!strcmp(value, "topo"))
@@ -271,6 +278,11 @@ static void config_cb(const char *name, const char *value)
                        ctx.cfg.commit_sort = 1;
                if (!strcmp(value, "topo"))
                        ctx.cfg.commit_sort = 2;
+       } else if (!strcmp(name, "branch-sort")) {
+               if (!strcmp(value, "age"))
+                       ctx.cfg.branch_sort = 1;
+               if (!strcmp(value, "name"))
+                       ctx.cfg.branch_sort = 0;
        } else if (!prefixcmp(name, "mimetype."))
                add_mimetype(name + 9, value);
        else if (!strcmp(name, "include"))
@@ -345,6 +357,8 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.cache_scanrc_ttl = 15;
        ctx->cfg.cache_static_ttl = -1;
        ctx->cfg.case_sensitive_sort = 1;
+       ctx->cfg.branch_sort = 0;
+       ctx->cfg.commit_sort = 0;
        ctx->cfg.css = "/cgit.css";
        ctx->cfg.logo = "/cgit.png";
        ctx->cfg.local_time = 0;
@@ -457,10 +471,40 @@ static char *guess_defbranch(void)
        return xstrdup(ref + 11);
 }
 
+static void choose_readme(struct cgit_repo *repo)
+{
+       char *entry, *filename, *ref;
+
+       /* If there's no space, we skip the possibly expensive
+        * selection process. */
+       if (!repo->readme || !strchr(repo->readme, ' '))
+               return;
+
+       for (entry = strtok(repo->readme, " "); entry; entry = strtok(NULL, " ")) {
+               cgit_parse_readme(entry, NULL, &filename, &ref, repo);
+               if (!(*filename)) {
+                       free(filename);
+                       free(ref);
+                       continue;
+               }
+               if (*ref && cgit_ref_path_exists(filename, ref)) {
+                       free(filename);
+                       free(ref);
+                       break;
+               }
+               if (!access(filename, R_OK)) {
+                       free(filename);
+                       free(ref);
+                       break;
+               }
+               free(filename);
+               free(ref);
+       }
+       repo->readme = entry;
+}
+
 static int prepare_repo_cmd(struct cgit_context *ctx)
 {
-       char *user_home;
-       char *xdg_home;
        unsigned char sha1[20];
        int nongit = 0;
        int rc;
@@ -471,11 +515,6 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        /* Do not look in /etc/ for gitconfig and gitattributes. */
        setenv("GIT_CONFIG_NOSYSTEM", "1", 1);
        setenv("GIT_ATTR_NOSYSTEM", "1", 1);
-
-       /* We unset HOME and XDG_CONFIG_HOME before calling the git setup function
-        * so that we don't make unneccessary filesystem accesses. */
-       user_home = getenv("HOME");
-       xdg_home = getenv("XDG_CONFIG_HOME");
        unsetenv("HOME");
        unsetenv("XDG_CONFIG_HOME");
 
@@ -485,12 +524,6 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        setup_git_directory_gently(&nongit);
        init_display_notes(NULL);
 
-       /* We restore the unset variables afterward. */
-       if (user_home)
-               setenv("HOME", user_home, 1);
-       if (xdg_home)
-               setenv("XDG_CONFIG_HOME", xdg_home, 1);
-
        if (nongit) {
                const char *name = ctx->repo->name;
                rc = errno;
@@ -538,6 +571,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        }
        sort_string_list(&ctx->repo->submodules);
        cgit_prepare_repo_env(ctx->repo);
+       choose_readme(ctx->repo);
        return 0;
 }
 
@@ -666,6 +700,20 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
        if (repo->max_stats != ctx.cfg.max_stats)
                fprintf(f, "repo.max-stats=%s\n",
                        cgit_find_stats_periodname(repo->max_stats));
+       if (repo->logo)
+               fprintf(f, "repo.logo=%s\n", repo->logo);
+       if (repo->logo_link)
+               fprintf(f, "repo.logo-link=%s\n", repo->logo_link);
+       fprintf(f, "repo.enable-remote-branches=%d\n", repo->enable_remote_branches);
+       fprintf(f, "repo.enable-subject-links=%d\n", repo->enable_subject_links);
+       if (repo->branch_sort == 1)
+               fprintf(f, "repo.branch-sort=age\n");
+       if (repo->commit_sort) {
+               if (repo->commit_sort == 1)
+                       fprintf(f, "repo.commit-sort=date\n");
+               else if (repo->commit_sort == 2)
+                       fprintf(f, "repo.commit-sort=topo\n");
+       }
        fprintf(f, "\n");
 }