From: plenz at cis.fu-berlin.de (Julius Plenz)
Subject: [PATCH 3/5] make enable-log-linecount independent of -filecount
Date: Thu, 10 Mar 2011 17:03:22 +0100 [thread overview]
Message-ID: <1299773004-27380-3-git-send-email-plenz@cis.fu-berlin.de> (raw)
In-Reply-To: <1299773004-27380-1-git-send-email-plenz@cis.fu-berlin.de>
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 at cis.fu-berlin.de>
---
ui-log.c | 29 ++++++++++++++---------------
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");
--
1.7.3.1
next prev parent reply other threads:[~2011-03-10 16:03 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-10 16:03 [PATCH 1/5] guess default branch from HEAD plenz
2011-03-10 16:03 ` [PATCH 2/5] get_commit_date() obtains newest commit date plenz
2011-03-10 16:03 ` plenz [this message]
2011-03-10 17:25 ` [PATCH 3/5] make enable-log-linecount independent of -filecount hjemli
2011-03-26 14:43 ` hjemli
2011-03-10 16:03 ` [PATCH 4/5] fix two encoding bugs plenz
2011-03-10 17:29 ` hjemli
2011-03-10 16:03 ` [PATCH 5/5] Add advice about scan-path in cgitrc.5.txt plenz
2011-03-10 17:33 ` hjemli
2011-03-10 17:22 ` [PATCH 1/5] guess default branch from HEAD hjemli
2011-03-16 10:53 ` plenz
2011-03-26 10:08 ` hjemli
2011-03-30 16:00 ` [PATCH v2] " plenz
2011-04-07 9:44 ` hjemli
2011-04-07 10:49 ` plenz
2011-04-07 10:59 ` [PATCH] " plenz
2011-06-10 6:42 ` jugg
2011-06-13 10:16 ` larsh
2011-06-13 10:16 ` hjemli
2011-06-16 14:59 ` plenz
2011-06-20 19:25 ` hjemli
2011-07-09 8:09 ` jugg
2011-07-13 15:10 ` plenz
2011-07-19 7:08 ` larsh
2011-07-19 9:40 ` jugg
2011-07-19 6:30 ` larsh
2011-07-19 9:35 ` jugg
2011-07-19 9:56 ` larsh
2011-07-19 10:13 ` jugg
2011-07-21 10:34 ` larsh
2011-04-07 11:05 ` [PATCH v2] " hjemli
2011-06-09 4:40 ` jugg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1299773004-27380-3-git-send-email-plenz@cis.fu-berlin.de \
--to=cgit@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).