Author: Lars Hjemli <hjemli@gmail.com>
Rename "linenumbers" to "enable-tree-linenumbers", change default to "1" 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>
cgit.c | 5 +++-- cgit.h | 2 +- cgitrc.5.txt | 8 ++++---- ui-tree.c | 2 +-
diff --git a/cgit.c b/cgit.c index a4788cbb34b2ac198dbdcb9d49a4e4d0d96f8ea9..ec40e1f7f5993127bb5d141d8e2292bffc1ff12d 100644 --- a/cgit.c +++ b/cgit.c @@ -66,8 +66,6 @@ else if (!strcmp(name, "index-info")) ctx.cfg.index_info = xstrdup(value); else if (!strcmp(name, "logo-link")) ctx.cfg.logo_link = xstrdup(value); - else if (!strcmp(name, "linenumbers")) - ctx.cfg.linenumbers = atoi(value); else if (!strcmp(name, "module-link")) ctx.cfg.module_link = xstrdup(value); else if (!strcmp(name, "virtual-root")) { @@ -88,6 +86,8 @@ else if (!strcmp(name, "enable-log-filecount")) ctx.cfg.enable_log_filecount = atoi(value); else if (!strcmp(name, "enable-log-linecount")) 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")) ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); else if (!strcmp(name, "cache-size")) @@ -240,6 +240,7 @@ ctx->cfg.cache_static_ttl = -1; ctx->cfg.css = "/cgit.css"; ctx->cfg.logo = "/cgit.png"; ctx->cfg.local_time = 0; + ctx->cfg.enable_tree_linenumbers = 1; ctx->cfg.max_repo_count = 50; ctx->cfg.max_commit_count = 50; ctx->cfg.max_lock_attempts = 5; diff --git a/cgit.h b/cgit.h index 2fdc53159171f2add27fabeabf4b0fbaa36f2318..a20679ad012bd0ea637f328f16d70e18c5b3fac2 100644 --- a/cgit.h +++ b/cgit.h @@ -173,8 +173,8 @@ int embedded; int enable_index_links; int enable_log_filecount; int enable_log_linecount; + int enable_tree_linenumbers; int local_time; - int linenumbers; int max_repo_count; int max_commit_count; int max_lock_attempts; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index a762ccc7c3e96aecbe8aee4817b09998bb1d62c6..ac5c58c539d074f29f3ae742d03a8a1566d2556e 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -99,6 +99,10 @@ Flag which, when set to "1", will make cgit print the number of added and removed lines for each commit on the repository log page. Default 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:: 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 @@ -145,10 +149,6 @@ logo-link:: Url loaded when clicking on the cgit logo image. If unspecified the calculated url of the repository index page will be used. Default value: none. - -linenumbers:: - If set to "1" lines in tree view will have numbers. - Default value: "0". max-commit-count:: Specifies the number of entries to list per page in "log" view. Default diff --git a/ui-tree.c b/ui-tree.c index f64e6e0d701ebf73c06c2bcebebb712abcd69859..f53ab6414b9ad50c8f4210eaab8afc169a5c4a00 100644 --- a/ui-tree.c +++ b/ui-tree.c @@ -23,7 +23,7 @@ "%1$d\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>"); idx = 0; lineno = 0;