diff options
author | Lars Hjemli <hjemli@gmail.com> | 2011-06-15 17:04:13 (JST) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-06-15 17:40:13 (JST) |
commit | 6857bec50a52340fa6b85d626f49d45dd331ed0e (patch) | |
tree | f746931d5173cab78d32ead3196186c97c5fd9b7 /cgit.c | |
parent | 8729d251a900b2e6e22cc4c93a2193fd8a2b9acf (diff) | |
download | cgit-6857bec50a52340fa6b85d626f49d45dd331ed0e.zip cgit-6857bec50a52340fa6b85d626f49d45dd331ed0e.tar.gz |
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>
Diffstat (limited to 'cgit.c')
-rw-r--r-- | cgit.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -60,6 +60,8 @@ static void process_cached_repolist(const char *path); | |||
60 | 60 | ||
61 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) | 61 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
62 | { | 62 | { |
63 | struct string_list_item *item; | ||
64 | |||
63 | if (!strcmp(name, "name")) | 65 | if (!strcmp(name, "name")) |
64 | repo->name = xstrdup(value); | 66 | repo->name = xstrdup(value); |
65 | else if (!strcmp(name, "clone-url")) | 67 | else if (!strcmp(name, "clone-url")) |
@@ -86,7 +88,10 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) | |||
86 | repo->max_stats = cgit_find_stats_period(value, NULL); | 88 | repo->max_stats = cgit_find_stats_period(value, NULL); |
87 | else if (!strcmp(name, "module-link")) | 89 | else if (!strcmp(name, "module-link")) |
88 | repo->module_link= xstrdup(value); | 90 | repo->module_link= xstrdup(value); |
89 | else if (!strcmp(name, "section")) | 91 | else if (!prefixcmp(name, "module-link.")) { |
92 | item = string_list_append(&repo->submodules, name + 12); | ||
93 | item->util = xstrdup(value); | ||
94 | } else if (!strcmp(name, "section")) | ||
90 | repo->section = xstrdup(value); | 95 | repo->section = xstrdup(value); |
91 | else if (!strcmp(name, "readme") && value != NULL) | 96 | else if (!strcmp(name, "readme") && value != NULL) |
92 | repo->readme = xstrdup(value); | 97 | repo->readme = xstrdup(value); |
@@ -465,6 +470,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx) | |||
465 | cgit_print_docend(); | 470 | cgit_print_docend(); |
466 | return 1; | 471 | return 1; |
467 | } | 472 | } |
473 | sort_string_list(&ctx->repo->submodules); | ||
468 | cgit_prepare_repo_env(ctx->repo); | 474 | cgit_prepare_repo_env(ctx->repo); |
469 | return 0; | 475 | return 0; |
470 | } | 476 | } |