|
diff --git a/ui-log.c b/ui-log.c index b930bb2..7d1985e 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -5,19 +5,26 @@ |
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, lines; |
12 | |
12 | |
| |
13 | void count_lines(char *line, int size) |
| |
14 | { |
| |
15 | if (size>0 && (line[0] == '+' || line[0] == '-')) |
| |
16 | lines++; |
| |
17 | } |
| |
18 | |
13 | void inspect_files(struct diff_filepair *pair) |
19 | void inspect_files(struct diff_filepair *pair) |
14 | { |
20 | { |
15 | files++; |
21 | files++; |
| |
22 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); |
16 | } |
23 | } |
17 | |
24 | |
18 | void print_commit(struct commit *commit) |
25 | void print_commit(struct commit *commit) |
19 | { |
26 | { |
20 | char buf[32]; |
27 | char buf[32]; |
21 | struct commitinfo *info; |
28 | struct commitinfo *info; |
22 | struct tm *time; |
29 | struct tm *time; |
23 | |
30 | |
@@ -27,21 +34,23 @@ void print_commit(struct commit *commit) |
27 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", time); |
34 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", time); |
28 | html_txt(buf); |
35 | html_txt(buf); |
29 | html("</td><td>"); |
36 | html("</td><td>"); |
30 | char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
37 | char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
31 | char *url = cgit_pageurl(cgit_query_repo, "commit", qry); |
38 | char *url = cgit_pageurl(cgit_query_repo, "commit", qry); |
32 | html_link_open(url, NULL, NULL); |
39 | html_link_open(url, NULL, NULL); |
33 | html_ntxt(cgit_max_msg_len, info->subject); |
40 | html_ntxt(cgit_max_msg_len, info->subject); |
34 | html_link_close(); |
41 | html_link_close(); |
35 | html("</td><td class='right'>"); |
| |
36 | files = 0; |
42 | files = 0; |
37 | lines = 0; |
43 | lines = 0; |
38 | cgit_diff_commit(commit, inspect_files); |
44 | cgit_diff_commit(commit, inspect_files); |
| |
45 | html("</td><td class='right'>"); |
39 | htmlf("%d", files); |
46 | htmlf("%d", files); |
| |
47 | html("</td><td class='right'>"); |
| |
48 | htmlf("%d", lines); |
40 | html("</td><td>"); |
49 | html("</td><td>"); |
41 | html_txt(info->author); |
50 | html_txt(info->author); |
42 | html("</td></tr>\n"); |
51 | html("</td></tr>\n"); |
43 | cgit_free_commitinfo(info); |
52 | cgit_free_commitinfo(info); |
44 | } |
53 | } |
45 | |
54 | |
46 | |
55 | |
47 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep) |
56 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep) |
@@ -65,16 +74,17 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep) |
65 | compile_grep_patterns(rev.grep_filter); |
74 | compile_grep_patterns(rev.grep_filter); |
66 | } |
75 | } |
67 | prepare_revision_walk(&rev); |
76 | prepare_revision_walk(&rev); |
68 | |
77 | |
69 | html("<table class='list nowrap'>"); |
78 | html("<table class='list nowrap'>"); |
70 | html("<tr class='nohover'><th class='left'>Date</th>" |
79 | html("<tr class='nohover'><th class='left'>Date</th>" |
71 | "<th class='left'>Message</th>" |
80 | "<th class='left'>Message</th>" |
72 | "<th class='left'>Files</th>" |
81 | "<th class='left'>Files</th>" |
| |
82 | "<th class='left'>Lines</th>" |
73 | "<th class='left'>Author</th></tr>\n"); |
83 | "<th class='left'>Author</th></tr>\n"); |
74 | |
84 | |
75 | if (ofs<0) |
85 | if (ofs<0) |
76 | ofs = 0; |
86 | ofs = 0; |
77 | |
87 | |
78 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
88 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
79 | free(commit->buffer); |
89 | free(commit->buffer); |
80 | commit->buffer = NULL; |
90 | commit->buffer = NULL; |
|