mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-26 10:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

scan-tree: Support gitweb.description.

Browse Source 
Use gitweb.description instead of description file to determine
description, if option is enabled.
This commit is contained in:
Jason A. Donenfeld 2012-07-11 04:24:01 +02:00
parent 45555512ba
commit b56be4ba3a
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cgit.c
View File

@ -163,6 +163,8 @@ void config_cb(const char *name, const char *value)
ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
else if (!strcmp(name, "enable-filter-overrides")) else if (!strcmp(name, "enable-filter-overrides"))
ctx.cfg.enable_filter_overrides = atoi(value); ctx.cfg.enable_filter_overrides = atoi(value);
else if (!strcmp(name, "enable-gitweb-desc"))
ctx.cfg.enable_gitweb_desc = atoi(value);
else if (!strcmp(name, "enable-gitweb-owner")) else if (!strcmp(name, "enable-gitweb-owner"))
ctx.cfg.enable_gitweb_owner = atoi(value); ctx.cfg.enable_gitweb_owner = atoi(value);
else if (!strcmp(name, "enable-http-clone")) else if (!strcmp(name, "enable-http-clone"))
@ -336,6 +338,7 @@ static void prepare_context(struct cgit_context *ctx)
ctx->cfg.css = "/cgit.css"; ctx->cfg.css = "/cgit.css";
ctx->cfg.logo = "/cgit.png"; ctx->cfg.logo = "/cgit.png";
ctx->cfg.local_time = 0; ctx->cfg.local_time = 0;
ctx->cfg.enable_gitweb_desc = 1;
ctx->cfg.enable_gitweb_owner = 1; ctx->cfg.enable_gitweb_owner = 1;
ctx->cfg.enable_http_clone = 1; ctx->cfg.enable_http_clone = 1;
ctx->cfg.enable_tree_linenumbers = 1; ctx->cfg.enable_tree_linenumbers = 1;

1
cgit.h
View File

@ -199,6 +199,7 @@ struct cgit_config {
int embedded; int embedded;
int enable_filter_overrides; int enable_filter_overrides;
int enable_gitweb_owner; int enable_gitweb_owner;
int enable_gitweb_desc;
int enable_http_clone; int enable_http_clone;
int enable_index_links; int enable_index_links;
int enable_commit_graph; int enable_commit_graph;

7
cgitrc.5.txt
View File

@ -106,6 +106,13 @@ enable-filter-overrides::
Flag which, when set to "1", allows all filter settings to be Flag which, when set to "1", allows all filter settings to be
overridden in repository-specific cgitrc files. Default value: none. overridden in repository-specific cgitrc files. Default value: none.
enable-gitweb-desc::
If set to "1" and scan-path is enabled, we first check each repository
for the git config value "gitweb.description" to determine the owner.
Otherwise, the description is read from a file titled "description"
inside of the repository directory.
Default value: "1". See also: scan-path.
enable-gitweb-owner:: enable-gitweb-owner::
If set to "1" and scan-path is enabled, we first check each repository 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. for the git config value "gitweb.owner" to determine the owner.

18
scan-tree.c
View File

@ -48,19 +48,24 @@ static int is_git_dir(const char *path)
struct cgit_repo *repo; struct cgit_repo *repo;
repo_config_fn config_fn; repo_config_fn config_fn;
char *owner; char *owner;
char *desc;
static void repo_config(const char *name, const char *value) static void repo_config(const char *name, const char *value)
{ {
config_fn(repo, name, value); config_fn(repo, name, value);
} }
static int git_owner_config(const char *key, const char *value, void *cb) static int gitweb_config(const char *key, const char *value, void *cb)
{ {
if (!strcmp(key, "gitweb.owner")) if (ctx.cfg.enable_gitweb_owner && !strcmp(key, "gitweb.owner"))
owner = xstrdup(value); owner = xstrdup(value);
else if (ctx.cfg.enable_gitweb_desc && !strcmp(key, "gitweb.description"))
desc = xstrdup(value);
return 0; return 0;
} }
static char *xstrrchr(char *s, char *from, int c) static char *xstrrchr(char *s, char *from, int c)
{ {
while (from >= s && *from != c) while (from >= s && *from != c)
@ -89,8 +94,9 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
return; return;
owner = NULL; owner = NULL;
if (ctx.cfg.enable_gitweb_owner) desc = NULL;
git_config_from_file(git_owner_config, fmt("%s/config", path), NULL); git_config_from_file(gitweb_config, fmt("%s/config", path), NULL);
if (base == path) if (base == path)
rel = xstrdup(fmt("%s", path)); rel = xstrdup(fmt("%s", path));
else else
@ -118,9 +124,13 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
} }
repo->owner = owner; repo->owner = owner;
if (desc)
repo->desc = desc;
else {
p = fmt("%s/description", path); p = fmt("%s/description", path);
if (!stat(p, &st)) if (!stat(p, &st))
readfile(p, &repo->desc, &size); readfile(p, &repo->desc, &size);
}
if (!repo->readme) { if (!repo->readme) {
p = fmt("%s/README.html", path); p = fmt("%s/README.html", path);