|
diff --git a/ui-log.c b/ui-log.c index 6d7fcae..0d86fd5 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -76,13 +76,32 @@ void show_commit_decorations(struct commit *commit) |
76 | deco = deco->next; |
76 | deco = deco->next; |
77 | } |
77 | } |
78 | } |
78 | } |
79 | |
79 | |
80 | void print_commit(struct commit *commit) |
80 | void print_commit(struct commit *commit, struct rev_info *revs) |
81 | { |
81 | { |
82 | struct commitinfo *info; |
82 | struct commitinfo *info; |
83 | char *tmp; |
83 | char *tmp; |
84 | int cols = 2; |
84 | int cols = 2; |
| |
85 | struct strbuf graphbuf = STRBUF_INIT; |
| |
86 | |
| |
87 | if (ctx.repo->enable_log_filecount) { |
| |
88 | cols++; |
| |
89 | if (ctx.repo->enable_log_linecount) |
| |
90 | cols++; |
| |
91 | } |
| |
92 | |
| |
93 | if (revs->graph) { |
| |
94 | /* Advance graph until current commit */ |
| |
95 | while (!graph_next_line(revs->graph, &graphbuf)) { |
| |
96 | /* Print graph segment in otherwise empty table row */ |
| |
97 | html("<tr class='nohover'><td/><td class='commitgraph'>"); |
| |
98 | html(graphbuf.buf); |
| |
99 | htmlf("</td><td colspan='%d' /></tr>\n", cols); |
| |
100 | strbuf_setlen(&graphbuf, 0); |
| |
101 | } |
| |
102 | /* Current commit's graph segment is now ready in graphbuf */ |
| |
103 | } |
85 | |
104 | |
86 | info = cgit_parse_commit(commit); |
105 | info = cgit_parse_commit(commit); |
87 | htmlf("<tr%s><td>", |
106 | htmlf("<tr%s><td>", |
88 | ctx.qry.showmsg ? " class='logheader'" : ""); |
107 | ctx.qry.showmsg ? " class='logheader'" : ""); |
@@ -90,10 +109,19 @@ void print_commit(struct commit *commit) |
90 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
109 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
91 | html_link_open(tmp, NULL, NULL); |
110 | html_link_open(tmp, NULL, NULL); |
92 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
111 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
93 | html_link_close(); |
112 | html_link_close(); |
94 | htmlf("</td><td%s>", |
113 | html("</td>"); |
95 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
114 | |
| |
115 | if (revs->graph) { |
| |
116 | /* Print graph segment for current commit */ |
| |
117 | html("<td class='commitgraph'>"); |
| |
118 | html(graphbuf.buf); |
| |
119 | html("</td>"); |
| |
120 | strbuf_setlen(&graphbuf, 0); |
| |
121 | } |
| |
122 | |
| |
123 | htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); |
96 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
124 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
97 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
125 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
98 | show_commit_decorations(commit); |
126 | show_commit_decorations(commit); |
99 | html("</td><td>"); |
127 | html("</td><td>"); |
@@ -111,34 +139,61 @@ void print_commit(struct commit *commit) |
111 | } |
139 | } |
112 | } |
140 | } |
113 | html("</td></tr>\n"); |
141 | html("</td></tr>\n"); |
114 | |
142 | |
115 | if (ctx.qry.showmsg) { /* Print message + notes in a second table row */ |
143 | if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ |
116 | /* Concatenate commit message and notes in msgbuf */ |
| |
117 | struct strbuf msgbuf = STRBUF_INIT; |
144 | struct strbuf msgbuf = STRBUF_INIT; |
118 | if (info->msg && *(info->msg)) { |
145 | html("<tr class='nohover'><td/>"); /* Empty 'Age' column */ |
119 | strbuf_addstr(&msgbuf, info->msg); |
146 | |
| |
147 | if (ctx.qry.showmsg) { |
| |
148 | /* Concatenate commit message + notes in msgbuf */ |
| |
149 | if (info->msg && *(info->msg)) { |
| |
150 | strbuf_addstr(&msgbuf, info->msg); |
| |
151 | strbuf_addch(&msgbuf, '\n'); |
| |
152 | } |
| |
153 | format_note(NULL, commit->object.sha1, &msgbuf, |
| |
154 | PAGE_ENCODING, |
| |
155 | NOTES_SHOW_HEADER | NOTES_INDENT); |
120 | strbuf_addch(&msgbuf, '\n'); |
156 | strbuf_addch(&msgbuf, '\n'); |
| |
157 | strbuf_ltrim(&msgbuf); |
121 | } |
158 | } |
122 | format_note(NULL, commit->object.sha1, &msgbuf, PAGE_ENCODING, |
| |
123 | NOTES_SHOW_HEADER | NOTES_INDENT); |
| |
124 | strbuf_addch(&msgbuf, '\n'); |
| |
125 | strbuf_ltrim(&msgbuf); |
| |
126 | |
159 | |
127 | if (ctx.repo->enable_log_filecount) { |
160 | if (revs->graph) { |
128 | cols++; |
161 | int lines = 0; |
129 | if (ctx.repo->enable_log_linecount) |
162 | |
130 | cols++; |
163 | /* Calculate graph padding */ |
| |
164 | if (ctx.qry.showmsg) { |
| |
165 | /* Count #lines in commit message + notes */ |
| |
166 | const char *p = msgbuf.buf; |
| |
167 | lines = 1; |
| |
168 | while ((p = strchr(p, '\n'))) { |
| |
169 | p++; |
| |
170 | lines++; |
| |
171 | } |
| |
172 | } |
| |
173 | |
| |
174 | /* Print graph padding */ |
| |
175 | html("<td class='commitgraph'>"); |
| |
176 | while (lines > 0 || !graph_is_commit_finished(revs->graph)) { |
| |
177 | if (graphbuf.len) |
| |
178 | html("\n"); |
| |
179 | strbuf_setlen(&graphbuf, 0); |
| |
180 | graph_next_line(revs->graph, &graphbuf); |
| |
181 | html(graphbuf.buf); |
| |
182 | lines--; |
| |
183 | } |
| |
184 | html("</td>\n"); |
131 | } |
185 | } |
132 | |
186 | |
133 | /* Create second table row containing msgbuf */ |
187 | /* Print msgbuf into remainder of table row */ |
134 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
188 | htmlf("<td colspan='%d'%s>\n", cols, |
135 | cols); |
189 | ctx.qry.showmsg ? " class='logmsg'" : ""); |
136 | html_txt(msgbuf.buf); |
190 | html_txt(msgbuf.buf); |
137 | html("</td></tr>\n"); |
191 | html("</td></tr>\n"); |
138 | strbuf_release(&msgbuf); |
192 | strbuf_release(&msgbuf); |
139 | } |
193 | } |
140 | |
194 | |
| |
195 | strbuf_release(&graphbuf); |
141 | cgit_free_commitinfo(info); |
196 | cgit_free_commitinfo(info); |
142 | } |
197 | } |
143 | |
198 | |
144 | static const char *disambiguate_ref(const char *ref) |
199 | static const char *disambiguate_ref(const char *ref) |
@@ -215,8 +270,12 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
215 | vector_push(&vec, &arg, 0); |
270 | vector_push(&vec, &arg, 0); |
216 | } |
271 | } |
217 | } |
272 | } |
218 | } |
273 | } |
| |
274 | if (ctx.repo->enable_commit_graph) { |
| |
275 | static const char *graph_arg = "--graph"; |
| |
276 | vector_push(&vec, &graph_arg, 0); |
| |
277 | } |
219 | |
278 | |
220 | if (path) { |
279 | if (path) { |
221 | arg = "--"; |
280 | arg = "--"; |
222 | vector_push(&vec, &arg, 0); |
281 | vector_push(&vec, &arg, 0); |
@@ -241,10 +300,12 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
241 | |
300 | |
242 | if (pager) |
301 | if (pager) |
243 | html("<table class='list nowrap'>"); |
302 | html("<table class='list nowrap'>"); |
244 | |
303 | |
245 | html("<tr class='nohover'><th class='left'>Age</th>" |
304 | html("<tr class='nohover'><th class='left'>Age</th>"); |
246 | "<th class='left'>Commit message"); |
305 | if (ctx.repo->enable_commit_graph) |
| |
306 | html("<th></th>"); |
| |
307 | html("<th class='left'>Commit message"); |
247 | if (pager) { |
308 | if (pager) { |
248 | html(" ("); |
309 | html(" ("); |
249 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
310 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
250 | NULL, ctx.qry.head, ctx.qry.sha1, |
311 | NULL, ctx.qry.head, ctx.qry.sha1, |
@@ -273,9 +334,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
273 | commit->parents = NULL; |
334 | commit->parents = NULL; |
274 | } |
335 | } |
275 | |
336 | |
276 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
337 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
277 | print_commit(commit); |
338 | print_commit(commit, &rev); |
278 | free(commit->buffer); |
339 | free(commit->buffer); |
279 | commit->buffer = NULL; |
340 | commit->buffer = NULL; |
280 | free_commit_list(commit->parents); |
341 | free_commit_list(commit->parents); |
281 | commit->parents = NULL; |
342 | commit->parents = NULL; |
|