|
diff --git a/ui-log.c b/ui-log.c index bc0c02c..b9771fa 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -117,97 +117,97 @@ void print_commit(struct commit *commit) |
117 | if (ctx.repo->enable_log_filecount) { |
117 | if (ctx.repo->enable_log_filecount) { |
118 | cols++; |
118 | cols++; |
119 | if (ctx.repo->enable_log_linecount) |
119 | if (ctx.repo->enable_log_linecount) |
120 | cols++; |
120 | cols++; |
121 | } |
121 | } |
122 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
122 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
123 | cols); |
123 | cols); |
124 | html_txt(info->msg); |
124 | html_txt(info->msg); |
125 | html("</td></tr>\n"); |
125 | html("</td></tr>\n"); |
126 | if (notes.len != 0) { |
126 | if (notes.len != 0) { |
127 | html("<tr class='nohover'>"); |
127 | html("<tr class='nohover'>"); |
128 | html("<td class='lognotes-label'>Notes:</td>"); |
128 | html("<td class='lognotes-label'>Notes:</td>"); |
129 | htmlf("<td colspan='%d' class='lognotes'>", |
129 | htmlf("<td colspan='%d' class='lognotes'>", |
130 | cols); |
130 | cols); |
131 | html_txt(notes.buf); |
131 | html_txt(notes.buf); |
132 | html("</td></tr>\n"); |
132 | html("</td></tr>\n"); |
133 | } |
133 | } |
134 | strbuf_release(¬es); |
134 | strbuf_release(¬es); |
135 | } |
135 | } |
136 | cgit_free_commitinfo(info); |
136 | cgit_free_commitinfo(info); |
137 | } |
137 | } |
138 | |
138 | |
139 | static const char *disambiguate_ref(const char *ref) |
139 | static const char *disambiguate_ref(const char *ref) |
140 | { |
140 | { |
141 | unsigned char sha1[20]; |
141 | unsigned char sha1[20]; |
142 | const char *longref; |
142 | const char *longref; |
143 | |
143 | |
144 | longref = fmt("refs/heads/%s", ref); |
144 | longref = fmt("refs/heads/%s", ref); |
145 | if (get_sha1(longref, sha1) == 0) |
145 | if (get_sha1(longref, sha1) == 0) |
146 | return longref; |
146 | return longref; |
147 | |
147 | |
148 | return ref; |
148 | return ref; |
149 | } |
149 | } |
150 | |
150 | |
151 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
151 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
152 | char *path, int pager) |
152 | char *path, int pager) |
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); |
178 | rev.abbrev = DEFAULT_ABBREV; |
178 | rev.abbrev = DEFAULT_ABBREV; |
179 | rev.commit_format = CMIT_FMT_DEFAULT; |
179 | rev.commit_format = CMIT_FMT_DEFAULT; |
180 | rev.verbose_header = 1; |
180 | rev.verbose_header = 1; |
181 | rev.show_root_diff = 0; |
181 | rev.show_root_diff = 0; |
182 | setup_revisions(argc, argv, &rev, NULL); |
182 | setup_revisions(argc, argv, &rev, NULL); |
183 | load_ref_decorations(DECORATE_FULL_REFS); |
183 | load_ref_decorations(DECORATE_FULL_REFS); |
184 | rev.show_decorations = 1; |
184 | rev.show_decorations = 1; |
185 | rev.grep_filter.regflags |= REG_ICASE; |
185 | rev.grep_filter.regflags |= REG_ICASE; |
186 | compile_grep_patterns(&rev.grep_filter); |
186 | compile_grep_patterns(&rev.grep_filter); |
187 | prepare_revision_walk(&rev); |
187 | prepare_revision_walk(&rev); |
188 | |
188 | |
189 | if (pager) |
189 | if (pager) |
190 | html("<table class='list nowrap'>"); |
190 | html("<table class='list nowrap'>"); |
191 | |
191 | |
192 | html("<tr class='nohover'><th class='left'>Age</th>" |
192 | html("<tr class='nohover'><th class='left'>Age</th>" |
193 | "<th class='left'>Commit message"); |
193 | "<th class='left'>Commit message"); |
194 | if (pager) { |
194 | if (pager) { |
195 | html(" ("); |
195 | html(" ("); |
196 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
196 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
197 | NULL, ctx.qry.head, ctx.qry.sha1, |
197 | NULL, ctx.qry.head, ctx.qry.sha1, |
198 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
198 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
199 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
199 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
200 | html(")"); |
200 | html(")"); |
201 | } |
201 | } |
202 | html("</th><th class='left'>Author</th>"); |
202 | html("</th><th class='left'>Author</th>"); |
203 | if (ctx.repo->enable_log_filecount) { |
203 | if (ctx.repo->enable_log_filecount) { |
204 | html("<th class='left'>Files</th>"); |
204 | html("<th class='left'>Files</th>"); |
205 | columns++; |
205 | columns++; |
206 | if (ctx.repo->enable_log_linecount) { |
206 | if (ctx.repo->enable_log_linecount) { |
207 | html("<th class='left'>Lines</th>"); |
207 | html("<th class='left'>Lines</th>"); |
208 | columns++; |
208 | columns++; |
209 | } |
209 | } |
210 | } |
210 | } |
211 | html("</tr>\n"); |
211 | html("</tr>\n"); |
212 | |
212 | |
213 | if (ofs<0) |
213 | if (ofs<0) |
|