|
diff --git a/ui-log.c b/ui-log.c index bb17e1d..8d774b0 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -1,130 +1,127 @@ |
1 | /* ui-log.c: functions for log output |
1 | /* ui-log.c: functions for log output |
2 | * |
2 | * |
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, 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 && (line[0] == '+' || line[0] == '-')) |
16 | lines++; |
16 | lines++; |
17 | } |
17 | } |
18 | |
18 | |
19 | void inspect_files(struct diff_filepair *pair) |
19 | void inspect_files(struct diff_filepair *pair) |
20 | { |
20 | { |
21 | files++; |
21 | files++; |
22 | if (cgit_repo->enable_log_linecount) |
22 | if (cgit_repo->enable_log_linecount) |
23 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); |
23 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); |
24 | } |
24 | } |
25 | |
25 | |
26 | void print_commit(struct commit *commit) |
26 | void print_commit(struct commit *commit) |
27 | { |
27 | { |
28 | struct commitinfo *info; |
28 | struct commitinfo *info; |
29 | |
29 | |
30 | info = cgit_parse_commit(commit); |
30 | info = cgit_parse_commit(commit); |
31 | html("<tr><td>"); |
31 | html("<tr><td>"); |
32 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
32 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
33 | html("</td><td>"); |
33 | html("</td><td>"); |
34 | char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1)); |
34 | cgit_commit_link(info->subject, NULL, NULL, cgit_query_head, |
35 | char *url = cgit_pageurl(cgit_query_repo, "commit", qry); |
35 | sha1_to_hex(commit->object.sha1)); |
36 | html_link_open(url, NULL, NULL); |
| |
37 | html_ntxt(cgit_max_msg_len, info->subject); |
| |
38 | html_link_close(); |
| |
39 | if (cgit_repo->enable_log_filecount) { |
36 | if (cgit_repo->enable_log_filecount) { |
40 | files = 0; |
37 | files = 0; |
41 | lines = 0; |
38 | lines = 0; |
42 | cgit_diff_commit(commit, inspect_files); |
39 | cgit_diff_commit(commit, inspect_files); |
43 | html("</td><td class='right'>"); |
40 | html("</td><td class='right'>"); |
44 | htmlf("%d", files); |
41 | htmlf("%d", files); |
45 | if (cgit_repo->enable_log_linecount) { |
42 | if (cgit_repo->enable_log_linecount) { |
46 | html("</td><td class='right'>"); |
43 | html("</td><td class='right'>"); |
47 | htmlf("%d", lines); |
44 | htmlf("%d", lines); |
48 | } |
45 | } |
49 | } |
46 | } |
50 | html("</td><td>"); |
47 | html("</td><td>"); |
51 | html_txt(info->author); |
48 | html_txt(info->author); |
52 | html("</td></tr>\n"); |
49 | html("</td></tr>\n"); |
53 | cgit_free_commitinfo(info); |
50 | cgit_free_commitinfo(info); |
54 | } |
51 | } |
55 | |
52 | |
56 | |
53 | |
57 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) |
54 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) |
58 | { |
55 | { |
59 | struct rev_info rev; |
56 | struct rev_info rev; |
60 | struct commit *commit; |
57 | struct commit *commit; |
61 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
58 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
62 | int argc = 2; |
59 | int argc = 2; |
63 | int i; |
60 | int i; |
64 | |
61 | |
65 | if (grep) |
62 | if (grep) |
66 | argv[argc++] = fmt("--grep=%s", grep); |
63 | argv[argc++] = fmt("--grep=%s", grep); |
67 | if (path) { |
64 | if (path) { |
68 | argv[argc++] = "--"; |
65 | argv[argc++] = "--"; |
69 | argv[argc++] = path; |
66 | argv[argc++] = path; |
70 | } |
67 | } |
71 | init_revisions(&rev, NULL); |
68 | init_revisions(&rev, NULL); |
72 | rev.abbrev = DEFAULT_ABBREV; |
69 | rev.abbrev = DEFAULT_ABBREV; |
73 | rev.commit_format = CMIT_FMT_DEFAULT; |
70 | rev.commit_format = CMIT_FMT_DEFAULT; |
74 | rev.verbose_header = 1; |
71 | rev.verbose_header = 1; |
75 | rev.show_root_diff = 0; |
72 | rev.show_root_diff = 0; |
76 | setup_revisions(argc, argv, &rev, NULL); |
73 | setup_revisions(argc, argv, &rev, NULL); |
77 | if (rev.grep_filter) { |
74 | if (rev.grep_filter) { |
78 | rev.grep_filter->regflags |= REG_ICASE; |
75 | rev.grep_filter->regflags |= REG_ICASE; |
79 | compile_grep_patterns(rev.grep_filter); |
76 | compile_grep_patterns(rev.grep_filter); |
80 | } |
77 | } |
81 | prepare_revision_walk(&rev); |
78 | prepare_revision_walk(&rev); |
82 | |
79 | |
83 | html("<table class='list nowrap'>"); |
80 | html("<table class='list nowrap'>"); |
84 | html("<tr class='nohover'><th class='left'>Age</th>" |
81 | html("<tr class='nohover'><th class='left'>Age</th>" |
85 | "<th class='left'>Message</th>"); |
82 | "<th class='left'>Message</th>"); |
86 | |
83 | |
87 | if (cgit_repo->enable_log_filecount) { |
84 | if (cgit_repo->enable_log_filecount) { |
88 | html("<th class='left'>Files</th>"); |
85 | html("<th class='left'>Files</th>"); |
89 | if (cgit_repo->enable_log_linecount) |
86 | if (cgit_repo->enable_log_linecount) |
90 | html("<th class='left'>Lines</th>"); |
87 | html("<th class='left'>Lines</th>"); |
91 | } |
88 | } |
92 | html("<th class='left'>Author</th></tr>\n"); |
89 | html("<th class='left'>Author</th></tr>\n"); |
93 | |
90 | |
94 | if (ofs<0) |
91 | if (ofs<0) |
95 | ofs = 0; |
92 | ofs = 0; |
96 | |
93 | |
97 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
94 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
98 | free(commit->buffer); |
95 | free(commit->buffer); |
99 | commit->buffer = NULL; |
96 | commit->buffer = NULL; |
100 | free_commit_list(commit->parents); |
97 | free_commit_list(commit->parents); |
101 | commit->parents = NULL; |
98 | commit->parents = NULL; |
102 | } |
99 | } |
103 | |
100 | |
104 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
101 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
105 | print_commit(commit); |
102 | print_commit(commit); |
106 | free(commit->buffer); |
103 | free(commit->buffer); |
107 | commit->buffer = NULL; |
104 | commit->buffer = NULL; |
108 | free_commit_list(commit->parents); |
105 | free_commit_list(commit->parents); |
109 | commit->parents = NULL; |
106 | commit->parents = NULL; |
110 | } |
107 | } |
111 | html("</table>\n"); |
108 | html("</table>\n"); |
112 | |
109 | |
113 | if (pager) { |
110 | if (pager) { |
114 | html("<div class='pager'>"); |
111 | html("<div class='pager'>"); |
115 | if (ofs > 0) { |
112 | if (ofs > 0) { |
116 | html(" <a href='"); |
113 | html(" <a href='"); |
117 | html(cgit_pageurl(cgit_query_repo, cgit_query_page, |
114 | html(cgit_pageurl(cgit_query_repo, cgit_query_page, |
118 | fmt("h=%s&ofs=%d", tip, ofs-cnt))); |
115 | fmt("h=%s&ofs=%d", tip, ofs-cnt))); |
119 | html("'>[prev]</a> "); |
116 | html("'>[prev]</a> "); |
120 | } |
117 | } |
121 | |
118 | |
122 | if ((commit = get_revision(&rev)) != NULL) { |
119 | if ((commit = get_revision(&rev)) != NULL) { |
123 | html(" <a href='"); |
120 | html(" <a href='"); |
124 | html(cgit_pageurl(cgit_query_repo, "log", |
121 | html(cgit_pageurl(cgit_query_repo, "log", |
125 | fmt("h=%s&ofs=%d", tip, ofs+cnt))); |
122 | fmt("h=%s&ofs=%d", tip, ofs+cnt))); |
126 | html("'>[next]</a> "); |
123 | html("'>[next]</a> "); |
127 | } |
124 | } |
128 | html("</div>"); |
125 | html("</div>"); |
129 | } |
126 | } |
130 | } |
127 | } |
|