author | Johan Herland <johan@herland.net> | 2010-11-15 17:39:50 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-11-16 07:18:36 (UTC) |
commit | 9a8d39c668b98464bac97d4e5442966de63f97b2 (patch) (unidiff) | |
tree | ee1a7766d6d9365ae45f694939c20cab811abd84 /ui-log.c | |
parent | 5a36c2a291a00b59b8ec2f112453e117797c2fe5 (diff) | |
download | cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.zip cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.tar.gz cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.tar.bz2 |
ui-log: Implement support for commit graphs
Teach CGit to print an ASCII art commit graph to the left of the commit
message, similar to 'git log --graph'. The graph adds extra lines (table
rows) to the log when needed to add/remove/shuffle edges in the graph.
When 'showmsg' is enabled, the graph is automatically padded to account
for the extra lines added by the commit message/notes.
This feature is controlled by a new config variable: "enable-commit-graph"
(disabled by default), and individual repos can control it by setting
"repo.enable-commit-graph".
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-log.c | 103 |
1 files changed, 82 insertions, 21 deletions
@@ -32,274 +32,335 @@ void inspect_files(struct diff_filepair *pair) | |||
32 | int binary = 0; | 32 | int binary = 0; |
33 | 33 | ||
34 | files++; | 34 | files++; |
35 | if (ctx.repo->enable_log_linecount) | 35 | if (ctx.repo->enable_log_linecount) |
36 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 36 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
37 | &new_size, &binary, 0, ctx.qry.ignorews, | 37 | &new_size, &binary, 0, ctx.qry.ignorews, |
38 | count_lines); | 38 | count_lines); |
39 | } | 39 | } |
40 | 40 | ||
41 | void show_commit_decorations(struct commit *commit) | 41 | void show_commit_decorations(struct commit *commit) |
42 | { | 42 | { |
43 | struct name_decoration *deco; | 43 | struct name_decoration *deco; |
44 | static char buf[1024]; | 44 | static char buf[1024]; |
45 | 45 | ||
46 | buf[sizeof(buf) - 1] = 0; | 46 | buf[sizeof(buf) - 1] = 0; |
47 | deco = lookup_decoration(&name_decoration, &commit->object); | 47 | deco = lookup_decoration(&name_decoration, &commit->object); |
48 | while (deco) { | 48 | while (deco) { |
49 | if (!prefixcmp(deco->name, "refs/heads/")) { | 49 | if (!prefixcmp(deco->name, "refs/heads/")) { |
50 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); | 50 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); |
51 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, | 51 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, |
52 | ctx.qry.vpath, 0, NULL, NULL, | 52 | ctx.qry.vpath, 0, NULL, NULL, |
53 | ctx.qry.showmsg); | 53 | ctx.qry.showmsg); |
54 | } | 54 | } |
55 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { | 55 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
56 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); | 56 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
57 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 57 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
58 | } | 58 | } |
59 | else if (!prefixcmp(deco->name, "refs/tags/")) { | 59 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
60 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); | 60 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
61 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 61 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
62 | } | 62 | } |
63 | else if (!prefixcmp(deco->name, "refs/remotes/")) { | 63 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
64 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); | 64 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
65 | cgit_log_link(buf, NULL, "remote-deco", NULL, | 65 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
66 | sha1_to_hex(commit->object.sha1), | 66 | sha1_to_hex(commit->object.sha1), |
67 | ctx.qry.vpath, 0, NULL, NULL, | 67 | ctx.qry.vpath, 0, NULL, NULL, |
68 | ctx.qry.showmsg); | 68 | ctx.qry.showmsg); |
69 | } | 69 | } |
70 | else { | 70 | else { |
71 | strncpy(buf, deco->name, sizeof(buf) - 1); | 71 | strncpy(buf, deco->name, sizeof(buf) - 1); |
72 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, | 72 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
73 | sha1_to_hex(commit->object.sha1), | 73 | sha1_to_hex(commit->object.sha1), |
74 | ctx.qry.vpath, 0); | 74 | ctx.qry.vpath, 0); |
75 | } | 75 | } |
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'" : ""); |
89 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | 108 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
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>"); |
100 | html_txt(info->author); | 128 | html_txt(info->author); |
101 | if (ctx.repo->enable_log_filecount) { | 129 | if (ctx.repo->enable_log_filecount) { |
102 | files = 0; | 130 | files = 0; |
103 | add_lines = 0; | 131 | add_lines = 0; |
104 | rem_lines = 0; | 132 | rem_lines = 0; |
105 | cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); | 133 | cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); |
106 | html("</td><td>"); | 134 | html("</td><td>"); |
107 | htmlf("%d", files); | 135 | htmlf("%d", files); |
108 | if (ctx.repo->enable_log_linecount) { | 136 | if (ctx.repo->enable_log_linecount) { |
109 | html("</td><td>"); | 137 | html("</td><td>"); |
110 | htmlf("-%d/+%d", rem_lines, add_lines); | 138 | htmlf("-%d/+%d", rem_lines, add_lines); |
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) |
145 | { | 200 | { |
146 | unsigned char sha1[20]; | 201 | unsigned char sha1[20]; |
147 | const char *longref; | 202 | const char *longref; |
148 | 203 | ||
149 | longref = fmt("refs/heads/%s", ref); | 204 | longref = fmt("refs/heads/%s", ref); |
150 | if (get_sha1(longref, sha1) == 0) | 205 | if (get_sha1(longref, sha1) == 0) |
151 | return longref; | 206 | return longref; |
152 | 207 | ||
153 | return ref; | 208 | return ref; |
154 | } | 209 | } |
155 | 210 | ||
156 | static char *next_token(char **src) | 211 | static char *next_token(char **src) |
157 | { | 212 | { |
158 | char *result; | 213 | char *result; |
159 | 214 | ||
160 | if (!src || !*src) | 215 | if (!src || !*src) |
161 | return NULL; | 216 | return NULL; |
162 | while (isspace(**src)) | 217 | while (isspace(**src)) |
163 | (*src)++; | 218 | (*src)++; |
164 | if (!**src) | 219 | if (!**src) |
165 | return NULL; | 220 | return NULL; |
166 | result = *src; | 221 | result = *src; |
167 | while (**src) { | 222 | while (**src) { |
168 | if (isspace(**src)) { | 223 | if (isspace(**src)) { |
169 | **src = '\0'; | 224 | **src = '\0'; |
170 | (*src)++; | 225 | (*src)++; |
171 | break; | 226 | break; |
172 | } | 227 | } |
173 | (*src)++; | 228 | (*src)++; |
174 | } | 229 | } |
175 | return result; | 230 | return result; |
176 | } | 231 | } |
177 | 232 | ||
178 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, | 233 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
179 | char *path, int pager) | 234 | char *path, int pager) |
180 | { | 235 | { |
181 | struct rev_info rev; | 236 | struct rev_info rev; |
182 | struct commit *commit; | 237 | struct commit *commit; |
183 | struct vector vec = VECTOR_INIT(char *); | 238 | struct vector vec = VECTOR_INIT(char *); |
184 | int i, columns = 3; | 239 | int i, columns = 3; |
185 | char *arg; | 240 | char *arg; |
186 | 241 | ||
187 | /* First argv is NULL */ | 242 | /* First argv is NULL */ |
188 | vector_push(&vec, NULL, 0); | 243 | vector_push(&vec, NULL, 0); |
189 | 244 | ||
190 | if (!tip) | 245 | if (!tip) |
191 | tip = ctx.qry.head; | 246 | tip = ctx.qry.head; |
192 | tip = disambiguate_ref(tip); | 247 | tip = disambiguate_ref(tip); |
193 | vector_push(&vec, &tip, 0); | 248 | vector_push(&vec, &tip, 0); |
194 | 249 | ||
195 | if (grep && pattern && *pattern) { | 250 | if (grep && pattern && *pattern) { |
196 | pattern = xstrdup(pattern); | 251 | pattern = xstrdup(pattern); |
197 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || | 252 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
198 | !strcmp(grep, "committer")) { | 253 | !strcmp(grep, "committer")) { |
199 | arg = fmt("--%s=%s", grep, pattern); | 254 | arg = fmt("--%s=%s", grep, pattern); |
200 | vector_push(&vec, &arg, 0); | 255 | vector_push(&vec, &arg, 0); |
201 | } | 256 | } |
202 | if (!strcmp(grep, "range")) { | 257 | if (!strcmp(grep, "range")) { |
203 | /* Split the pattern at whitespace and add each token | 258 | /* Split the pattern at whitespace and add each token |
204 | * as a revision expression. Do not accept other | 259 | * as a revision expression. Do not accept other |
205 | * rev-list options. Also, replace the previously | 260 | * rev-list options. Also, replace the previously |
206 | * pushed tip (it's no longer relevant). | 261 | * pushed tip (it's no longer relevant). |
207 | */ | 262 | */ |
208 | vec.count--; | 263 | vec.count--; |
209 | while ((arg = next_token(&pattern))) { | 264 | while ((arg = next_token(&pattern))) { |
210 | if (*arg == '-') { | 265 | if (*arg == '-') { |
211 | fprintf(stderr, "Bad range expr: %s\n", | 266 | fprintf(stderr, "Bad range expr: %s\n", |
212 | arg); | 267 | arg); |
213 | break; | 268 | break; |
214 | } | 269 | } |
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); |
223 | vector_push(&vec, &path, 0); | 282 | vector_push(&vec, &path, 0); |
224 | } | 283 | } |
225 | 284 | ||
226 | /* Make sure the vector is NULL-terminated */ | 285 | /* Make sure the vector is NULL-terminated */ |
227 | vector_push(&vec, NULL, 0); | 286 | vector_push(&vec, NULL, 0); |
228 | vec.count--; | 287 | vec.count--; |
229 | 288 | ||
230 | init_revisions(&rev, NULL); | 289 | init_revisions(&rev, NULL); |
231 | rev.abbrev = DEFAULT_ABBREV; | 290 | rev.abbrev = DEFAULT_ABBREV; |
232 | rev.commit_format = CMIT_FMT_DEFAULT; | 291 | rev.commit_format = CMIT_FMT_DEFAULT; |
233 | rev.verbose_header = 1; | 292 | rev.verbose_header = 1; |
234 | rev.show_root_diff = 0; | 293 | rev.show_root_diff = 0; |
235 | setup_revisions(vec.count, vec.data, &rev, NULL); | 294 | setup_revisions(vec.count, vec.data, &rev, NULL); |
236 | load_ref_decorations(DECORATE_FULL_REFS); | 295 | load_ref_decorations(DECORATE_FULL_REFS); |
237 | rev.show_decorations = 1; | 296 | rev.show_decorations = 1; |
238 | rev.grep_filter.regflags |= REG_ICASE; | 297 | rev.grep_filter.regflags |= REG_ICASE; |
239 | compile_grep_patterns(&rev.grep_filter); | 298 | compile_grep_patterns(&rev.grep_filter); |
240 | prepare_revision_walk(&rev); | 299 | prepare_revision_walk(&rev); |
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, |
251 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, | 312 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
252 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); | 313 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
253 | html(")"); | 314 | html(")"); |
254 | } | 315 | } |
255 | html("</th><th class='left'>Author</th>"); | 316 | html("</th><th class='left'>Author</th>"); |
256 | if (ctx.repo->enable_log_filecount) { | 317 | if (ctx.repo->enable_log_filecount) { |
257 | html("<th class='left'>Files</th>"); | 318 | html("<th class='left'>Files</th>"); |
258 | columns++; | 319 | columns++; |
259 | if (ctx.repo->enable_log_linecount) { | 320 | if (ctx.repo->enable_log_linecount) { |
260 | html("<th class='left'>Lines</th>"); | 321 | html("<th class='left'>Lines</th>"); |
261 | columns++; | 322 | columns++; |
262 | } | 323 | } |
263 | } | 324 | } |
264 | html("</tr>\n"); | 325 | html("</tr>\n"); |
265 | 326 | ||
266 | if (ofs<0) | 327 | if (ofs<0) |
267 | ofs = 0; | 328 | ofs = 0; |
268 | 329 | ||
269 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { | 330 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
270 | free(commit->buffer); | 331 | free(commit->buffer); |
271 | commit->buffer = NULL; | 332 | commit->buffer = NULL; |
272 | free_commit_list(commit->parents); | 333 | free_commit_list(commit->parents); |
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; |
282 | } | 343 | } |
283 | if (pager) { | 344 | if (pager) { |
284 | html("</table><div class='pager'>"); | 345 | html("</table><div class='pager'>"); |
285 | if (ofs > 0) { | 346 | if (ofs > 0) { |
286 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, | 347 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, |
287 | ctx.qry.sha1, ctx.qry.vpath, | 348 | ctx.qry.sha1, ctx.qry.vpath, |
288 | ofs - cnt, ctx.qry.grep, | 349 | ofs - cnt, ctx.qry.grep, |
289 | ctx.qry.search, ctx.qry.showmsg); | 350 | ctx.qry.search, ctx.qry.showmsg); |
290 | html(" "); | 351 | html(" "); |
291 | } | 352 | } |
292 | if ((commit = get_revision(&rev)) != NULL) { | 353 | if ((commit = get_revision(&rev)) != NULL) { |
293 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, | 354 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, |
294 | ctx.qry.sha1, ctx.qry.vpath, | 355 | ctx.qry.sha1, ctx.qry.vpath, |
295 | ofs + cnt, ctx.qry.grep, | 356 | ofs + cnt, ctx.qry.grep, |
296 | ctx.qry.search, ctx.qry.showmsg); | 357 | ctx.qry.search, ctx.qry.showmsg); |
297 | } | 358 | } |
298 | html("</div>"); | 359 | html("</div>"); |
299 | } else if ((commit = get_revision(&rev)) != NULL) { | 360 | } else if ((commit = get_revision(&rev)) != NULL) { |
300 | html("<tr class='nohover'><td colspan='3'>"); | 361 | html("<tr class='nohover'><td colspan='3'>"); |
301 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, | 362 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, |
302 | ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); | 363 | ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); |
303 | html("</td></tr>\n"); | 364 | html("</td></tr>\n"); |
304 | } | 365 | } |
305 | } | 366 | } |