summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-13 15:03:27 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-13 15:03:27 (UTC)
commit80e577c3ef2a73becabff7e9c9c242f317a87de9 (patch) (side-by-side diff)
tree56f1bdddd84ae373749a9f611b972f8b6e010e26
parent38a0f9cd89c4c5a97bd5b38e7b56da809a00fccb (diff)
downloadcgit-80e577c3ef2a73becabff7e9c9c242f317a87de9.zip
cgit-80e577c3ef2a73becabff7e9c9c242f317a87de9.tar.gz
cgit-80e577c3ef2a73becabff7e9c9c242f317a87de9.tar.bz2
Show number of changed lines in log view
Use the new file-diff interface to calculate number of changed lines per commit. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-log.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/ui-log.c b/ui-log.c
index b930bb2..7d1985e 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,110 +1,120 @@
/* ui-log.c: functions for log output
*
* Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
int files, lines;
+void count_lines(char *line, int size)
+{
+ if (size>0 && (line[0] == '+' || line[0] == '-'))
+ lines++;
+}
+
void inspect_files(struct diff_filepair *pair)
{
files++;
+ cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
}
void print_commit(struct commit *commit)
{
char buf[32];
struct commitinfo *info;
struct tm *time;
info = cgit_parse_commit(commit);
time = gmtime(&commit->date);
html("<tr><td>");
strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", time);
html_txt(buf);
html("</td><td>");
char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
html_link_open(url, NULL, NULL);
html_ntxt(cgit_max_msg_len, info->subject);
html_link_close();
- html("</td><td class='right'>");
files = 0;
lines = 0;
cgit_diff_commit(commit, inspect_files);
+ html("</td><td class='right'>");
htmlf("%d", files);
+ html("</td><td class='right'>");
+ htmlf("%d", lines);
html("</td><td>");
html_txt(info->author);
html("</td></tr>\n");
cgit_free_commitinfo(info);
}
void cgit_print_log(const char *tip, int ofs, int cnt, char *grep)
{
struct rev_info rev;
struct commit *commit;
const char *argv[3] = {NULL, tip, NULL};
int argc = 2;
int i;
if (grep)
argv[argc++] = fmt("--grep=%s", grep);
init_revisions(&rev, NULL);
rev.abbrev = DEFAULT_ABBREV;
rev.commit_format = CMIT_FMT_DEFAULT;
rev.verbose_header = 1;
rev.show_root_diff = 0;
setup_revisions(argc, argv, &rev, NULL);
if (rev.grep_filter) {
rev.grep_filter->regflags |= REG_ICASE;
compile_grep_patterns(rev.grep_filter);
}
prepare_revision_walk(&rev);
html("<table class='list nowrap'>");
html("<tr class='nohover'><th class='left'>Date</th>"
"<th class='left'>Message</th>"
"<th class='left'>Files</th>"
+ "<th class='left'>Lines</th>"
"<th class='left'>Author</th></tr>\n");
if (ofs<0)
ofs = 0;
for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
free(commit->buffer);
commit->buffer = NULL;
free_commit_list(commit->parents);
commit->parents = NULL;
}
for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
print_commit(commit);
free(commit->buffer);
commit->buffer = NULL;
free_commit_list(commit->parents);
commit->parents = NULL;
}
html("</table>\n");
html("<div class='pager'>");
if (ofs > 0) {
html("&nbsp;<a href='");
html(cgit_pageurl(cgit_query_repo, cgit_query_page,
fmt("h=%s&ofs=%d", tip, ofs-cnt)));
html("'>[prev]</a>&nbsp;");
}
if ((commit = get_revision(&rev)) != NULL) {
html("&nbsp;<a href='");
html(cgit_pageurl(cgit_query_repo, "log",
fmt("h=%s&ofs=%d", tip, ofs+cnt)));
html("'>[next]</a>&nbsp;");
}
html("</div>");
}