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) (unidiff) | |
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 | 23 |
1 files changed, 20 insertions, 3 deletions
@@ -181,9 +181,14 @@ void config_cb(const char *name, const char *value) | |||
181 | ctx.cfg.max_repo_count = atoi(value); | 181 | ctx.cfg.max_repo_count = atoi(value); |
182 | else if (!strcmp(name, "max-commit-count")) | 182 | else if (!strcmp(name, "max-commit-count")) |
183 | ctx.cfg.max_commit_count = atoi(value); | 183 | ctx.cfg.max_commit_count = atoi(value); |
184 | else if (!strcmp(name, "project-list")) | ||
185 | ctx.cfg.project_list = xstrdup(expand_macros(value)); | ||
184 | else if (!strcmp(name, "scan-path")) | 186 | else if (!strcmp(name, "scan-path")) |
185 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | 187 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
186 | process_cached_repolist(expand_macros(value)); | 188 | process_cached_repolist(expand_macros(value)); |
189 | else if (ctx.cfg.project_list) | ||
190 | scan_projects(expand_macros(value), | ||
191 | ctx.cfg.project_list, repo_config); | ||
187 | else | 192 | else |
188 | scan_tree(expand_macros(value), repo_config); | 193 | scan_tree(expand_macros(value), repo_config); |
189 | else if (!strcmp(name, "source-filter")) | 194 | else if (!strcmp(name, "source-filter")) |
@@ -295,6 +300,7 @@ static void prepare_context(struct cgit_context *ctx) | |||
295 | ctx->cfg.max_blob_size = 0; | 300 | ctx->cfg.max_blob_size = 0; |
296 | ctx->cfg.max_stats = 0; | 301 | ctx->cfg.max_stats = 0; |
297 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 302 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
303 | ctx->cfg.project_list = NULL; | ||
298 | ctx->cfg.renamelimit = -1; | 304 | ctx->cfg.renamelimit = -1; |
299 | ctx->cfg.robots = "index, nofollow"; | 305 | ctx->cfg.robots = "index, nofollow"; |
300 | ctx->cfg.root_title = "Git repository browser"; | 306 | ctx->cfg.root_title = "Git repository browser"; |
@@ -574,6 +580,9 @@ static int generate_cached_repolist(const char *path, const char *cached_rc) | |||
574 | return errno; | 580 | return errno; |
575 | } | 581 | } |
576 | idx = cgit_repolist.count; | 582 | idx = cgit_repolist.count; |
583 | if (ctx.cfg.project_list) | ||
584 | scan_projects(path, ctx.cfg.project_list, repo_config); | ||
585 | else | ||
577 | scan_tree(path, repo_config); | 586 | scan_tree(path, repo_config); |
578 | print_repolist(f, &cgit_repolist, idx); | 587 | print_repolist(f, &cgit_repolist, idx); |
579 | if (rename(locked_rc, cached_rc)) | 588 | if (rename(locked_rc, cached_rc)) |
@@ -588,17 +597,25 @@ static void process_cached_repolist(const char *path) | |||
588 | struct stat st; | 597 | struct stat st; |
589 | char *cached_rc; | 598 | char *cached_rc; |
590 | time_t age; | 599 | time_t age; |
600 | unsigned long hash; | ||
591 | 601 | ||
592 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, | 602 | hash = hash_str(path); |
593 | hash_str(path))); | 603 | if (ctx.cfg.project_list) |
604 | hash += hash_str(ctx.cfg.project_list); | ||
605 | cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, hash)); | ||
594 | 606 | ||
595 | if (stat(cached_rc, &st)) { | 607 | if (stat(cached_rc, &st)) { |
596 | /* Nothing is cached, we need to scan without forking. And | 608 | /* Nothing is cached, we need to scan without forking. And |
597 | * if we fail to generate a cached repolist, we need to | 609 | * if we fail to generate a cached repolist, we need to |
598 | * invoke scan_tree manually. | 610 | * invoke scan_tree manually. |
599 | */ | 611 | */ |
600 | if (generate_cached_repolist(path, cached_rc)) | 612 | if (generate_cached_repolist(path, cached_rc)) { |
613 | if (ctx.cfg.project_list) | ||
614 | scan_projects(path, ctx.cfg.project_list, | ||
615 | repo_config); | ||
616 | else | ||
601 | scan_tree(path, repo_config); | 617 | scan_tree(path, repo_config); |
618 | } | ||
602 | return; | 619 | return; |
603 | } | 620 | } |
604 | 621 | ||