summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--cgit.c8
-rw-r--r--cgit.h1
-rw-r--r--cgitrc.5.txt6
m---------git0
-rw-r--r--html.c9
-rw-r--r--scan-tree.c8
-rw-r--r--shared.c2
-rwxr-xr-xtests/t0108-patch.sh2
-rw-r--r--ui-snapshot.c1
-rw-r--r--ui-summary.c42
11 files changed, 52 insertions, 29 deletions
diff --git a/Makefile b/Makefile
index 2a15469..23fdd53 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
CGIT_CONFIG = /etc/cgitrc
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
INSTALL = install
diff --git a/cgit.c b/cgit.c
index 5666875..e1d2216 100644
--- a/cgit.c
+++ b/cgit.c
@@ -72,11 +72,7 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
else if (!strcmp(name, "section"))
repo->section = xstrdup(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) {
if (!strcmp(name, "about-filter"))
repo->about_filter = new_filter(value, 0);
@@ -97,6 +93,8 @@ void config_cb(const char *name, const char *value)
ctx.repo->path = trim_end(value, '/');
else if (ctx.repo && !prefixcmp(name, "repo."))
repo_config(ctx.repo, name + 5, value);
+ else if (!strcmp(name, "readme"))
+ ctx.cfg.readme = xstrdup(value);
else if (!strcmp(name, "root-title"))
ctx.cfg.root_title = xstrdup(value);
else if (!strcmp(name, "root-desc"))
diff --git a/cgit.h b/cgit.h
index 9b269cc..f8076c5 100644
--- a/cgit.h
+++ b/cgit.h
@@ -168,6 +168,7 @@ struct cgit_config {
char *logo_link;
char *module_link;
char *project_list;
+ char *readme;
char *robots;
char *root_title;
char *root_desc;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 95782df..ce78d41 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -234,6 +234,10 @@ project-list::
should loaded as git repositories. This must be defined prior to
scan-path. Default value: none. See also: scan-path.
+readme::
+ Text which will be used as default value for "repo.readme". Default
+ value: none.
+
remove-suffix::
If set to "1" and scan-path is enabled, if any repositories are found
with a suffix of ".git", this suffix will be removed for the url and
@@ -379,7 +383,7 @@ repo.readme::
A path (relative to <repo.path>) which specifies a file to include
verbatim as the "About" page for this repo. You may also specify a
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>.
repo.snapshots::
A mask of allowed snapshot-formats for this repo, restricted by the
diff --git a/git b/git
-Subproject 8c67c392e1620fc3b749aa9e0b8da13bd84226f
+Subproject 87b50542a08ac6caa083ddc376e674424e37940
diff --git a/html.c b/html.c
index 337baeb..eaabf72 100644
--- a/html.c
+++ b/html.c
@@ -268,19 +268,20 @@ int hextoint(char c)
char *convert_query_hexchar(char *txt)
{
- int d1, d2;
- if (strlen(txt) < 3) {
+ int d1, d2, n;
+ n = strlen(txt);
+ if (n < 3) {
*txt = '\0';
return txt-1;
}
d1 = hextoint(*(txt+1));
d2 = hextoint(*(txt+2));
if (d1<0 || d2<0) {
- strcpy(txt, txt+3);
+ memmove(txt, txt+3, n-3);
return txt-1;
} else {
*txt = d1 * 16 + d2;
- strcpy(txt+1, txt+3);
+ memmove(txt+1, txt+3, n-2);
return txt;
}
}
diff --git a/scan-tree.c b/scan-tree.c
index 6ba9193..b5b50f3 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -118,9 +118,11 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
if (!stat(p, &st))
readfile(p, &repo->desc, &size);
- 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) {
diff --git a/shared.c b/shared.c
index b42c2a2..72ac140 100644
--- a/shared.c
+++ b/shared.c
@@ -62,7 +62,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
ret->enable_subject_links = ctx.cfg.enable_subject_links;
ret->max_stats = ctx.cfg.max_stats;
ret->module_link = ctx.cfg.module_link;
- ret->readme = NULL;
+ ret->readme = ctx.cfg.readme;
ret->mtime = -1;
ret->about_filter = ctx.cfg.about_filter;
ret->commit_filter = ctx.cfg.commit_filter;
diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh
index 33351d6..e608104 100755
--- a/tests/t0108-patch.sh
+++ b/tests/t0108-patch.sh
@@ -35,3 +35,5 @@ run_test 'generate patch for initial commit' '
run_test 'find `cgit` signature' '
tail -1 trash/tmp | grep -e "^cgit"
'
+
+tests_done
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 1b25dca..6e3412c 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -92,6 +92,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
}
args.tree = commit->tree;
args.time = commit->date;
+ args.compression_level = Z_DEFAULT_COMPRESSION;
ctx.page.mimetype = xstrdup(format->mimetype);
ctx.page.filename = xstrdup(filename);
cgit_print_http_headers(&ctx);
diff --git a/ui-summary.c b/ui-summary.c
index 02f191e..b203bcc 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -70,33 +70,47 @@ void cgit_print_summary()
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) {
slash = strrchr(ctx.repo->readme, '/');
if (!slash) {
- slash = strchr(ctx.repo->readme, ':');
- if (!slash)
+ if (!colon)
return;
+ slash = colon;
}
tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);
strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);
strcpy(tmp + (slash - ctx.repo->readme + 1), path);
} else
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'>");
if (ctx.repo->about_filter)
cgit_open_filter(ctx.repo->about_filter);
powered by cgit and git | oriole.systems | how to verify signatures