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

Rename "linenumbers" to "enable-tree-linenumbers", change default to "1"

Browse Source 
This makes the name of the cgitrc option more descriptive and at the
same time changes the default from "0" to "1" in an attempt to stay
backwards compatible - prior to the introduction of "source-filter"
and "linenumbers", cgit always generated linenumber links in the
tree view, but now this feature can be turned off (one might want to
do this if the source-filter performs line-wrapping etc).

While at it, the documentation is updated to match the surrounding
descriptions.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2009-08-21 14:26:52 +02:00
parent d67cc7f9d5
commit b0f946bcc7
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cgit.c
View File

@ -66,8 +66,6 @@ void config_cb(const char *name, const char *value)
ctx.cfg.index_info = xstrdup(value); ctx.cfg.index_info = xstrdup(value);
else if (!strcmp(name, "logo-link")) else if (!strcmp(name, "logo-link"))
ctx.cfg.logo_link = xstrdup(value); ctx.cfg.logo_link = xstrdup(value);
else if (!strcmp(name, "linenumbers"))
ctx.cfg.linenumbers = atoi(value);
else if (!strcmp(name, "module-link")) else if (!strcmp(name, "module-link"))
ctx.cfg.module_link = xstrdup(value); ctx.cfg.module_link = xstrdup(value);
else if (!strcmp(name, "virtual-root")) { else if (!strcmp(name, "virtual-root")) {
@ -88,6 +86,8 @@ void config_cb(const char *name, const char *value)
ctx.cfg.enable_log_filecount = atoi(value); ctx.cfg.enable_log_filecount = atoi(value);
else if (!strcmp(name, "enable-log-linecount")) else if (!strcmp(name, "enable-log-linecount"))
ctx.cfg.enable_log_linecount = atoi(value); ctx.cfg.enable_log_linecount = atoi(value);
else if (!strcmp(name, "enable-tree-linenumbers"))
ctx.cfg.enable_tree_linenumbers = atoi(value);
else if (!strcmp(name, "max-stats")) else if (!strcmp(name, "max-stats"))
ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
else if (!strcmp(name, "cache-size")) else if (!strcmp(name, "cache-size"))
@ -240,6 +240,7 @@ static void prepare_context(struct cgit_context *ctx)
ctx->cfg.css = "/cgit.css"; ctx->cfg.css = "/cgit.css";
ctx->cfg.logo = "/cgit.png"; ctx->cfg.logo = "/cgit.png";
ctx->cfg.local_time = 0; ctx->cfg.local_time = 0;
ctx->cfg.enable_tree_linenumbers = 1;
ctx->cfg.max_repo_count = 50; ctx->cfg.max_repo_count = 50;
ctx->cfg.max_commit_count = 50; ctx->cfg.max_commit_count = 50;
ctx->cfg.max_lock_attempts = 5; ctx->cfg.max_lock_attempts = 5;

2
cgit.h
View File

@ -173,8 +173,8 @@ struct cgit_config {
int enable_index_links; int enable_index_links;
int enable_log_filecount; int enable_log_filecount;
int enable_log_linecount; int enable_log_linecount;
int enable_tree_linenumbers;
int local_time; int local_time;
int linenumbers;
int max_repo_count; int max_repo_count;
int max_commit_count; int max_commit_count;
int max_lock_attempts; int max_lock_attempts;

8
cgitrc.5.txt
View File

@ -99,6 +99,10 @@ enable-log-linecount::
and removed lines for each commit on the repository log page. Default and removed lines for each commit on the repository log page. Default
value: "0". value: "0".
enable-tree-linenumbers::
Flag which, when set to "1", will make cgit generate linenumber links
for plaintext blobs printed in the tree view. Default value: "1".
favicon:: favicon::
Url used as link to a shortcut icon for cgit. If specified, it is Url used as link to a shortcut icon for cgit. If specified, it is
suggested to use the value "/favicon.ico" since certain browsers will suggested to use the value "/favicon.ico" since certain browsers will
@ -146,10 +150,6 @@ logo-link::
calculated url of the repository index page will be used. Default calculated url of the repository index page will be used. Default
value: none. value: none.
linenumbers::
If set to "1" lines in tree view will have numbers.
Default value: "0".
max-commit-count:: max-commit-count::
Specifies the number of entries to list per page in "log" view. Default Specifies the number of entries to list per page in "log" view. Default
value: "50". value: "50".

2
ui-tree.c
View File

@ -23,7 +23,7 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
html("<table summary='blob content' class='blob'>\n"); html("<table summary='blob content' class='blob'>\n");
if (ctx.cfg.linenumbers) { if (ctx.cfg.enable_tree_linenumbers) {
html("<tr><td class='linenumbers'><pre>"); html("<tr><td class='linenumbers'><pre>");
idx = 0; idx = 0;
lineno = 0; lineno = 0;