]> gitweb.ps.run Git - ps-cgit/blob - ui-log.c
ui-log: Change display of full commit messages (and notes)
[ps-cgit] / ui-log.c
1 /* ui-log.c: functions for log output
2  *
3  * Copyright (C) 2006 Lars Hjemli
4  *
5  * Licensed under GNU General Public License v2
6  *   (see COPYING for full license text)
7  */
8
9 #include "cgit.h"
10 #include "html.h"
11 #include "ui-shared.h"
12 #include "vector.h"
13
14 int files, add_lines, rem_lines;
15
16 void count_lines(char *line, int size)
17 {
18         if (size <= 0)
19                 return;
20
21         if (line[0] == '+')
22                 add_lines++;
23
24         else if (line[0] == '-')
25                 rem_lines++;
26 }
27
28 void inspect_files(struct diff_filepair *pair)
29 {
30         unsigned long old_size = 0;
31         unsigned long new_size = 0;
32         int binary = 0;
33
34         files++;
35         if (ctx.repo->enable_log_linecount)
36                 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
37                                 &new_size, &binary, 0, ctx.qry.ignorews,
38                                 count_lines);
39 }
40
41 void show_commit_decorations(struct commit *commit)
42 {
43         struct name_decoration *deco;
44         static char buf[1024];
45
46         buf[sizeof(buf) - 1] = 0;
47         deco = lookup_decoration(&name_decoration, &commit->object);
48         while (deco) {
49                 if (!prefixcmp(deco->name, "refs/heads/")) {
50                         strncpy(buf, deco->name + 11, sizeof(buf) - 1);
51                         cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
52                                       ctx.qry.vpath, 0, NULL, NULL,
53                                       ctx.qry.showmsg);
54                 }
55                 else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
56                         strncpy(buf, deco->name + 15, sizeof(buf) - 1);
57                         cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
58                 }
59                 else if (!prefixcmp(deco->name, "refs/tags/")) {
60                         strncpy(buf, deco->name + 10, sizeof(buf) - 1);
61                         cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
62                 }
63                 else if (!prefixcmp(deco->name, "refs/remotes/")) {
64                         strncpy(buf, deco->name + 13, sizeof(buf) - 1);
65                         cgit_log_link(buf, NULL, "remote-deco", NULL,
66                                       sha1_to_hex(commit->object.sha1),
67                                       ctx.qry.vpath, 0, NULL, NULL,
68                                       ctx.qry.showmsg);
69                 }
70                 else {
71                         strncpy(buf, deco->name, sizeof(buf) - 1);
72                         cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
73                                          sha1_to_hex(commit->object.sha1),
74                                          ctx.qry.vpath, 0);
75                 }
76                 deco = deco->next;
77         }
78 }
79
80 void print_commit(struct commit *commit)
81 {
82         struct commitinfo *info;
83         char *tmp;
84         int cols = 2;
85
86         info = cgit_parse_commit(commit);
87         htmlf("<tr%s><td>",
88                 ctx.qry.showmsg ? " class='logheader'" : "");
89         tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
90         tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
91         html_link_open(tmp, NULL, NULL);
92         cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
93         html_link_close();
94         htmlf("</td><td%s>",
95                 ctx.qry.showmsg ? " class='logsubject'" : "");
96         cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
97                          sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
98         show_commit_decorations(commit);
99         html("</td><td>");
100         html_txt(info->author);
101         if (ctx.repo->enable_log_filecount) {
102                 files = 0;
103                 add_lines = 0;
104                 rem_lines = 0;
105                 cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
106                 html("</td><td>");
107                 htmlf("%d", files);
108                 if (ctx.repo->enable_log_linecount) {
109                         html("</td><td>");
110                         htmlf("-%d/+%d", rem_lines, add_lines);
111                 }
112         }
113         html("</td></tr>\n");
114
115         if (ctx.qry.showmsg) { /* Print message + notes in a second table row */
116                 /* Concatenate commit message and notes in msgbuf */
117                 struct strbuf msgbuf = STRBUF_INIT;
118                 if (info->msg && *(info->msg)) {
119                         strbuf_addstr(&msgbuf, info->msg);
120                         strbuf_addch(&msgbuf, '\n');
121                 }
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
127                 if (ctx.repo->enable_log_filecount) {
128                         cols++;
129                         if (ctx.repo->enable_log_linecount)
130                                 cols++;
131                 }
132
133                 /* Create second table row containing msgbuf */
134                 htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
135                         cols);
136                 html_txt(msgbuf.buf);
137                 html("</td></tr>\n");
138                 strbuf_release(&msgbuf);
139         }
140
141         cgit_free_commitinfo(info);
142 }
143
144 static const char *disambiguate_ref(const char *ref)
145 {
146         unsigned char sha1[20];
147         const char *longref;
148
149         longref = fmt("refs/heads/%s", ref);
150         if (get_sha1(longref, sha1) == 0)
151                 return longref;
152
153         return ref;
154 }
155
156 static char *next_token(char **src)
157 {
158         char *result;
159
160         if (!src || !*src)
161                 return NULL;
162         while (isspace(**src))
163                 (*src)++;
164         if (!**src)
165                 return NULL;
166         result = *src;
167         while (**src) {
168                 if (isspace(**src)) {
169                         **src = '\0';
170                         (*src)++;
171                         break;
172                 }
173                 (*src)++;
174         }
175         return result;
176 }
177
178 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
179                     char *path, int pager)
180 {
181         struct rev_info rev;
182         struct commit *commit;
183         struct vector vec = VECTOR_INIT(char *);
184         int i, columns = 3;
185         char *arg;
186
187         /* First argv is NULL */
188         vector_push(&vec, NULL, 0);
189
190         if (!tip)
191                 tip = ctx.qry.head;
192         tip = disambiguate_ref(tip);
193         vector_push(&vec, &tip, 0);
194
195         if (grep && pattern && *pattern) {
196                 pattern = xstrdup(pattern);
197                 if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
198                     !strcmp(grep, "committer")) {
199                         arg = fmt("--%s=%s", grep, pattern);
200                         vector_push(&vec, &arg, 0);
201                 }
202                 if (!strcmp(grep, "range")) {
203                         /* Split the pattern at whitespace and add each token
204                          * as a revision expression. Do not accept other
205                          * rev-list options. Also, replace the previously
206                          * pushed tip (it's no longer relevant).
207                          */
208                         vec.count--;
209                         while ((arg = next_token(&pattern))) {
210                                 if (*arg == '-') {
211                                         fprintf(stderr, "Bad range expr: %s\n",
212                                                 arg);
213                                         break;
214                                 }
215                                 vector_push(&vec, &arg, 0);
216                         }
217                 }
218         }
219
220         if (path) {
221                 arg = "--";
222                 vector_push(&vec, &arg, 0);
223                 vector_push(&vec, &path, 0);
224         }
225
226         /* Make sure the vector is NULL-terminated */
227         vector_push(&vec, NULL, 0);
228         vec.count--;
229
230         init_revisions(&rev, NULL);
231         rev.abbrev = DEFAULT_ABBREV;
232         rev.commit_format = CMIT_FMT_DEFAULT;
233         rev.verbose_header = 1;
234         rev.show_root_diff = 0;
235         setup_revisions(vec.count, vec.data, &rev, NULL);
236         load_ref_decorations(DECORATE_FULL_REFS);
237         rev.show_decorations = 1;
238         rev.grep_filter.regflags |= REG_ICASE;
239         compile_grep_patterns(&rev.grep_filter);
240         prepare_revision_walk(&rev);
241
242         if (pager)
243                 html("<table class='list nowrap'>");
244
245         html("<tr class='nohover'><th class='left'>Age</th>"
246               "<th class='left'>Commit message");
247         if (pager) {
248                 html(" (");
249                 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
250                               NULL, ctx.qry.head, ctx.qry.sha1,
251                               ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
252                               ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
253                 html(")");
254         }
255         html("</th><th class='left'>Author</th>");
256         if (ctx.repo->enable_log_filecount) {
257                 html("<th class='left'>Files</th>");
258                 columns++;
259                 if (ctx.repo->enable_log_linecount) {
260                         html("<th class='left'>Lines</th>");
261                         columns++;
262                 }
263         }
264         html("</tr>\n");
265
266         if (ofs<0)
267                 ofs = 0;
268
269         for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
270                 free(commit->buffer);
271                 commit->buffer = NULL;
272                 free_commit_list(commit->parents);
273                 commit->parents = NULL;
274         }
275
276         for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
277                 print_commit(commit);
278                 free(commit->buffer);
279                 commit->buffer = NULL;
280                 free_commit_list(commit->parents);
281                 commit->parents = NULL;
282         }
283         if (pager) {
284                 html("</table><div class='pager'>");
285                 if (ofs > 0) {
286                         cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
287                                       ctx.qry.sha1, ctx.qry.vpath,
288                                       ofs - cnt, ctx.qry.grep,
289                                       ctx.qry.search, ctx.qry.showmsg);
290                         html("&nbsp;");
291                 }
292                 if ((commit = get_revision(&rev)) != NULL) {
293                         cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
294                                       ctx.qry.sha1, ctx.qry.vpath,
295                                       ofs + cnt, ctx.qry.grep,
296                                       ctx.qry.search, ctx.qry.showmsg);
297                 }
298                 html("</div>");
299         } else if ((commit = get_revision(&rev)) != NULL) {
300                 html("<tr class='nohover'><td colspan='3'>");
301                 cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
302                               ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
303                 html("</td></tr>\n");
304         }
305 }