scan-tree: Support gitweb.category. Use gitweb.category from git config to determine repo's section, if option is enabled.
Jason A. Donenfeld Jason@zx2c4.com
Wed, 11 Jul 2012 05:32:45 +0200
4 files changed,
14 insertions(+),
0 deletions(-)
M
cgitrc.5.txt
→
cgitrc.5.txt
@@ -118,6 +118,12 @@ If set to "1" and scan-path is enabled, we first check each repository
for the git config value "gitweb.owner" to determine the owner. Default value: "1". See also: scan-path. +enable-gitweb-section:: + If set to "1" and scan-path is enabled, we first check each repository + for the git config value "gitweb.category" to determine the repository's + section. This value is overridden if section-from-path is enabled. + Default value: "1". See also: scan-path section-from-path. + enable-http-clone:: If set to "1", cgit will act as an dumb HTTP endpoint for git clones. If you use an alternate way of serving git repositories, you may wish
M
scan-tree.c
→
scan-tree.c
@@ -49,6 +49,7 @@ struct cgit_repo *repo;
repo_config_fn config_fn; char *owner; char *desc; +char *section; static void repo_config(const char *name, const char *value) {@@ -61,6 +62,8 @@ if (ctx.cfg.enable_gitweb_owner && !strcmp(key, "gitweb.owner"))
owner = xstrdup(value); else if (ctx.cfg.enable_gitweb_desc && !strcmp(key, "gitweb.description")) desc = xstrdup(value); + else if (ctx.cfg.enable_gitweb_section && !strcmp(key, "gitweb.category")) + section = xstrdup(value); return 0; }@@ -95,6 +98,7 @@ return;
owner = NULL; desc = NULL; + section = NULL; git_config_from_file(gitweb_config, fmt("%s/config", path), NULL); if (base == path)@@ -137,6 +141,8 @@ p = fmt("%s/README.html", path);
if (!stat(p, &st)) repo->readme = "README.html"; } + if (section) + repo->section = section; if (ctx.cfg.section_from_path) { n = ctx.cfg.section_from_path; if (n > 0) {