From 6857bec50a52340fa6b85d626f49d45dd331ed0e Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Wed, 15 Jun 2011 10:04:13 +0200 Subject: 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.', which will be used for linking to submodules at paths matching one such entry. Signed-off-by: Lars Hjemli --- cgit.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'cgit.c') diff --git a/cgit.c b/cgit.c index 51ca78a..2118675 100644 --- 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; } -- cgit v1.2.3-59-g8ed1b From 3fbaf097153b239b092d11a178ace96671f9f3ec Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Wed, 15 Jun 2011 10:13:15 +0200 Subject: Do not provide a default value for `module-link` The old default value was an abomination which never should have been allowed to see the light of day. This patch removes the default, which is a backwards incompatible change with low probability of causing anyone any real trouble (a repo with submodules, displayed by cgit using the default value of `module-link`, is very unlikely to actually generate working links). Signed-off-by: Lars Hjemli --- cgit.c | 1 - cgitrc.5.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'cgit.c') diff --git a/cgit.c b/cgit.c index 2118675..9eb2535 100644 --- a/cgit.c +++ b/cgit.c @@ -343,7 +343,6 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.max_repodesc_len = 80; ctx->cfg.max_blob_size = 0; ctx->cfg.max_stats = 0; - ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; ctx->cfg.project_list = NULL; ctx->cfg.renamelimit = -1; ctx->cfg.remove_suffix = 0; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 1162bd5..c8198c1 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -230,7 +230,7 @@ module-link:: Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing. The arguments for the formatstring are the path and SHA1 of the submodule commit. Default - value: "./?repo=%s&page=commit&id=%s" + value: none. nocache:: If set to the value "1" caching will be disabled. This settings is -- cgit v1.2.3-59-g8ed1b