all repos — cgit @ b0f946bcc7f08168ea2858d8658a74a32accd7f5

a hyperfast web frontend for git written in c 

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>
Lars Hjemli hjemli@gmail.com
Fri, 21 Aug 2009 14:26:52 +0200
commit

b0f946bcc7f08168ea2858d8658a74a32accd7f5

parent

d67cc7f9d556650438e421cdcda37bc52710bffd

4 files changed, 9 insertions(+), 8 deletions(-)

jump to
M cgit.c → 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;
M cgit.h → 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;
M cgitrc.5.txt → 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
M ui-tree.c → ui-tree.c 
@@ -23,7 +23,7 @@ "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\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;