Merge branch 'lh/section-from-path'

Conflicts:
	scan-tree.c

diff --git a/cgit.c b/cgit.c
index 04cef23d0d0f27b4a7c9fa663bb9c7e425e23ebf..e1d2216ffb3ae32b3a343cb677647fb716c01a40 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -193,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 72fb1c700fe90e86e34ae7046b9d972094cee79f..f8076c58061cdde0a1656006525e6e5c58f96b56 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -206,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 187031aaa408a486eb1673d96ad68c1f0bbfb5df..ce78d419debc78718a3633aced47ec16feedea1f 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -282,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".

diff --git a/scan-tree.c b/scan-tree.c
index 780d405425b283d096dda4dd86b89bcee5028f76..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';
@@ -115,6 +123,28 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                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)) {