| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2010-07-29 15:52:29 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-04 01:09:32 (UTC) |
| commit | 3516502aa0df95ecc241caa30161741f59e4e600 (patch) (side-by-side diff) | |
| tree | 345978808d18796444729f74eb139c8289bcb1c2 /cgit.c | |
| parent | f9143171267e39f66a02ad2ecb0da2e8cc7f4142 (diff) | |
| download | cgit-3516502aa0df95ecc241caa30161741f59e4e600.zip cgit-3516502aa0df95ecc241caa30161741f59e4e600.tar.gz cgit-3516502aa0df95ecc241caa30161741f59e4e600.tar.bz2 | |
Add support for 'project-list' option
This option specifies the location of a projectlist file as used by
gitweb - when 'scan-tree' is later specified, only the projects listed in
the projectlist file will be added.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | cgit.c | 27 |
1 files changed, 22 insertions, 5 deletions
@@ -183,2 +183,4 @@ void config_cb(const char *name, const char *value) ctx.cfg.max_commit_count = atoi(value); + else if (!strcmp(name, "project-list")) + ctx.cfg.project_list = xstrdup(expand_macros(value)); else if (!strcmp(name, "scan-path")) @@ -186,2 +188,5 @@ void config_cb(const char *name, const char *value) process_cached_repolist(expand_macros(value)); + else if (ctx.cfg.project_list) + scan_projects(expand_macros(value), + ctx.cfg.project_list, repo_config); else @@ -297,2 +302,3 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; + ctx->cfg.project_list = NULL; ctx->cfg.renamelimit = -1; @@ -576,3 +582,6 @@ static int generate_cached_repolist(const char *path, const char *cached_rc) idx = cgit_repolist.count; - scan_tree(path, repo_config); + if (ctx.cfg.project_list) + scan_projects(path, ctx.cfg.project_list, repo_config); + else + scan_tree(path, repo_config); print_repolist(f, &cgit_repolist, idx); @@ -590,5 +599,8 @@ static void process_cached_repolist(const char *path) time_t age; + unsigned long hash; - cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, - hash_str(path))); + hash = hash_str(path); + if (ctx.cfg.project_list) + hash += hash_str(ctx.cfg.project_list); + cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, hash)); @@ -599,4 +611,9 @@ static void process_cached_repolist(const char *path) */ - if (generate_cached_repolist(path, cached_rc)) - scan_tree(path, repo_config); + if (generate_cached_repolist(path, cached_rc)) { + if (ctx.cfg.project_list) + scan_projects(path, ctx.cfg.project_list, + repo_config); + else + scan_tree(path, repo_config); + } return; |