ui-tree.c: add support for path-selected submodule links

The current 'repo.module-link' option is sufficient when all gitlinks
in a repository can be converted to commit links in a uniform way, but
not when different submodules/paths needs different settings.

This patch adds support for 'repo.module-link.<path>', which will be
used for linking to submodules at paths matching one such entry.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/cgit.c b/cgit.c
index 51ca78a6cd56cc1f9c338636c70dcb139f8cf47f..211867550c33198bbf6a61cacc809464139cf752 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -60,6 +60,8 @@ static void process_cached_repolist(const char *path);
 
 void repo_config(struct cgit_repo *repo, const char *name, const char *value)
 {
+       struct string_list_item *item;
+
        if (!strcmp(name, "name"))
                repo->name = xstrdup(value);
        else if (!strcmp(name, "clone-url"))
@@ -86,7 +88,10 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
                repo->max_stats = cgit_find_stats_period(value, NULL);
        else if (!strcmp(name, "module-link"))
                repo->module_link= xstrdup(value);
-       else if (!strcmp(name, "section"))
+       else if (!prefixcmp(name, "module-link.")) {
+               item = string_list_append(&repo->submodules, name + 12);
+               item->util = xstrdup(value);
+       } else if (!strcmp(name, "section"))
                repo->section = xstrdup(value);
        else if (!strcmp(name, "readme") && value != NULL)
                repo->readme = xstrdup(value);
@@ -465,6 +470,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
                cgit_print_docend();
                return 1;
        }
+       sort_string_list(&ctx->repo->submodules);
        cgit_prepare_repo_env(ctx->repo);
        return 0;
 }

diff --git a/cgit.h b/cgit.h
index bad66f0e24849d97d2630ac779792b1388c20494..9d0b3d012a33c14d207a740858208e7ffbc3320a 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -88,6 +88,7 @@ struct cgit_repo {
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
+       struct string_list submodules;
 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 4721c1e01335e10bd0fff7060b8281796a7ea557..1162bd501c758481fccf905d762dca33824e0db4 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -417,6 +417,12 @@ repo.module-link::
        formatstring are the path and SHA1 of the submodule commit. Default
        value: <module-link>
 
+repo.module-link.<path>::
+       Text which will be used as the formatstring for a hyperlink when a
+       submodule with the specified subdirectory path is printed in a
+       directory listing. The only argument for the formatstring is the SHA1
+       of the submodule commit. Default value: none.
+
 repo.max-stats::
        Override the default maximum statistics period. Valid values are equal
        to the values specified for the global "max-stats" setting. Default

diff --git a/shared.c b/shared.c
index 699c3624b1d67b28b8c111b6479df4c9bad43477..0add2e5df2e369e7ae1113bcdcd70985bcaf512b 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -71,6 +71,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->source_filter = ctx.cfg.source_filter;
        ret->clone_url = ctx.cfg.clone_url;
+       ret->submodules.strdup_strings = 1;
        return ret;
 }
 

diff --git a/ui-shared.c b/ui-shared.c
index 5aa911956aa3cbf344b437e15aad761f5cd11d86..b736fca2d02f79ed2edeca5e3d2e99c342e78f09 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -503,6 +503,62 @@ void cgit_object_link(struct object *obj)
        reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
 }
 
+struct string_list_item *lookup_path(struct string_list *list,
+                                    const char *path)
+{
+       struct string_list_item *item;
+
+       while (path && path[0]) {
+               if ((item = string_list_lookup(list, path)))
+                       return item;
+               if (!(path = strchr(path, '/')))
+                       break;
+               path++;
+       }
+       return NULL;
+}
+
+void cgit_submodule_link(const char *class, char *path, const char *rev)
+{
+       struct string_list *list;
+       struct string_list_item *item;
+       char tail, *dir;
+       size_t len;
+
+       tail = 0;
+       list = &ctx.repo->submodules;
+       item = lookup_path(list, path);
+       if (!item) {
+               len = strlen(path);
+               tail = path[len - 1];
+               if (tail == '/') {
+                       path[len - 1] = 0;
+                       item = lookup_path(list, path);
+               }
+       }
+       html("<a ");
+       if (class)
+               htmlf("class='%s' ", class);
+       html("href='");
+       if (item) {
+               html_attr(fmt(item->util, rev));
+       } else if (ctx.repo->module_link) {
+               dir = strrchr(path, '/');
+               if (dir)
+                       dir++;
+               else
+                       dir = path;
+               html_attr(fmt(ctx.repo->module_link, dir, rev));
+       } else {
+               html("#");
+       }
+       html("'>");
+       html_txt(path);
+       html("</a>");
+       if (item && tail)
+               path[len - 1] = tail;
+}
+
 void cgit_print_date(time_t secs, const char *format, int local_time)
 {
        char buf[64];

diff --git a/ui-shared.h b/ui-shared.h
index 3cc12586dfd77c03cf33fffb8dcf3ed8d4a211d8..e80b975ef8b0478c9f8bc7d6d49264deeb8b41f5 100644 (file)
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -51,6 +51,9 @@ extern void cgit_self_link(char *name, const char *title,
                           const char *class, struct cgit_context *ctx);
 extern void cgit_object_link(struct object *obj);
 
+extern void cgit_submodule_link(const char *class, char *path,
+                               const char *rev);
+
 extern void cgit_print_error(const char *msg);
 extern void cgit_print_date(time_t secs, const char *format, int local_time);
 extern void cgit_print_age(time_t t, time_t max_relative, const char *format);

diff --git a/ui-tree.c b/ui-tree.c
index 442b6be53d2c6ba6f7f4c17cd53d12da198c6f5d..b1adcc7b21e5044f489f751c21852400a329f322 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -150,13 +150,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        cgit_print_filemode(mode);
        html("</td><td>");
        if (S_ISGITLINK(mode)) {
-               htmlf("<a class='ls-mod' href='");
-               html_attr(fmt(ctx.repo->module_link,
-                             name,
-                             sha1_to_hex(sha1)));
-               html("'>");
-               html_txt(name);
-               html("</a>");
+               cgit_submodule_link("ls-mod", fullpath, sha1_to_hex(sha1));
        } else if (S_ISDIR(mode)) {
                cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
                               curr_rev, fullpath);
@@ -177,8 +171,9 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        if (ctx.repo->max_stats)
                cgit_stats_link("stats", NULL, "button", ctx.qry.head,
                                fullpath);
-       cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev,
-                       fullpath);
+       if (!S_ISGITLINK(mode))
+               cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev,
+                               fullpath);
        html("</td></tr>\n");
        free(name);
        return 0;