-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | cgit.c | 10 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | cgitrc.5.txt | 12 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | scan-tree.c | 50 | ||||
-rw-r--r-- | shared.c | 2 | ||||
-rw-r--r-- | ui-summary.c | 42 |
8 files changed, 89 insertions, 31 deletions
@@ -7,3 +7,3 @@ CACHE_ROOT = /var/cache/cgit SHA1_HEADER = <openssl/sha.h> -GIT_VER = 1.7.2.2 +GIT_VER = 1.7.3 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 @@ -74,7 +74,3 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) else if (!strcmp(name, "readme") && value != NULL) { - char *colon; - if (*value == '/' || ((colon = strchr(value, ':')) != NULL && colon != value && *(colon + 1) != '\0')) - repo->readme = xstrdup(value); - else - repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); + repo->readme = xstrdup(value); } else if (ctx.cfg.enable_filter_overrides) { @@ -99,2 +95,4 @@ void config_cb(const char *name, const char *value) repo_config(ctx.repo, name + 5, value); + else if (!strcmp(name, "readme")) + ctx.cfg.readme = xstrdup(value); else if (!strcmp(name, "root-title")) @@ -197,2 +195,4 @@ void config_cb(const char *name, const char *value) 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")) @@ -170,2 +170,3 @@ struct cgit_config { char *project_list; + char *readme; char *robots; @@ -207,2 +208,3 @@ struct cgit_config { int remove_suffix; + int section_from_path; int snapshots; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index c643fae..ce78d41 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -236,2 +236,6 @@ project-list:: +readme:: + Text which will be used as default value for "repo.readme". Default + value: none. + remove-suffix:: @@ -280,2 +284,8 @@ section:: +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:: @@ -375,3 +385,3 @@ repo.readme:: git refspec by head or by hash by prepending the refspec followed by - a colon. For example, "master:docs/readme.mkd" Default value: none. + a colon. For example, "master:docs/readme.mkd" Default value: <readme>. diff --git a/git b/git -Subproject 8c67c392e1620fc3b749aa9e0b8da13bd84226f +Subproject 87b50542a08ac6caa083ddc376e674424e37940 diff --git a/scan-tree.c b/scan-tree.c index e987824..b5b50f3 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -63,2 +63,9 @@ static int git_owner_config(const char *key, const char *value, void *cb) +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) @@ -67,3 +74,4 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) struct passwd *pwd; - char *p; + char *rel, *p, *slash; + int n; size_t size; @@ -82,10 +90,10 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) 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) @@ -112,5 +120,29 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) - p = fmt("%s/README.html", path); - if (!stat(p, &st)) - repo->readme = "README.html"; + if (!repo->readme) { + p = fmt("%s/README.html", path); + 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++; + } + } + } @@ -64,3 +64,3 @@ struct cgit_repo *cgit_add_repo(const char *url) ret->module_link = ctx.cfg.module_link; - ret->readme = NULL; + ret->readme = ctx.cfg.readme; ret->mtime = -1; diff --git a/ui-summary.c b/ui-summary.c index 02f191e..b203bcc 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -72,7 +72,27 @@ void cgit_print_repo_readme(char *path) { - char *slash, *tmp, *colon, *ref = 0; + char *slash, *tmp, *colon, *ref; - if (!ctx.repo->readme) + if (!ctx.repo->readme || !(*ctx.repo->readme)) return; + ref = NULL; + + /* Check if the readme is tracked in the git repo. */ + colon = strchr(ctx.repo->readme, ':'); + if (colon && strlen(colon) > 1) { + *colon = '\0'; + ref = ctx.repo->readme; + ctx.repo->readme = colon + 1; + if (!(*ctx.repo->readme)) + return; + } + + /* Prepend repo path to relative readme path unless tracked. */ + if (!ref && *ctx.repo->readme != '/') + ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, + ctx.repo->readme)); + + /* If a subpath is specified for the about page, make it relative + * to the directory containing the configured readme. + */ if (path) { @@ -80,5 +100,5 @@ void cgit_print_repo_readme(char *path) if (!slash) { - slash = strchr(ctx.repo->readme, ':'); - if (!slash) + if (!colon) return; + slash = colon; } @@ -89,12 +109,6 @@ void cgit_print_repo_readme(char *path) tmp = ctx.repo->readme; - colon = strchr(tmp, ':'); - if (colon && strlen(colon) > 1) { - *colon = '\0'; - ref = tmp; - tmp = colon + 1; - while ((*tmp == '/' || *tmp == ':') && *tmp != '\0') - ++tmp; - if (!(*tmp)) - return; - } + + /* Print the calculated readme, either from the git repo or from the + * filesystem, while applying the about-filter. + */ html("<div id='summary'>"); |