summaryrefslogtreecommitdiffabout
path: root/ui-log.c
Unidiff
Diffstat (limited to 'ui-log.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-log.c195
1 files changed, 161 insertions, 34 deletions
diff --git a/ui-log.c b/ui-log.c
index 27f5a1a..8add66a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -14,4 +14,19 @@
14int files, add_lines, rem_lines; 14int files, add_lines, rem_lines;
15 15
16/*
17 * The list of available column colors in the commit graph.
18 */
19static const char *column_colors_html[] = {
20 "<span class='column1'>",
21 "<span class='column2'>",
22 "<span class='column3'>",
23 "<span class='column4'>",
24 "<span class='column5'>",
25 "<span class='column6'>",
26 "</span>",
27};
28
29#define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
30
16void count_lines(char *line, int size) 31void count_lines(char *line, int size)
17{ 32{
@@ -78,20 +93,76 @@ void show_commit_decorations(struct commit *commit)
78} 93}
79 94
80void print_commit(struct commit *commit) 95void print_commit(struct commit *commit, struct rev_info *revs)
81{ 96{
82 struct commitinfo *info; 97 struct commitinfo *info;
83 char *tmp; 98 char *tmp;
84 int cols = 2; 99 int cols = revs->graph ? 3 : 2;
100 struct strbuf graphbuf = STRBUF_INIT;
101 struct strbuf msgbuf = STRBUF_INIT;
102
103 if (ctx.repo->enable_log_filecount) {
104 cols++;
105 if (ctx.repo->enable_log_linecount)
106 cols++;
107 }
108
109 if (revs->graph) {
110 /* Advance graph until current commit */
111 while (!graph_next_line(revs->graph, &graphbuf)) {
112 /* Print graph segment in otherwise empty table row */
113 html("<tr class='nohover'><td class='commitgraph'>");
114 html(graphbuf.buf);
115 htmlf("</td><td colspan='%d' /></tr>\n", cols);
116 strbuf_setlen(&graphbuf, 0);
117 }
118 /* Current commit's graph segment is now ready in graphbuf */
119 }
85 120
86 info = cgit_parse_commit(commit); 121 info = cgit_parse_commit(commit);
87 htmlf("<tr%s><td>", 122 htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : "");
88 ctx.qry.showmsg ? " class='logheader'" : ""); 123
89 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); 124 if (revs->graph) {
90 tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); 125 /* Print graph segment for current commit */
91 html_link_open(tmp, NULL, NULL); 126 html("<td class='commitgraph'>");
92 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); 127 html(graphbuf.buf);
93 html_link_close(); 128 html("</td>");
94 htmlf("</td><td%s>", 129 strbuf_setlen(&graphbuf, 0);
95 ctx.qry.showmsg ? " class='logsubject'" : ""); 130 }
131 else {
132 html("<td>");
133 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
134 tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
135 html_link_open(tmp, NULL, NULL);
136 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
137 html_link_close();
138 html("</td>");
139 }
140
141 htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : "");
142 if (ctx.qry.showmsg) {
143 /* line-wrap long commit subjects instead of truncating them */
144 size_t subject_len = strlen(info->subject);
145
146 if (subject_len > ctx.cfg.max_msg_len &&
147 ctx.cfg.max_msg_len >= 15) {
148 /* symbol for signaling line-wrap (in PAGE_ENCODING) */
149 const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 };
150 int i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
151
152 /* Rewind i to preceding space character */
153 while (i > 0 && !isspace(info->subject[i]))
154 --i;
155 if (!i) /* Oops, zero spaces. Reset i */
156 i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
157
158 /* add remainder starting at i to msgbuf */
159 strbuf_add(&msgbuf, info->subject + i, subject_len - i);
160 strbuf_trim(&msgbuf);
161 strbuf_add(&msgbuf, "\n\n", 2);
162
163 /* Place wrap_symbol at position i in info->subject */
164 strcpy(info->subject + i, wrap_symbol);
165 }
166 }
96 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, 167 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
97 sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); 168 sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
@@ -99,4 +170,14 @@ void print_commit(struct commit *commit)
99 html("</td><td>"); 170 html("</td><td>");
100 html_txt(info->author); 171 html_txt(info->author);
172
173 if (revs->graph) {
174 html("</td><td>");
175 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
176 tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
177 html_link_open(tmp, NULL, NULL);
178 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
179 html_link_close();
180 }
181
101 if (ctx.repo->enable_log_filecount) { 182 if (ctx.repo->enable_log_filecount) {
102 files = 0; 183 files = 0;
@@ -112,27 +193,59 @@ void print_commit(struct commit *commit)
112 } 193 }
113 html("</td></tr>\n"); 194 html("</td></tr>\n");
114 if (ctx.qry.showmsg) {
115 struct strbuf notes = STRBUF_INIT;
116 format_note(NULL, commit->object.sha1, &notes, PAGE_ENCODING, 0);
117 195
118 if (ctx.repo->enable_log_filecount) { 196 if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
119 cols++; 197 html("<tr class='nohover'>");
120 if (ctx.repo->enable_log_linecount) 198
121 cols++; 199 if (ctx.qry.showmsg) {
200 /* Concatenate commit message + notes in msgbuf */
201 if (info->msg && *(info->msg)) {
202 strbuf_addstr(&msgbuf, info->msg);
203 strbuf_addch(&msgbuf, '\n');
204 }
205 format_note(NULL, commit->object.sha1, &msgbuf,
206 PAGE_ENCODING,
207 NOTES_SHOW_HEADER | NOTES_INDENT);
208 strbuf_addch(&msgbuf, '\n');
209 strbuf_ltrim(&msgbuf);
122 } 210 }
123 htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", 211
124 cols); 212 if (revs->graph) {
125 html_txt(info->msg); 213 int lines = 0;
126 html("</td></tr>\n"); 214
127 if (notes.len != 0) { 215 /* Calculate graph padding */
128 html("<tr class='nohover'>"); 216 if (ctx.qry.showmsg) {
129 html("<td class='lognotes-label'>Notes:</td>"); 217 /* Count #lines in commit message + notes */
130 htmlf("<td colspan='%d' class='lognotes'>", 218 const char *p = msgbuf.buf;
131 cols); 219 lines = 1;
132 html_txt(notes.buf); 220 while ((p = strchr(p, '\n'))) {
133 html("</td></tr>\n"); 221 p++;
222 lines++;
223 }
224 }
225
226 /* Print graph padding */
227 html("<td class='commitgraph'>");
228 while (lines > 0 || !graph_is_commit_finished(revs->graph)) {
229 if (graphbuf.len)
230 html("\n");
231 strbuf_setlen(&graphbuf, 0);
232 graph_next_line(revs->graph, &graphbuf);
233 html(graphbuf.buf);
234 lines--;
235 }
236 html("</td>\n");
134 } 237 }
135 strbuf_release(&notes); 238 else
239 html("<td/>"); /* Empty 'Age' column */
240
241 /* Print msgbuf into remainder of table row */
242 htmlf("<td colspan='%d'%s>\n", cols,
243 ctx.qry.showmsg ? " class='logmsg'" : "");
244 html_txt(msgbuf.buf);
245 html("</td></tr>\n");
136 } 246 }
247
248 strbuf_release(&msgbuf);
249 strbuf_release(&graphbuf);
137 cgit_free_commitinfo(info); 250 cgit_free_commitinfo(info);
138} 251}
@@ -173,5 +286,5 @@ static char *next_token(char **src)
173 286
174void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, 287void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
175 char *path, int pager) 288 char *path, int pager, int commit_graph)
176{ 289{
177 struct rev_info rev; 290 struct rev_info rev;
@@ -213,4 +326,12 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
213 } 326 }
214 } 327 }
328 if (commit_graph) {
329 static const char *graph_arg = "--graph";
330 static const char *color_arg = "--color";
331 vector_push(&vec, &graph_arg, 0);
332 vector_push(&vec, &color_arg, 0);
333 graph_set_column_colors(column_colors_html,
334 COLUMN_COLORS_HTML_MAX);
335 }
215 336
216 if (path) { 337 if (path) {
@@ -239,6 +360,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
239 html("<table class='list nowrap'>"); 360 html("<table class='list nowrap'>");
240 361
241 html("<tr class='nohover'><th class='left'>Age</th>" 362 html("<tr class='nohover'>");
242 "<th class='left'>Commit message"); 363 if (commit_graph)
364 html("<th></th>");
365 else
366 html("<th class='left'>Age</th>");
367 html("<th class='left'>Commit message");
243 if (pager) { 368 if (pager) {
244 html(" ("); 369 html(" (");
@@ -250,4 +375,6 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
250 } 375 }
251 html("</th><th class='left'>Author</th>"); 376 html("</th><th class='left'>Author</th>");
377 if (commit_graph)
378 html("<th class='left'>Age</th>");
252 if (ctx.repo->enable_log_filecount) { 379 if (ctx.repo->enable_log_filecount) {
253 html("<th class='left'>Files</th>"); 380 html("<th class='left'>Files</th>");
@@ -271,5 +398,5 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
271 398
272 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { 399 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
273 print_commit(commit); 400 print_commit(commit, &rev);
274 free(commit->buffer); 401 free(commit->buffer);
275 commit->buffer = NULL; 402 commit->buffer = NULL;