|
diff --git a/ui-log.c b/ui-log.c index 41b5225..b9771fa 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -92,25 +92,25 @@ void print_commit(struct commit *commit) |
92 | html_link_close(); |
92 | html_link_close(); |
93 | htmlf("</td><td%s>", |
93 | htmlf("</td><td%s>", |
94 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
94 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
95 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
95 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
96 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
96 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
97 | show_commit_decorations(commit); |
97 | show_commit_decorations(commit); |
98 | html("</td><td>"); |
98 | html("</td><td>"); |
99 | html_txt(info->author); |
99 | html_txt(info->author); |
100 | if (ctx.repo->enable_log_filecount) { |
100 | if (ctx.repo->enable_log_filecount) { |
101 | files = 0; |
101 | files = 0; |
102 | add_lines = 0; |
102 | add_lines = 0; |
103 | rem_lines = 0; |
103 | rem_lines = 0; |
104 | cgit_diff_commit(commit, inspect_files); |
104 | cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); |
105 | html("</td><td>"); |
105 | html("</td><td>"); |
106 | htmlf("%d", files); |
106 | htmlf("%d", files); |
107 | if (ctx.repo->enable_log_linecount) { |
107 | if (ctx.repo->enable_log_linecount) { |
108 | html("</td><td>"); |
108 | html("</td><td>"); |
109 | htmlf("-%d/+%d", rem_lines, add_lines); |
109 | htmlf("-%d/+%d", rem_lines, add_lines); |
110 | } |
110 | } |
111 | } |
111 | } |
112 | html("</td></tr>\n"); |
112 | html("</td></tr>\n"); |
113 | if (ctx.qry.showmsg) { |
113 | if (ctx.qry.showmsg) { |
114 | struct strbuf notes = STRBUF_INIT; |
114 | struct strbuf notes = STRBUF_INIT; |
115 | format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); |
115 | format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); |
116 | |
116 | |
@@ -153,25 +153,25 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
153 | { |
153 | { |
154 | struct rev_info rev; |
154 | struct rev_info rev; |
155 | struct commit *commit; |
155 | struct commit *commit; |
156 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; |
156 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; |
157 | int argc = 2; |
157 | int argc = 2; |
158 | int i, columns = 3; |
158 | int i, columns = 3; |
159 | |
159 | |
160 | if (!tip) |
160 | if (!tip) |
161 | tip = ctx.qry.head; |
161 | tip = ctx.qry.head; |
162 | |
162 | |
163 | argv[1] = disambiguate_ref(tip); |
163 | argv[1] = disambiguate_ref(tip); |
164 | |
164 | |
165 | if (grep && pattern) { |
165 | if (grep && pattern && *pattern) { |
166 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
166 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
167 | !strcmp(grep, "committer")) |
167 | !strcmp(grep, "committer")) |
168 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
168 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
169 | if (!strcmp(grep, "range")) |
169 | if (!strcmp(grep, "range")) |
170 | argv[1] = pattern; |
170 | argv[1] = pattern; |
171 | } |
171 | } |
172 | |
172 | |
173 | if (path) { |
173 | if (path) { |
174 | argv[argc++] = "--"; |
174 | argv[argc++] = "--"; |
175 | argv[argc++] = path; |
175 | argv[argc++] = path; |
176 | } |
176 | } |
177 | init_revisions(&rev, NULL); |
177 | init_revisions(&rev, NULL); |
|