Author: Lars Hjemli <hjemli@gmail.com>
Merge branch 'lh/clone-url'
cgit.c | 3 +++ cgit.h | 5 ++++- cgitrc.5.txt | 17 ++++++++++++++--- shared.c | 8 ++++---- tests/setup.sh | 1 + tests/t0102-summary.sh | 6 ++++++ ui-commit.c | 6 +++--- ui-repolist.c | 2 +- ui-snapshot.c | 2 +- ui-summary.c | 4 ++-- ui-tree.c | 2 +-
diff --git a/cgit.c b/cgit.c index 6be3754d47d1c75300189ebab68e0a1c6488a139..51ca78a6cd56cc1f9c338636c70dcb139f8cf47f 100644 --- a/cgit.c +++ b/cgit.c @@ -244,6 +244,8 @@ else if (!strcmp(name, "robots")) ctx.cfg.robots = xstrdup(value); else if (!strcmp(name, "clone-prefix")) ctx.cfg.clone_prefix = xstrdup(value); + else if (!strcmp(name, "clone-url")) + ctx.cfg.clone_url = xstrdup(value); else if (!strcmp(name, "local-time")) ctx.cfg.local_time = atoi(value); else if (!prefixcmp(name, "mimetype.")) @@ -463,6 +465,7 @@ cgit_print_error(fmt("Invalid branch: %s", tmp)); cgit_print_docend(); return 1; } + cgit_prepare_repo_env(ctx->repo); return 0; } diff --git a/cgit.h b/cgit.h index caa9d8e91853ae626f96ff939896f0dfb83a2e31..bad66f0e24849d97d2630ac779792b1388c20494 100644 --- a/cgit.h +++ b/cgit.h @@ -165,6 +165,7 @@ struct cgit_config { char *agefile; char *cache_root; char *clone_prefix; + char *clone_url; char *css; char *favicon; char *footer; @@ -319,8 +320,10 @@ extern const char *cgit_repobasename(const char *reponame); extern int cgit_parse_snapshots_mask(const char *str); -extern int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo); +extern int cgit_open_filter(struct cgit_filter *filter); extern int cgit_close_filter(struct cgit_filter *filter); + +extern void cgit_prepare_repo_env(struct cgit_repo * repo); extern int readfile(const char *path, char **buf, size_t *size); diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 9a9965b479f38fa7b2947a7ee90087304781daae..5ba81345dda303e9c1147810befee86273e2e4ff 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -76,6 +76,11 @@ repository url, generates valid clone urls for the repository. This setting is only used if `repo.clone-url` is unspecified. Default value: none. +clone-url:: + Space-separated list of clone-url templates. This setting is only + used if `repo.clone-url` is unspecified. Default value: none. See + also: "MACRO EXPANSION", "FILTER API". + commit-filter:: Specifies a command which will be invoked to format commit messages. The command will get the message on its STDIN, and the STDOUT from the @@ -363,7 +368,7 @@ "enable-filter-overrides". See also: "FILTER API". repo.clone-url:: A list of space-separated urls which can be used to clone this repo. - Default value: none. + Default value: none. See also: "MACRO EXPANSION". repo.commit-filter:: Override the default commit-filter. Default value: none. See also: @@ -511,6 +516,12 @@ can be accomplished by adding the following line to /etc/cgitrc: include=/etc/cgitrc.d/$HTTP_HOST +The following options are expanded during request processing, and support +the environment variables defined in "FILTER API": + +- clone-url +- repo.clone-url + EXAMPLE CGITRC FILE ------------------- @@ -520,8 +531,8 @@ # Enable caching of up to 1000 output entriess cache-size=1000 -# Specify some default clone prefixes -clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git +# Specify some default clone urls using macro expansion +clone-url=git://foo.org/$CGIT_REPO_URL git@foo.org:$CGIT_REPO_URL # Specify the css url css=/css/cgit.css diff --git a/shared.c b/shared.c index be2ae59e0a3fb764b8f3d6977189ff492d831a8c..699c3624b1d67b28b8c111b6479df4c9bad43477 100644 --- a/shared.c +++ b/shared.c @@ -70,6 +70,7 @@ ret->mtime = -1; ret->about_filter = ctx.cfg.about_filter; ret->commit_filter = ctx.cfg.commit_filter; ret->source_filter = ctx.cfg.source_filter; + ret->clone_url = ctx.cfg.clone_url; return ret; } @@ -374,7 +375,8 @@ char * name; char * value; } cgit_env_var; -static void prepare_env(struct cgit_repo * repo) { +void cgit_prepare_repo_env(struct cgit_repo * repo) +{ cgit_env_var env_vars[] = { { .name = "CGIT_REPO_URL", .value = repo->url }, { .name = "CGIT_REPO_NAME", .value = repo->name }, @@ -395,7 +397,7 @@ if (setenv(p->name, p->value, 1)) fprintf(stderr, warn, p->name, p->value); } -int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo) +int cgit_open_filter(struct cgit_filter *filter) { filter->old_stdout = chk_positive(dup(STDOUT_FILENO), @@ -406,8 +408,6 @@ if (filter->pid == 0) { close(filter->pipe_fh[1]); chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), "Unable to use pipe as STDIN"); - if (repo) - prepare_env(repo); execvp(filter->cmd, filter->argv); die("Unable to exec subprocess %s: %s (%d)", filter->cmd, strerror(errno), errno); diff --git a/tests/setup.sh b/tests/setup.sh index b2f1169c789846abc912c7429dee19dfb3c1487c..1e061078a2584b0b74eaa6976cf126896851a231 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -62,6 +62,7 @@ enable-log-linecount=1 summary-log=5 summary-branches=5 summary-tags=5 +clone-url=git://example.org/\$CGIT_REPO_URL.git repo.url=foo repo.path=$PWD/trash/repos/foo/.git diff --git a/tests/t0102-summary.sh b/tests/t0102-summary.sh index f0b0d9a700beea9d0754febbe79c17b1c324501d..f299c5a4d4440b1b1d66519f16828c8754505f1c 100755 --- a/tests/t0102-summary.sh +++ b/tests/t0102-summary.sh @@ -9,6 +9,9 @@ run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' run_test 'find commit 5' 'grep -e "commit 5" trash/tmp' run_test 'find branch master' 'grep -e "master" trash/tmp' run_test 'no tags' '! grep -e "tags" trash/tmp' +run_test 'clone-url expanded correctly' ' + grep -e "git://example.org/foo.git" trash/tmp +' run_test 'generate bar summary' 'cgit_url "bar" >trash/tmp' run_test 'no commit 45' '! grep -e "commit 45" trash/tmp' @@ -16,5 +19,8 @@ run_test 'find commit 46' 'grep -e "commit 46" trash/tmp' run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' run_test 'find branch master' 'grep -e "master" trash/tmp' run_test 'no tags' '! grep -e "tags" trash/tmp' +run_test 'clone-url expanded correctly' ' + grep -e "git://example.org/bar.git" trash/tmp +' tests_done diff --git a/ui-commit.c b/ui-commit.c index a69dec649f05cb8035f415dc395ed6d1f312f921..536a8e82d5486be05e98f59079ba1c7bfe536d75 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -106,7 +106,7 @@ } html("</table>\n"); html("<div class='commit-subject'>"); if (ctx.repo->commit_filter) - cgit_open_filter(ctx.repo->commit_filter, ctx.repo); + cgit_open_filter(ctx.repo->commit_filter); html_txt(info->subject); if (ctx.repo->commit_filter) cgit_close_filter(ctx.repo->commit_filter); @@ -114,7 +114,7 @@ show_commit_decorations(commit); html("</div>"); html("<div class='commit-msg'>"); if (ctx.repo->commit_filter) - cgit_open_filter(ctx.repo->commit_filter, ctx.repo); + cgit_open_filter(ctx.repo->commit_filter); html_txt(info->msg); if (ctx.repo->commit_filter) cgit_close_filter(ctx.repo->commit_filter); @@ -123,7 +123,7 @@ if (notes.len != 0) { html("<div class='notes-header'>Notes</div>"); html("<div class='notes'>"); if (ctx.repo->commit_filter) - cgit_open_filter(ctx.repo->commit_filter, ctx.repo); + cgit_open_filter(ctx.repo->commit_filter); html_txt(notes.buf); if (ctx.repo->commit_filter) cgit_close_filter(ctx.repo->commit_filter); diff --git a/ui-repolist.c b/ui-repolist.c index dce2eacbbb750779b9eae7d2889fe48051960937..25c36ce39b052bddd62199bf398c5c80ede05cc9 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -300,7 +300,7 @@ { if (!ctx.cfg.root_readme) return; if (ctx.cfg.about_filter) - cgit_open_filter(ctx.cfg.about_filter, NULL); + cgit_open_filter(ctx.cfg.about_filter); html_include(ctx.cfg.root_readme); if (ctx.cfg.about_filter) cgit_close_filter(ctx.cfg.about_filter); diff --git a/ui-snapshot.c b/ui-snapshot.c index 126779d18f12098f5cbde679afb57b8807e2056f..07cc944525c53096b5c429f25fd2b29c68eaa28f 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -19,7 +19,7 @@ f.cmd = xstrdup(filter); f.argv = malloc(2 * sizeof(char *)); f.argv[0] = f.cmd; f.argv[1] = NULL; - cgit_open_filter(&f, NULL); + cgit_open_filter(&f); rv = write_tar_archive(args); cgit_close_filter(&f); return rv; diff --git a/ui-summary.c b/ui-summary.c index 1e9a1b6daec6120c46148752b5afc8ec18e41691..227ed276d453c951174a815747674f8993f6a337 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -62,7 +62,7 @@ cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, NULL, NULL, 0, 0); } if (ctx.repo->clone_url) - print_urls(ctx.repo->clone_url, NULL); + print_urls(expand_macros(ctx.repo->clone_url), NULL); else if (ctx.cfg.clone_prefix) print_urls(ctx.cfg.clone_prefix, ctx.repo->url); html("</table>"); @@ -113,7 +113,7 @@ * filesystem, while applying the about-filter. */ html("<div id='summary'>"); if (ctx.repo->about_filter) - cgit_open_filter(ctx.repo->about_filter, ctx.repo); + cgit_open_filter(ctx.repo->about_filter); if (ref) cgit_print_file(tmp, ref); else diff --git a/ui-tree.c b/ui-tree.c index 2d8d2f3b83738fb007228f6f84e78dbe881d7f39..442b6be53d2c6ba6f7f4c17cd53d12da198c6f5d 100644 --- a/ui-tree.c +++ b/ui-tree.c @@ -45,7 +45,7 @@ if (ctx.repo->source_filter) { html("<td class='lines'><pre><code>"); ctx.repo->source_filter->argv[1] = xstrdup(name); - cgit_open_filter(ctx.repo->source_filter, ctx.repo); + cgit_open_filter(ctx.repo->source_filter); html_raw(buf, size); cgit_close_filter(ctx.repo->source_filter); free(ctx.repo->source_filter->argv[1]);