Merge branch 'lh/readme'

6 files changed, 43 insertions, 24 deletions

diff --git a/cgit.c b/cgit.c
index d6146e2..04cef23 100644
--- a/cgit.c
+++ b/cgit.c
@@ -74,7 +74,3 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
         else if (!strcmp(name, "readme") && value != NULL) {
-                char *colon;
-                if (*value == '/' || ((colon = strchr(value, ':')) != NULL && colon != value && *(colon + 1) != '\0'))
-                        repo->readme = xstrdup(value);
-                else
-                        repo->readme = xstrdup(fmt("%s/%s", repo->path, value));
+                repo->readme = xstrdup(value);
         } else if (ctx.cfg.enable_filter_overrides) {
@@ -99,2 +95,4 @@ void config_cb(const char *name, const char *value)
                 repo_config(ctx.repo, name + 5, value);
+        else if (!strcmp(name, "readme"))
+                ctx.cfg.readme = xstrdup(value);
         else if (!strcmp(name, "root-title"))
diff --git a/cgit.h b/cgit.h
index 4090cd4..72fb1c7 100644
--- a/cgit.h
+++ b/cgit.h
@@ -170,2 +170,3 @@ struct cgit_config {
         char *project_list;
+        char *readme;
         char *robots;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index c643fae..187031a 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -236,2 +236,6 @@ project-list::
 
+readme::
+        Text which will be used as default value for "repo.readme". Default
+        value: none.
+
 remove-suffix::
@@ -375,3 +379,3 @@ repo.readme::
         git refspec by head or by hash by prepending the refspec followed by
-        a colon. For example, "master:docs/readme.mkd" Default value: none.
+        a colon. For example, "master:docs/readme.mkd" Default value: <readme>.
 
diff --git a/scan-tree.c b/scan-tree.c
index e987824..780d405 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -112,5 +112,7 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
 
-        p = fmt("%s/README.html", path);
-        if (!stat(p, &st))
-                repo->readme = "README.html";
+        if (!repo->readme) {
+                p = fmt("%s/README.html", path);
+                if (!stat(p, &st))
+                        repo->readme = "README.html";
+        }
 
diff --git a/shared.c b/shared.c
index b42c2a2..72ac140 100644
--- a/shared.c
+++ b/shared.c
@@ -64,3 +64,3 @@ struct cgit_repo *cgit_add_repo(const char *url)
         ret->module_link = ctx.cfg.module_link;
-        ret->readme = NULL;
+        ret->readme = ctx.cfg.readme;
         ret->mtime = -1;
diff --git a/ui-summary.c b/ui-summary.c
index 02f191e..b203bcc 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -72,7 +72,27 @@ void cgit_print_repo_readme(char *path)
 {
-        char *slash, *tmp, *colon, *ref = 0;
+        char *slash, *tmp, *colon, *ref;
 
-        if (!ctx.repo->readme)
+        if (!ctx.repo->readme || !(*ctx.repo->readme))
                 return;
 
+        ref = NULL;
+
+        /* Check if the readme is tracked in the git repo. */
+        colon = strchr(ctx.repo->readme, ':');
+        if (colon && strlen(colon) > 1) {
+                *colon = '\0';
+                ref = ctx.repo->readme;
+                ctx.repo->readme = colon + 1;
+                if (!(*ctx.repo->readme))
+                        return;
+        }
+
+        /* Prepend repo path to relative readme path unless tracked. */
+        if (!ref && *ctx.repo->readme != '/')
+                ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path,
+                                               ctx.repo->readme));
+
+        /* If a subpath is specified for the about page, make it relative
+         * to the directory containing the configured readme.
+         */
         if (path) {
@@ -80,5 +100,5 @@ void cgit_print_repo_readme(char *path)
                 if (!slash) {
-                        slash = strchr(ctx.repo->readme, ':');
-                        if (!slash)
+                        if (!colon)
                                 return;
+                        slash = colon;
                 }
@@ -89,12 +109,6 @@ void cgit_print_repo_readme(char *path)
                 tmp = ctx.repo->readme;
-        colon = strchr(tmp, ':');
-        if (colon && strlen(colon) > 1) {
-                *colon = '\0';
-                ref = tmp;
-                tmp = colon + 1;
-                while ((*tmp == '/' || *tmp == ':') && *tmp != '\0')
-                        ++tmp;
-                if (!(*tmp))
-                        return;
-        }
+
+        /* Print the calculated readme, either from the git repo or from the
+         * filesystem, while applying the about-filter.
+         */
         html("<div id='summary'>");