Merge branch 'lh/module-links'

This commit is contained in:
Lars Hjemli
2012-03-18 20:59:36 +00:00
8 changed files with 85 additions and 15 deletions

9
cgit.c
View File

@ -60,6 +60,8 @@ static void process_cached_repolist(const char *path);
void repo_config(struct cgit_repo *repo, const char *name, const char *value)
{
struct string_list_item *item;
if (!strcmp(name, "name"))
repo->name = xstrdup(value);
else if (!strcmp(name, "clone-url"))
@ -86,7 +88,10 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
repo->max_stats = cgit_find_stats_period(value, NULL);
else if (!strcmp(name, "module-link"))
repo->module_link= xstrdup(value);
else if (!strcmp(name, "section"))
else if (!prefixcmp(name, "module-link.")) {
item = string_list_append(&repo->submodules, name + 12);
item->util = xstrdup(value);
} else if (!strcmp(name, "section"))
repo->section = xstrdup(value);
else if (!strcmp(name, "readme") && value != NULL)
repo->readme = xstrdup(value);
@ -339,7 +344,6 @@ static void prepare_context(struct cgit_context *ctx)
ctx->cfg.max_repodesc_len = 80;
ctx->cfg.max_blob_size = 0;
ctx->cfg.max_stats = 0;
ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
ctx->cfg.project_list = NULL;
ctx->cfg.renamelimit = -1;
ctx->cfg.remove_suffix = 0;
@ -470,6 +474,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
cgit_print_docend();
return 1;
}
sort_string_list(&ctx->repo->submodules);
cgit_prepare_repo_env(ctx->repo);
return 0;
}