mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-29 11:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lh/section-from-path'

Browse Source 
Conflicts:
	scan-tree.c
This commit is contained in:
Lars Hjemli 2010-09-19 18:46:17 +02:00
commit 536c7a1eb2
4 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cgit.c
View File

@ -193,6 +193,8 @@ void config_cb(const char *name, const char *value)
ctx.cfg.project_list, repo_config);
else
scan_tree(expand_macros(value), repo_config);
else if (!strcmp(name, "section-from-path"))
ctx.cfg.section_from_path = atoi(value);
else if (!strcmp(name, "source-filter"))
ctx.cfg.source_filter = new_filter(value, 1);
else if (!strcmp(name, "summary-log"))

1
cgit.h
View File

@ -206,6 +206,7 @@ struct cgit_config {
int noheader;
int renamelimit;
int remove_suffix;
int section_from_path;
int snapshots;
int summary_branches;
int summary_log;

6
cgitrc.5.txt
View File

@ -282,6 +282,12 @@ section::
after this option will inherit the current section name. Default value:
none.
section-from-path::
A number which, if specified before scan-path, specifies how many
path elements from each repo path to use as a default section name.
If negative, cgit will discard the specified number of path elements
above the repo directory. Default value: 0.
side-by-side-diffs::
If set to "1" shows side-by-side diffs instead of unidiffs per
default. Default value: "0".

42
scan-tree.c
View File

@ -61,11 +61,19 @@ static int git_owner_config(const char *key, const char *value, void *cb)
return 0;
}
static char *xstrrchr(char *s, char *from, int c)
{
while (from >= s && *from != c)
from--;
return from < s ? NULL : from;
}
static void add_repo(const char *base, const char *path, repo_config_fn fn)
{
struct stat st;
struct passwd *pwd;
char *p;
char *rel, *p, *slash;
int n;
size_t size;
if (stat(path, &st)) {
@ -80,14 +88,14 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
if (ctx.cfg.enable_gitweb_owner)
git_config_from_file(git_owner_config, fmt("%s/config", path), NULL);
if (base == path)
p = fmt("%s", path);
rel = xstrdup(fmt("%s", path));
else
p = fmt("%s", path + strlen(base) + 1);
rel = xstrdup(fmt("%s", path + strlen(base) + 1));
if (!strcmp(p + strlen(p) - 5, "/.git"))
p[strlen(p) - 5] = '\0';
if (!strcmp(rel + strlen(rel) - 5, "/.git"))
rel[strlen(rel) - 5] = '\0';
repo = cgit_add_repo(xstrdup(p));
repo = cgit_add_repo(rel);
if (ctx.cfg.remove_suffix)
if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git"))
*p = '\0';
@ -115,6 +123,28 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
if (!stat(p, &st))
repo->readme = "README.html";
}
if (ctx.cfg.section_from_path) {
n = ctx.cfg.section_from_path;
if (n > 0) {
slash = rel;
while (slash && n && (slash = strchr(slash, '/')))
n--;
} else {
slash = rel + strlen(rel);
while (slash && n && (slash = xstrrchr(rel, slash, '/')))
n++;
}
if (slash && !n) {
*slash = '\0';
repo->section = xstrdup(rel);
*slash = '/';
if (!prefixcmp(repo->name, repo->section)) {
repo->name += strlen(repo->section);
if (*repo->name == '/')
repo->name++;
}
}
}
p = fmt("%s/cgitrc", path);
if (!stat(p, &st)) {