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

Rename about-filter to render-filter

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-07-03 21:02:15 +02:00
parent c4167cbd65
commit 0ee035d4ec
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cgit.c
View File

@ -96,7 +96,7 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
else if (!strcmp(name, "ignore")) else if (!strcmp(name, "ignore"))
repo->ignore = atoi(value); repo->ignore = atoi(value);
else if (ctx.cfg.enable_filter_overrides) { else if (ctx.cfg.enable_filter_overrides) {
if (!strcmp(name, "about-filter")) if (!strcmp(name, "render-filter"))
repo->about_filter = cgit_new_filter(value, ABOUT); repo->about_filter = cgit_new_filter(value, ABOUT);
else if (!strcmp(name, "commit-filter")) else if (!strcmp(name, "commit-filter"))
repo->commit_filter = cgit_new_filter(value, COMMIT); repo->commit_filter = cgit_new_filter(value, COMMIT);
@ -205,7 +205,7 @@ static void config_cb(const char *name, const char *value)
ctx.cfg.cache_snapshot_ttl = atoi(value); ctx.cfg.cache_snapshot_ttl = atoi(value);
else if (!strcmp(name, "case-sensitive-sort")) else if (!strcmp(name, "case-sensitive-sort"))
ctx.cfg.case_sensitive_sort = atoi(value); ctx.cfg.case_sensitive_sort = atoi(value);
else if (!strcmp(name, "about-filter")) else if (!strcmp(name, "render-filter"))
ctx.cfg.about_filter = cgit_new_filter(value, ABOUT); ctx.cfg.about_filter = cgit_new_filter(value, ABOUT);
else if (!strcmp(name, "commit-filter")) else if (!strcmp(name, "commit-filter"))
ctx.cfg.commit_filter = cgit_new_filter(value, COMMIT); ctx.cfg.commit_filter = cgit_new_filter(value, COMMIT);
@ -816,7 +816,7 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
fprintf(f, "repo.enable-log-linecount=%d\n", fprintf(f, "repo.enable-log-linecount=%d\n",
repo->enable_log_linecount); repo->enable_log_linecount);
if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter)
cgit_fprintf_filter(repo->about_filter, f, "repo.about-filter="); cgit_fprintf_filter(repo->about_filter, f, "repo.render-filter=");
if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter) if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter)
cgit_fprintf_filter(repo->commit_filter, f, "repo.commit-filter="); cgit_fprintf_filter(repo->commit_filter, f, "repo.commit-filter=");
if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter) if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter)

8
cgitrc.5.txt
View File

@ -26,7 +26,7 @@ defined, use its value instead.
GLOBAL SETTINGS GLOBAL SETTINGS
--------------- ---------------
about-filter:: render-filter::
Specifies a command which will be invoked to format the content of Specifies a command which will be invoked to format the content of
about pages (both top-level and for each repository). The command will about pages (both top-level and for each repository). The command will
get the content of the about-file on its STDIN, the name of the file get the content of the about-file on its STDIN, the name of the file
@ -449,8 +449,8 @@ virtual-root::
REPOSITORY SETTINGS REPOSITORY SETTINGS
------------------- -------------------
repo.about-filter:: repo.render-filter::
Override the default about-filter. Default value: none. See also: Override the default render-filter. Default value: none. See also:
"enable-filter-overrides". See also: "FILTER API". "enable-filter-overrides". See also: "FILTER API".
repo.branch-sort:: repo.branch-sort::
@ -877,7 +877,7 @@ source-filter=/var/www/cgit/filters/syntax-highlighting.py
# Format markdown, restructuredtext, manpages, text files, and html files # Format markdown, restructuredtext, manpages, text files, and html files
# through the right converters # through the right converters
about-filter=/var/www/cgit/filters/about-formatting.sh render-filter=/var/www/cgit/filters/about-formatting.sh
## ##
## Search for these files in the root of the default branch of repositories ## Search for these files in the root of the default branch of repositories

2
filters/about-formatting.sh → filters/render-formatting.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# This may be used with the about-filter or repo.about-filter setting in cgitrc. # This may be used with the render-filter or repo.render-filter setting in cgitrc.
# It passes formatting of about pages to differing programs, depending on the usage. # It passes formatting of about pages to differing programs, depending on the usage.
# Markdown support requires python and markdown-python. # Markdown support requires python and markdown-python.

4
tests/setup.sh
View File

@ -134,7 +134,7 @@ repo.desc=spaced repo
repo.url=filter-exec repo.url=filter-exec
repo.path=$PWD/repos/filter/.git repo.path=$PWD/repos/filter/.git
repo.desc=filtered repo repo.desc=filtered repo
repo.about-filter=exec:$FILTER_DIRECTORY/dump.sh repo.render-filter=exec:$FILTER_DIRECTORY/dump.sh
repo.commit-filter=exec:$FILTER_DIRECTORY/dump.sh repo.commit-filter=exec:$FILTER_DIRECTORY/dump.sh
repo.email-filter=exec:$FILTER_DIRECTORY/dump.sh repo.email-filter=exec:$FILTER_DIRECTORY/dump.sh
repo.source-filter=exec:$FILTER_DIRECTORY/dump.sh repo.source-filter=exec:$FILTER_DIRECTORY/dump.sh
@ -146,7 +146,7 @@ EOF
repo.url=filter-lua repo.url=filter-lua
repo.path=$PWD/repos/filter/.git repo.path=$PWD/repos/filter/.git
repo.desc=filtered repo repo.desc=filtered repo
repo.about-filter=lua:$FILTER_DIRECTORY/dump.lua repo.render-filter=lua:$FILTER_DIRECTORY/dump.lua
repo.commit-filter=lua:$FILTER_DIRECTORY/dump.lua repo.commit-filter=lua:$FILTER_DIRECTORY/dump.lua
repo.email-filter=lua:$FILTER_DIRECTORY/dump.lua repo.email-filter=lua:$FILTER_DIRECTORY/dump.lua
repo.source-filter=lua:$FILTER_DIRECTORY/dump.lua repo.source-filter=lua:$FILTER_DIRECTORY/dump.lua

2
ui-summary.c
View File

@ -129,7 +129,7 @@ void cgit_print_repo_readme(char *path)
} }
/* Print the calculated readme, either from the git repo or from the /* Print the calculated readme, either from the git repo or from the
* filesystem, while applying the about-filter. * filesystem, while applying the render-filter.
*/ */
html("<div id='summary'>"); html("<div id='summary'>");
cgit_open_filter(ctx.repo->about_filter, filename); cgit_open_filter(ctx.repo->about_filter, filename);