1
0

Add support for repo-local cgitrc file

When recursively scanning a directory tree looking for git repositories,
cgit will now parse cgitrc files found within such repositories.

The repo-specific config files can include any repo-specific options
except 'repo.url' and 'repo.path'. Also, in such config files the 'repo.'
prefix can not be used, i.e. the valid options then becomes:
* name
* clone-url
* desc
* ower
* defbranch
* snapshots
* enable-log-filecount
* enable-log-linecount
* max-stats
* module-link
* section
* about-filter
* commit-filter
* source-filter
* readme

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Este cometimento está contido em:
Lars Hjemli 2009-08-24 00:04:58 +02:00
ascendente a1b3938f71
cometimento 74061ed5f0
5 ficheiros modificados com 39 adições e 13 eliminações

8
cgit.c
Ver ficheiro

@ -168,7 +168,7 @@ void config_cb(const char *name, const char *value)
if (!ctx.cfg.nocache && ctx.cfg.cache_size)
process_cached_repolist(value);
else
scan_tree(value);
scan_tree(value, repo_config);
else if (!strcmp(name, "source-filter"))
ctx.cfg.source_filter = new_filter(value, 1);
else if (!strcmp(name, "summary-log"))
@ -476,7 +476,7 @@ static int generate_cached_repolist(const char *path, const char *cached_rc)
return errno;
}
idx = cgit_repolist.count;
scan_tree(path);
scan_tree(path, repo_config);
print_repolist(f, &cgit_repolist, idx);
if (rename(locked_rc, cached_rc))
fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n",
@ -500,7 +500,7 @@ static void process_cached_repolist(const char *path)
* invoke scan_tree manually.
*/
if (generate_cached_repolist(path, cached_rc))
scan_tree(path);
scan_tree(path, repo_config);
return;
}
@ -559,7 +559,7 @@ static void cgit_parse_args(int argc, const char **argv)
if (!strncmp(argv[i], "--scan-tree=", 12) ||
!strncmp(argv[i], "--scan-path=", 12)) {
scan++;
scan_tree(argv[i] + 12);
scan_tree(argv[i] + 12, repo_config);
}
}
if (scan) {

3
cgit.h
Ver ficheiro

@ -79,6 +79,9 @@ struct cgit_repo {
struct cgit_filter *source_filter;
};
typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
const char *value);
struct cgit_repolist {
int length;
int count;

Ver ficheiro

@ -326,6 +326,15 @@ repo.url::
setting specified for each repo. Default value: none.
REPOSITORY-SPECIFIC CGITRC FILE
-------------------------------
When the option 'scan-path' is used to auto-discover git repositories, cgit
will try to parse the file 'cgitrc' within any found repository. Such a repo-
specific config file may contain any of the repo-specific options described
above, except 'repo.url' and 'repo.path'. Also, in a repo-specific config
file, the 'repo.' prefix is dropped from the config option names.
EXAMPLE CGITRC FILE
-------------------

Ver ficheiro

@ -1,4 +1,5 @@
#include "cgit.h"
#include "configfile.h"
#include "html.h"
#define MAX_PATH 4096
@ -35,9 +36,16 @@ static int is_git_dir(const char *path)
return 1;
}
static void add_repo(const char *base, const char *path)
struct cgit_repo *repo;
repo_config_fn config_fn;
static void repo_config(const char *name, const char *value)
{
config_fn(repo, name, value);
}
static void add_repo(const char *base, const char *path, repo_config_fn fn)
{
struct cgit_repo *repo;
struct stat st;
struct passwd *pwd;
char *p;
@ -76,9 +84,15 @@ static void add_repo(const char *base, const char *path)
p = fmt("%s/README.html", path);
if (!stat(p, &st))
repo->readme = "README.html";
p = fmt("%s/cgitrc", path);
if (!stat(p, &st)) {
config_fn = fn;
parse_configfile(xstrdup(p), &repo_config);
}
}
static void scan_path(const char *base, const char *path)
static void scan_path(const char *base, const char *path, repo_config_fn fn)
{
DIR *dir;
struct dirent *ent;
@ -86,11 +100,11 @@ static void scan_path(const char *base, const char *path)
struct stat st;
if (is_git_dir(path)) {
add_repo(base, path);
add_repo(base, path, fn);
return;
}
if (is_git_dir(fmt("%s/.git", path))) {
add_repo(base, fmt("%s/.git", path));
add_repo(base, fmt("%s/.git", path), fn);
return;
}
dir = opendir(path);
@ -120,13 +134,13 @@ static void scan_path(const char *base, const char *path)
continue;
}
if (S_ISDIR(st.st_mode))
scan_path(base, buf);
scan_path(base, buf, fn);
free(buf);
}
closedir(dir);
}
void scan_tree(const char *path)
void scan_tree(const char *path, repo_config_fn fn)
{
scan_path(path, path);
scan_path(path, path, fn);
}

Ver ficheiro

@ -1,3 +1,3 @@
extern void scan_tree(const char *path);
extern void scan_tree(const char *path, repo_config_fn fn);