about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJulius Plenz <plenz@cis.fu-berlin.de>2011-03-10 17:03:22 +0100
committerLars Hjemli <hjemli@gmail.com>2011-03-26 15:20:55 +0100
commit2e6721edbb3c94a70f4ef0ead5e55b9da19fb806 (patch)
tree74a7a13bb5ca5ec65dab1af28f44cb03ac16d328
parentnew_filter: correctly initialise all arguments for a new filter (diff)
downloadcgit-pink-2e6721edbb3c94a70f4ef0ead5e55b9da19fb806.tar.gz
cgit-pink-2e6721edbb3c94a70f4ef0ead5e55b9da19fb806.zip
make enable-log-linecount independent of -filecount
You should be able to independently switch file and line count on and
off. This patch makes the code work like the documentation suggests: no
dependency for line counts to be displayed only when file counts are.

Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to '')
-rw-r--r--ui-log.c29
1 files changed, 14 insertions, 15 deletions
diff --git a/ui-log.c b/ui-log.c
index 8add66a..2e6e9d6 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -100,11 +100,10 @@ void print_commit(struct commit *commit, struct rev_info *revs)
 	struct strbuf graphbuf = STRBUF_INIT;
 	struct strbuf msgbuf = STRBUF_INIT;
 
-	if (ctx.repo->enable_log_filecount) {
+	if (ctx.repo->enable_log_filecount)
+		cols++;
+	if (ctx.repo->enable_log_linecount)
 		cols++;
-		if (ctx.repo->enable_log_linecount)
-			cols++;
-	}
 
 	if (revs->graph) {
 		/* Advance graph until current commit */
@@ -179,18 +178,18 @@ void print_commit(struct commit *commit, struct rev_info *revs)
 		html_link_close();
 	}
 
-	if (ctx.repo->enable_log_filecount) {
+	if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) {
 		files = 0;
 		add_lines = 0;
 		rem_lines = 0;
 		cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
-		html("</td><td>");
-		htmlf("%d", files);
-		if (ctx.repo->enable_log_linecount) {
-			html("</td><td>");
-			htmlf("-%d/+%d", rem_lines, add_lines);
-		}
 	}
+
+	if (ctx.repo->enable_log_filecount)
+		htmlf("</td><td>%d", files);
+	if (ctx.repo->enable_log_linecount)
+		htmlf("</td><td>-%d/+%d", rem_lines, add_lines);
+
 	html("</td></tr>\n");
 
 	if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
@@ -379,10 +378,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 	if (ctx.repo->enable_log_filecount) {
 		html("<th class='left'>Files</th>");
 		columns++;
-		if (ctx.repo->enable_log_linecount) {
-			html("<th class='left'>Lines</th>");
-			columns++;
-		}
+	}
+	if (ctx.repo->enable_log_linecount) {
+		html("<th class='left'>Lines</th>");
+		columns++;
 	}
 	html("</tr>\n");