author | Lars Hjemli <hjemli@gmail.com> | 2007-11-05 23:35:12 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-11-05 23:35:12 (UTC) |
commit | d04c4734bcf40b1d17c55b18fba2aa8344678e8f (patch) (unidiff) | |
tree | e08d0141da1b0b9ab2f921f1a7efd141b32dfe49 | |
parent | 72ede12551af320b6d8eade853dbd2cd6f2222cc (diff) | |
download | cgit-d04c4734bcf40b1d17c55b18fba2aa8344678e8f.zip cgit-d04c4734bcf40b1d17c55b18fba2aa8344678e8f.tar.gz cgit-d04c4734bcf40b1d17c55b18fba2aa8344678e8f.tar.bz2 |
Show lines changed as -n/+m in shortlogs
This is way more informative than the total number of changed lines.
Suggested-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-log.c | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -3,22 +3,28 @@ | |||
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | int files, lines; | 11 | int files, add_lines, rem_lines; |
12 | 12 | ||
13 | void count_lines(char *line, int size) | 13 | void count_lines(char *line, int size) |
14 | { | 14 | { |
15 | if (size>0 && (line[0] == '+' || line[0] == '-')) | 15 | if (size <= 0) |
16 | lines++; | 16 | return; |
17 | |||
18 | if (line[0] == '+') | ||
19 | add_lines++; | ||
20 | |||
21 | else if (line[0] == '-') | ||
22 | rem_lines++; | ||
17 | } | 23 | } |
18 | 24 | ||
19 | void inspect_files(struct diff_filepair *pair) | 25 | void inspect_files(struct diff_filepair *pair) |
20 | { | 26 | { |
21 | files++; | 27 | files++; |
22 | if (cgit_repo->enable_log_linecount) | 28 | if (cgit_repo->enable_log_linecount) |
23 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); | 29 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); |
24 | } | 30 | } |
@@ -30,23 +36,24 @@ void print_commit(struct commit *commit) | |||
30 | info = cgit_parse_commit(commit); | 36 | info = cgit_parse_commit(commit); |
31 | html("<tr><td>"); | 37 | html("<tr><td>"); |
32 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 38 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
33 | html("</td><td>"); | 39 | html("</td><td>"); |
34 | cgit_commit_link(info->subject, NULL, NULL, cgit_query_head, | 40 | cgit_commit_link(info->subject, NULL, NULL, cgit_query_head, |
35 | sha1_to_hex(commit->object.sha1)); | 41 | sha1_to_hex(commit->object.sha1)); |
36 | if (cgit_repo->enable_log_filecount) { | 42 | if (cgit_repo->enable_log_filecount) { |
37 | files = 0; | 43 | files = 0; |
38 | lines = 0; | 44 | add_lines = 0; |
45 | rem_lines = 0; | ||
39 | cgit_diff_commit(commit, inspect_files); | 46 | cgit_diff_commit(commit, inspect_files); |
40 | html("</td><td class='right'>"); | 47 | html("</td><td class='right'>"); |
41 | htmlf("%d", files); | 48 | htmlf("%d", files); |
42 | if (cgit_repo->enable_log_linecount) { | 49 | if (cgit_repo->enable_log_linecount) { |
43 | html("</td><td class='right'>"); | 50 | html("</td><td class='right'>"); |
44 | htmlf("%d", lines); | 51 | htmlf("-%d/+%d", rem_lines, add_lines); |
45 | } | 52 | } |
46 | } | 53 | } |
47 | html("</td><td>"); | 54 | html("</td><td>"); |
48 | html_txt(info->author); | 55 | html_txt(info->author); |
49 | html("</td></tr>\n"); | 56 | html("</td></tr>\n"); |
50 | cgit_free_commitinfo(info); | 57 | cgit_free_commitinfo(info); |
51 | } | 58 | } |
52 | 59 | ||
@@ -83,19 +90,19 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
83 | } | 90 | } |
84 | prepare_revision_walk(&rev); | 91 | prepare_revision_walk(&rev); |
85 | 92 | ||
86 | html("<table class='list nowrap'>"); | 93 | html("<table class='list nowrap'>"); |
87 | html("<tr class='nohover'><th class='left'>Age</th>" | 94 | html("<tr class='nohover'><th class='left'>Age</th>" |
88 | "<th class='left'>Message</th>"); | 95 | "<th class='left'>Message</th>"); |
89 | 96 | ||
90 | if (cgit_repo->enable_log_filecount) { | 97 | if (cgit_repo->enable_log_filecount) { |
91 | html("<th class='left'>Files</th>"); | 98 | html("<th class='right'>Files</th>"); |
92 | if (cgit_repo->enable_log_linecount) | 99 | if (cgit_repo->enable_log_linecount) |
93 | html("<th class='left'>Lines</th>"); | 100 | html("<th class='right'>Lines</th>"); |
94 | } | 101 | } |
95 | html("<th class='left'>Author</th></tr>\n"); | 102 | html("<th class='left'>Author</th></tr>\n"); |
96 | 103 | ||
97 | if (ofs<0) | 104 | if (ofs<0) |
98 | ofs = 0; | 105 | ofs = 0; |
99 | 106 | ||
100 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { | 107 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
101 | free(commit->buffer); | 108 | free(commit->buffer); |