Merge branch 'ml/bugfix'

diff --git a/Makefile b/Makefile
index 6c9d1184e2d5a3830fc113ae69e2da77645c0f6d..6a47ed256d7ff4f5bef91e5e983f160bc6a1d11e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.7.2.2
+GIT_VER = 1.7.3
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 INSTALL = install
 

diff --git a/cgit.c b/cgit.c
index 3b3f8d98a8a180d5d6ac9c87ed53e4b8f3263e25..96900bb5afbc04f02c0e643b22175c78e3886197 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -72,11 +72,7 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
        else if (!strcmp(name, "section"))
                repo->section = xstrdup(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) {
                if (!strcmp(name, "about-filter"))
                        repo->about_filter = new_filter(value, 0);
@@ -97,6 +93,8 @@ void config_cb(const char *name, const char *value)
                ctx.repo->path = trim_end(value, '/');
        else if (ctx.repo && !prefixcmp(name, "repo."))
                repo_config(ctx.repo, name + 5, value);
+       else if (!strcmp(name, "readme"))
+               ctx.cfg.readme = xstrdup(value);
        else if (!strcmp(name, "root-title"))
                ctx.cfg.root_title = xstrdup(value);
        else if (!strcmp(name, "root-desc"))
@@ -195,6 +193,8 @@ void config_cb(const char *name, const char *value)
                                      ctx.cfg.project_list, repo_config);
                else
                        scan_tree(expand_macros(value), repo_config);
+       else if (!strcmp(name, "section-from-path"))
+               ctx.cfg.section_from_path = atoi(value);
        else if (!strcmp(name, "source-filter"))
                ctx.cfg.source_filter = new_filter(value, 1);
        else if (!strcmp(name, "summary-log"))

diff --git a/cgit.h b/cgit.h
index 8f8428196ac2fe05e8141e0c893cc29ad362c18d..8f5dd2a7f2046eaca5b7eda311efa093f6f0f664 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -168,6 +168,7 @@ struct cgit_config {
        char *logo_link;
        char *module_link;
        char *project_list;
+       char *readme;
        char *robots;
        char *root_title;
        char *root_desc;
@@ -205,6 +206,7 @@ struct cgit_config {
        int noheader;
        int renamelimit;
        int remove_suffix;
+       int section_from_path;
        int snapshots;
        int summary_branches;
        int summary_log;

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index c643fae9f99497306a6ddbafc8fbed68d5a71cf2..ce78d419debc78718a3633aced47ec16feedea1f 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -234,6 +234,10 @@ project-list::
        should loaded as git repositories. This must be defined prior to
        scan-path. Default value: none. See also: scan-path.
 
+readme::
+       Text which will be used as default value for "repo.readme". Default
+       value: none.
+
 remove-suffix::
        If set to "1" and scan-path is enabled, if any repositories are found
        with a suffix of ".git", this suffix will be removed for the url and
@@ -278,6 +282,12 @@ section::
        after this option will inherit the current section name. Default value:
        none.
 
+section-from-path::
+       A number which, if specified before scan-path, specifies how many
+       path elements from each repo path to use as a default section name.
+       If negative, cgit will discard the specified number of path elements
+       above the repo directory. Default value: 0.
+
 side-by-side-diffs::
        If set to "1" shows side-by-side diffs instead of unidiffs per
        default. Default value: "0".
@@ -373,7 +383,7 @@ repo.readme::
        A path (relative to <repo.path>) which specifies a file to include
        verbatim as the "About" page for this repo. You may also specify a
        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>.
 
 repo.snapshots::
        A mask of allowed snapshot-formats for this repo, restricted by the

diff --git a/git b/git
index 8c67c392e1620fc3b749aa9e0b8da13bd84226f8..87b50542a08ac6caa083ddc376e674424e37940a 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 8c67c392e1620fc3b749aa9e0b8da13bd84226f8
+Subproject commit 87b50542a08ac6caa083ddc376e674424e37940a

diff --git a/scan-tree.c b/scan-tree.c
index e9878248346eaf8d48f6a5c8d3053fcf51d5270c..b5b50f332b812e4afcd7622a57d84bcf653959a6 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -61,11 +61,19 @@ static int git_owner_config(const char *key, const char *value, void *cb)
        return 0;
 }
 
+static char *xstrrchr(char *s, char *from, int c)
+{
+       while (from >= s && *from != c)
+               from--;
+       return from < s ? NULL : from;
+}
+
 static void add_repo(const char *base, const char *path, repo_config_fn fn)
 {
        struct stat st;
        struct passwd *pwd;
-       char *p;
+       char *rel, *p, *slash;
+       int n;
        size_t size;
 
        if (stat(path, &st)) {
@@ -80,14 +88,14 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
        if (ctx.cfg.enable_gitweb_owner)
                git_config_from_file(git_owner_config, fmt("%s/config", path), NULL);
        if (base == path)
-               p = fmt("%s", path);
+               rel = xstrdup(fmt("%s", path));
        else
-               p = fmt("%s", path + strlen(base) + 1);
+               rel = xstrdup(fmt("%s", path + strlen(base) + 1));
 
-       if (!strcmp(p + strlen(p) - 5, "/.git"))
-               p[strlen(p) - 5] = '\0';
+       if (!strcmp(rel + strlen(rel) - 5, "/.git"))
+               rel[strlen(rel) - 5] = '\0';
 
-       repo = cgit_add_repo(xstrdup(p));
+       repo = cgit_add_repo(rel);
        if (ctx.cfg.remove_suffix)
                if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git"))
                        *p = '\0';
@@ -110,9 +118,33 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
        if (!stat(p, &st))
                readfile(p, &repo->desc, &size);
 
-       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";
+       }
+       if (ctx.cfg.section_from_path) {
+               n  = ctx.cfg.section_from_path;
+               if (n > 0) {
+                       slash = rel;
+                       while (slash && n && (slash = strchr(slash, '/')))
+                               n--;
+               } else {
+                       slash = rel + strlen(rel);
+                       while (slash && n && (slash = xstrrchr(rel, slash, '/')))
+                               n++;
+               }
+               if (slash && !n) {
+                       *slash = '\0';
+                       repo->section = xstrdup(rel);
+                       *slash = '/';
+                       if (!prefixcmp(repo->name, repo->section)) {
+                               repo->name += strlen(repo->section);
+                               if (*repo->name == '/')
+                                       repo->name++;
+                       }
+               }
+       }
 
        p = fmt("%s/cgitrc", path);
        if (!stat(p, &st)) {

diff --git a/shared.c b/shared.c
index b42c2a2fdd829c635439b568076c4462222aad7a..72ac140d605cfe9b0144d757e041e9dfbb07e5ee 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -62,7 +62,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->enable_subject_links = ctx.cfg.enable_subject_links;
        ret->max_stats = ctx.cfg.max_stats;
        ret->module_link = ctx.cfg.module_link;
-       ret->readme = NULL;
+       ret->readme = ctx.cfg.readme;
        ret->mtime = -1;
        ret->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;

diff --git a/ui-summary.c b/ui-summary.c
index 02f191ea41065a0af04c2ca7d5154536d7abeba4..b203bccfabeab67d3e4043d1b26344775aca419c 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -70,33 +70,47 @@ void cgit_print_summary()
 
 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) {
                slash = strrchr(ctx.repo->readme, '/');
                if (!slash) {
-                       slash = strchr(ctx.repo->readme, ':');
-                       if (!slash)
+                       if (!colon)
                                return;
+                       slash = colon;
                }
                tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);
                strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);
                strcpy(tmp + (slash - ctx.repo->readme + 1), path);
        } else
                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'>");
        if (ctx.repo->about_filter)
                cgit_open_filter(ctx.repo->about_filter);