/* cgit.c: cgi for the git scm
*
* Copyright (C) 2006 Lars Hjemli
- * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2010, 2012 Jason A. Donenfeld <Jason@zx2c4.com>
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
else if (!strcmp(name, "snapshots"))
repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
else if (!strcmp(name, "enable-commit-graph"))
- repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value);
+ repo->enable_commit_graph = atoi(value);
else if (!strcmp(name, "enable-log-filecount"))
- repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
+ repo->enable_log_filecount = atoi(value);
else if (!strcmp(name, "enable-log-linecount"))
- repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
+ repo->enable_log_linecount = atoi(value);
else if (!strcmp(name, "enable-remote-branches"))
repo->enable_remote_branches = atoi(value);
else if (!strcmp(name, "enable-subject-links"))
repo->enable_subject_links = atoi(value);
- else if (!strcmp(name, "max-stats"))
+ else if (!strcmp(name, "commit-sort")) {
+ if (!strcmp(value, "date"))
+ repo->commit_sort = 1;
+ if (!strcmp(value, "topo"))
+ repo->commit_sort = 2;
+ } else if (!strcmp(name, "max-stats"))
repo->max_stats = cgit_find_stats_period(value, NULL);
else if (!strcmp(name, "module-link"))
repo->module_link= xstrdup(value);
ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
else if (!strcmp(name, "enable-filter-overrides"))
ctx.cfg.enable_filter_overrides = atoi(value);
- else if (!strcmp(name, "enable-gitweb-owner"))
- ctx.cfg.enable_gitweb_owner = atoi(value);
else if (!strcmp(name, "enable-http-clone"))
ctx.cfg.enable_http_clone = atoi(value);
else if (!strcmp(name, "enable-index-links"))
ctx.cfg.enable_index_links = atoi(value);
+ else if (!strcmp(name, "enable-index-owner"))
+ ctx.cfg.enable_index_owner = atoi(value);
else if (!strcmp(name, "enable-commit-graph"))
ctx.cfg.enable_commit_graph = atoi(value);
else if (!strcmp(name, "enable-log-filecount"))
ctx.cfg.enable_subject_links = atoi(value);
else if (!strcmp(name, "enable-tree-linenumbers"))
ctx.cfg.enable_tree_linenumbers = atoi(value);
+ else if (!strcmp(name, "enable-git-config"))
+ ctx.cfg.enable_git_config = atoi(value);
else if (!strcmp(name, "max-stats"))
ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
else if (!strcmp(name, "cache-size"))
ctx.cfg.cache_static_ttl = atoi(value);
else if (!strcmp(name, "cache-dynamic-ttl"))
ctx.cfg.cache_dynamic_ttl = atoi(value);
+ else if (!strcmp(name, "case-sensitive-sort"))
+ ctx.cfg.case_sensitive_sort = atoi(value);
else if (!strcmp(name, "about-filter"))
ctx.cfg.about_filter = new_filter(value, ABOUT);
else if (!strcmp(name, "commit-filter"))
ctx.cfg.scan_hidden_path = atoi(value);
else if (!strcmp(name, "section-from-path"))
ctx.cfg.section_from_path = atoi(value);
+ else if (!strcmp(name, "repository-sort"))
+ ctx.cfg.repository_sort = xstrdup(value);
+ else if (!strcmp(name, "section-sort"))
+ ctx.cfg.section_sort = atoi(value);
else if (!strcmp(name, "source-filter"))
ctx.cfg.source_filter = new_filter(value, SOURCE);
else if (!strcmp(name, "summary-log"))
ctx.cfg.ssdiff = atoi(value);
else if (!strcmp(name, "agefile"))
ctx.cfg.agefile = xstrdup(value);
+ else if (!strcmp(name, "mimetype-file"))
+ ctx.cfg.mimetype_file = xstrdup(value);
else if (!strcmp(name, "renamelimit"))
ctx.cfg.renamelimit = atoi(value);
else if (!strcmp(name, "remove-suffix"))
ctx.cfg.clone_url = xstrdup(value);
else if (!strcmp(name, "local-time"))
ctx.cfg.local_time = atoi(value);
- else if (!prefixcmp(name, "mimetype."))
+ else if (!strcmp(name, "commit-sort")) {
+ if (!strcmp(value, "date"))
+ ctx.cfg.commit_sort = 1;
+ if (!strcmp(value, "topo"))
+ ctx.cfg.commit_sort = 2;
+ } else if (!prefixcmp(name, "mimetype."))
add_mimetype(name + 9, value);
else if (!strcmp(name, "include"))
parse_configfile(expand_macros(value), config_cb);
ctx.qry.name = xstrdup(value);
} else if (!strcmp(name, "mimetype")) {
ctx.qry.mimetype = xstrdup(value);
- } else if (!strcmp(name, "s")){
+ } else if (!strcmp(name, "s")) {
ctx.qry.sort = xstrdup(value);
} else if (!strcmp(name, "showmsg")) {
ctx.qry.showmsg = atoi(value);
ctx.qry.period = xstrdup(value);
} else if (!strcmp(name, "ss")) {
ctx.qry.ssdiff = atoi(value);
+ ctx.qry.has_ssdiff = 1;
} else if (!strcmp(name, "all")) {
ctx.qry.show_all = atoi(value);
} else if (!strcmp(name, "context")) {
ctx->cfg.cache_root_ttl = 5;
ctx->cfg.cache_scanrc_ttl = 15;
ctx->cfg.cache_static_ttl = -1;
+ ctx->cfg.case_sensitive_sort = 1;
ctx->cfg.css = "/cgit.css";
ctx->cfg.logo = "/cgit.png";
ctx->cfg.local_time = 0;
- ctx->cfg.enable_gitweb_owner = 1;
ctx->cfg.enable_http_clone = 1;
+ ctx->cfg.enable_index_owner = 1;
ctx->cfg.enable_tree_linenumbers = 1;
+ ctx->cfg.enable_git_config = 0;
ctx->cfg.max_repo_count = 50;
ctx->cfg.max_commit_count = 50;
ctx->cfg.max_lock_attempts = 5;
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;
ctx->cfg.scan_hidden_path = 0;
ctx->cfg.script_name = CGIT_SCRIPT_NAME;
ctx->cfg.section = "";
+ ctx->cfg.repository_sort = "name";
+ ctx->cfg.section_sort = 1;
ctx->cfg.summary_branches = 10;
ctx->cfg.summary_log = 10;
ctx->cfg.summary_tags = 10;
return ref;
}
+static char *guess_defbranch(const char *repo_path)
+{
+ const char *ref;
+ unsigned char sha1[20];
+
+ ref = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
+ if (!ref || prefixcmp(ref, "refs/heads/"))
+ return "master";
+ return xstrdup(ref + 11);
+}
+
static int prepare_repo_cmd(struct cgit_context *ctx)
{
char *tmp;
unsigned char sha1[20];
int nongit = 0;
+ int rc;
setenv("GIT_DIR", ctx->repo->path, 1);
setup_git_directory_gently(&nongit);
if (nongit) {
+ rc = errno;
ctx->page.title = fmt("%s - %s", ctx->cfg.root_title,
"config error");
- tmp = fmt("Not a git repository: '%s'", ctx->repo->path);
+ tmp = fmt("Failed to open %s: %s",
+ ctx->repo->name,
+ rc ? strerror(rc) : "Not a valid git repository");
ctx->repo = NULL;
cgit_print_http_headers(ctx);
cgit_print_docstart(ctx);
}
ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
+ if (!ctx->repo->defbranch)
+ ctx->repo->defbranch = guess_defbranch(ctx->repo->path);
+
if (!ctx->qry.head) {
ctx->qry.nohead = 1;
ctx->qry.head = find_default_branch(ctx->repo);
- ctx->repo->defbranch = ctx->qry.head;
}
if (!ctx->qry.head) {
{
int i;
- for(i = start; i < list->count; i++)
+ for (i = start; i < list->count; i++)
print_repo(f, &list->repos[i]);
}
for (i = 1; i < argc; i++) {
if (!strncmp(argv[i], "--cache=", 8)) {
- ctx.cfg.cache_root = xstrdup(argv[i]+8);
+ ctx.cfg.cache_root = xstrdup(argv[i] + 8);
}
if (!strcmp(argv[i], "--nocache")) {
ctx.cfg.nocache = 1;
ctx.env.no_http = "1";
}
if (!strncmp(argv[i], "--query=", 8)) {
- ctx.qry.raw = xstrdup(argv[i]+8);
+ ctx.qry.raw = xstrdup(argv[i] + 8);
}
if (!strncmp(argv[i], "--repo=", 7)) {
- ctx.qry.repo = xstrdup(argv[i]+7);
+ ctx.qry.repo = xstrdup(argv[i] + 7);
}
if (!strncmp(argv[i], "--page=", 7)) {
- ctx.qry.page = xstrdup(argv[i]+7);
+ ctx.qry.page = xstrdup(argv[i] + 7);
}
if (!strncmp(argv[i], "--head=", 7)) {
- ctx.qry.head = xstrdup(argv[i]+7);
+ ctx.qry.head = xstrdup(argv[i] + 7);
ctx.qry.has_symref = 1;
}
if (!strncmp(argv[i], "--sha1=", 7)) {
- ctx.qry.sha1 = xstrdup(argv[i]+7);
+ ctx.qry.sha1 = xstrdup(argv[i] + 7);
ctx.qry.has_sha1 = 1;
}
if (!strncmp(argv[i], "--ofs=", 6)) {
- ctx.qry.ofs = atoi(argv[i]+6);
+ ctx.qry.ofs = atoi(argv[i] + 6);
}
if (!strncmp(argv[i], "--scan-tree=", 12) ||
!strncmp(argv[i], "--scan-path=", 12)) {
ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/');
if (!ctx.cfg.virtual_root)
ctx.cfg.virtual_root = "";
- }
+ }
/* If no url parameter is specified on the querystring, lets
* use PATH_INFO as url. This allows cgit to work with virtual
}
ttl = calc_ttl();
- ctx.page.expires += ttl*60;
+ ctx.page.expires += ttl * 60;
if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
ctx.cfg.nocache = 1;
if (ctx.cfg.nocache)
git.ckatri.com / cgit.git / blobdiff