|
diff --git a/cgit.h b/cgit.h index a9896cf..f5f68ac 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -249,69 +249,70 @@ struct cgit_context { |
249 | struct cgit_environment env; |
249 | struct cgit_environment env; |
250 | struct cgit_query qry; |
250 | struct cgit_query qry; |
251 | struct cgit_config cfg; |
251 | struct cgit_config cfg; |
252 | struct cgit_repo *repo; |
252 | struct cgit_repo *repo; |
253 | struct cgit_page page; |
253 | struct cgit_page page; |
254 | }; |
254 | }; |
255 | |
255 | |
256 | struct cgit_snapshot_format { |
256 | struct cgit_snapshot_format { |
257 | const char *suffix; |
257 | const char *suffix; |
258 | const char *mimetype; |
258 | const char *mimetype; |
259 | write_archive_fn_t write_func; |
259 | write_archive_fn_t write_func; |
260 | int bit; |
260 | int bit; |
261 | }; |
261 | }; |
262 | |
262 | |
263 | extern const char *cgit_version; |
263 | extern const char *cgit_version; |
264 | |
264 | |
265 | extern struct cgit_repolist cgit_repolist; |
265 | extern struct cgit_repolist cgit_repolist; |
266 | extern struct cgit_context ctx; |
266 | extern struct cgit_context ctx; |
267 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
267 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
268 | |
268 | |
269 | extern struct cgit_repo *cgit_add_repo(const char *url); |
269 | extern struct cgit_repo *cgit_add_repo(const char *url); |
270 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
270 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
271 | extern void cgit_repo_config_cb(const char *name, const char *value); |
271 | extern void cgit_repo_config_cb(const char *name, const char *value); |
272 | |
272 | |
273 | extern int chk_zero(int result, char *msg); |
273 | extern int chk_zero(int result, char *msg); |
274 | extern int chk_positive(int result, char *msg); |
274 | extern int chk_positive(int result, char *msg); |
275 | extern int chk_non_negative(int result, char *msg); |
275 | extern int chk_non_negative(int result, char *msg); |
276 | |
276 | |
277 | extern char *trim_end(const char *str, char c); |
277 | extern char *trim_end(const char *str, char c); |
278 | extern char *strlpart(char *txt, int maxlen); |
278 | extern char *strlpart(char *txt, int maxlen); |
279 | extern char *strrpart(char *txt, int maxlen); |
279 | extern char *strrpart(char *txt, int maxlen); |
280 | |
280 | |
281 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
281 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
282 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
282 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
283 | int flags, void *cb_data); |
283 | int flags, void *cb_data); |
284 | |
284 | |
285 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
285 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
286 | |
286 | |
287 | extern int cgit_diff_files(const unsigned char *old_sha1, |
287 | extern int cgit_diff_files(const unsigned char *old_sha1, |
288 | const unsigned char *new_sha1, |
288 | const unsigned char *new_sha1, |
289 | unsigned long *old_size, unsigned long *new_size, |
289 | unsigned long *old_size, unsigned long *new_size, |
290 | int *binary, int context, int ignorews, |
290 | int *binary, int context, int ignorews, |
291 | linediff_fn fn); |
291 | linediff_fn fn); |
292 | |
292 | |
293 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
293 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
294 | const unsigned char *new_sha1, |
294 | const unsigned char *new_sha1, |
295 | filepair_fn fn, const char *prefix, int ignorews); |
295 | filepair_fn fn, const char *prefix, int ignorews); |
296 | |
296 | |
297 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
297 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn, |
| |
298 | const char *prefix); |
298 | |
299 | |
299 | __attribute__((format (printf,1,2))) |
300 | __attribute__((format (printf,1,2))) |
300 | extern char *fmt(const char *format,...); |
301 | extern char *fmt(const char *format,...); |
301 | |
302 | |
302 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
303 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
303 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
304 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
304 | extern void cgit_parse_url(const char *url); |
305 | extern void cgit_parse_url(const char *url); |
305 | |
306 | |
306 | extern const char *cgit_repobasename(const char *reponame); |
307 | extern const char *cgit_repobasename(const char *reponame); |
307 | |
308 | |
308 | extern int cgit_parse_snapshots_mask(const char *str); |
309 | extern int cgit_parse_snapshots_mask(const char *str); |
309 | |
310 | |
310 | extern int cgit_open_filter(struct cgit_filter *filter); |
311 | extern int cgit_open_filter(struct cgit_filter *filter); |
311 | extern int cgit_close_filter(struct cgit_filter *filter); |
312 | extern int cgit_close_filter(struct cgit_filter *filter); |
312 | |
313 | |
313 | extern int readfile(const char *path, char **buf, size_t *size); |
314 | extern int readfile(const char *path, char **buf, size_t *size); |
314 | |
315 | |
315 | extern char *expand_macros(const char *txt); |
316 | extern char *expand_macros(const char *txt); |
316 | |
317 | |
317 | #endif /* CGIT_H */ |
318 | #endif /* CGIT_H */ |
|
|
diff --git a/shared.c b/shared.c index 72ac140..765cd27 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -293,103 +293,103 @@ int cgit_diff_files(const unsigned char *old_sha1, |
293 | diff_params.flags = XDF_NEED_MINIMAL; |
293 | diff_params.flags = XDF_NEED_MINIMAL; |
294 | if (ignorews) |
294 | if (ignorews) |
295 | diff_params.flags |= XDF_IGNORE_WHITESPACE; |
295 | diff_params.flags |= XDF_IGNORE_WHITESPACE; |
296 | emit_params.ctxlen = context > 0 ? context : 3; |
296 | emit_params.ctxlen = context > 0 ? context : 3; |
297 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
297 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
298 | emit_cb.outf = filediff_cb; |
298 | emit_cb.outf = filediff_cb; |
299 | emit_cb.priv = fn; |
299 | emit_cb.priv = fn; |
300 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
300 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
301 | if (file1.size) |
301 | if (file1.size) |
302 | free(file1.ptr); |
302 | free(file1.ptr); |
303 | if (file2.size) |
303 | if (file2.size) |
304 | free(file2.ptr); |
304 | free(file2.ptr); |
305 | return 0; |
305 | return 0; |
306 | } |
306 | } |
307 | |
307 | |
308 | void cgit_diff_tree(const unsigned char *old_sha1, |
308 | void cgit_diff_tree(const unsigned char *old_sha1, |
309 | const unsigned char *new_sha1, |
309 | const unsigned char *new_sha1, |
310 | filepair_fn fn, const char *prefix, int ignorews) |
310 | filepair_fn fn, const char *prefix, int ignorews) |
311 | { |
311 | { |
312 | struct diff_options opt; |
312 | struct diff_options opt; |
313 | int ret; |
313 | int ret; |
314 | int prefixlen; |
314 | int prefixlen; |
315 | |
315 | |
316 | diff_setup(&opt); |
316 | diff_setup(&opt); |
317 | opt.output_format = DIFF_FORMAT_CALLBACK; |
317 | opt.output_format = DIFF_FORMAT_CALLBACK; |
318 | opt.detect_rename = 1; |
318 | opt.detect_rename = 1; |
319 | opt.rename_limit = ctx.cfg.renamelimit; |
319 | opt.rename_limit = ctx.cfg.renamelimit; |
320 | DIFF_OPT_SET(&opt, RECURSIVE); |
320 | DIFF_OPT_SET(&opt, RECURSIVE); |
321 | if (ignorews) |
321 | if (ignorews) |
322 | DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); |
322 | DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); |
323 | opt.format_callback = cgit_diff_tree_cb; |
323 | opt.format_callback = cgit_diff_tree_cb; |
324 | opt.format_callback_data = fn; |
324 | opt.format_callback_data = fn; |
325 | if (prefix) { |
325 | if (prefix) { |
326 | opt.nr_paths = 1; |
326 | opt.nr_paths = 1; |
327 | opt.paths = &prefix; |
327 | opt.paths = &prefix; |
328 | prefixlen = strlen(prefix); |
328 | prefixlen = strlen(prefix); |
329 | opt.pathlens = &prefixlen; |
329 | opt.pathlens = &prefixlen; |
330 | } |
330 | } |
331 | diff_setup_done(&opt); |
331 | diff_setup_done(&opt); |
332 | |
332 | |
333 | if (old_sha1 && !is_null_sha1(old_sha1)) |
333 | if (old_sha1 && !is_null_sha1(old_sha1)) |
334 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
334 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
335 | else |
335 | else |
336 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
336 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
337 | diffcore_std(&opt); |
337 | diffcore_std(&opt); |
338 | diff_flush(&opt); |
338 | diff_flush(&opt); |
339 | } |
339 | } |
340 | |
340 | |
341 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
341 | void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) |
342 | { |
342 | { |
343 | unsigned char *old_sha1 = NULL; |
343 | unsigned char *old_sha1 = NULL; |
344 | |
344 | |
345 | if (commit->parents) |
345 | if (commit->parents) |
346 | old_sha1 = commit->parents->item->object.sha1; |
346 | old_sha1 = commit->parents->item->object.sha1; |
347 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL, |
347 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix, |
348 | ctx.qry.ignorews); |
348 | ctx.qry.ignorews); |
349 | } |
349 | } |
350 | |
350 | |
351 | int cgit_parse_snapshots_mask(const char *str) |
351 | int cgit_parse_snapshots_mask(const char *str) |
352 | { |
352 | { |
353 | const struct cgit_snapshot_format *f; |
353 | const struct cgit_snapshot_format *f; |
354 | static const char *delim = " \t,:/|;"; |
354 | static const char *delim = " \t,:/|;"; |
355 | int tl, sl, rv = 0; |
355 | int tl, sl, rv = 0; |
356 | |
356 | |
357 | /* favor legacy setting */ |
357 | /* favor legacy setting */ |
358 | if(atoi(str)) |
358 | if(atoi(str)) |
359 | return 1; |
359 | return 1; |
360 | for(;;) { |
360 | for(;;) { |
361 | str += strspn(str,delim); |
361 | str += strspn(str,delim); |
362 | tl = strcspn(str,delim); |
362 | tl = strcspn(str,delim); |
363 | if (!tl) |
363 | if (!tl) |
364 | break; |
364 | break; |
365 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
365 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
366 | sl = strlen(f->suffix); |
366 | sl = strlen(f->suffix); |
367 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
367 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
368 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
368 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
369 | rv |= f->bit; |
369 | rv |= f->bit; |
370 | break; |
370 | break; |
371 | } |
371 | } |
372 | } |
372 | } |
373 | str += tl; |
373 | str += tl; |
374 | } |
374 | } |
375 | return rv; |
375 | return rv; |
376 | } |
376 | } |
377 | |
377 | |
378 | int cgit_open_filter(struct cgit_filter *filter) |
378 | int cgit_open_filter(struct cgit_filter *filter) |
379 | { |
379 | { |
380 | |
380 | |
381 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), |
381 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), |
382 | "Unable to duplicate STDOUT"); |
382 | "Unable to duplicate STDOUT"); |
383 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); |
383 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); |
384 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); |
384 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); |
385 | if (filter->pid == 0) { |
385 | if (filter->pid == 0) { |
386 | close(filter->pipe_fh[1]); |
386 | close(filter->pipe_fh[1]); |
387 | chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), |
387 | chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), |
388 | "Unable to use pipe as STDIN"); |
388 | "Unable to use pipe as STDIN"); |
389 | execvp(filter->cmd, filter->argv); |
389 | execvp(filter->cmd, filter->argv); |
390 | die("Unable to exec subprocess %s: %s (%d)", filter->cmd, |
390 | die("Unable to exec subprocess %s: %s (%d)", filter->cmd, |
391 | strerror(errno), errno); |
391 | strerror(errno), errno); |
392 | } |
392 | } |
393 | close(filter->pipe_fh[0]); |
393 | close(filter->pipe_fh[0]); |
394 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), |
394 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), |
395 | "Unable to use pipe as STDOUT"); |
395 | "Unable to use pipe as STDOUT"); |
|
|
diff --git a/ui-log.c b/ui-log.c index 41b5225..bc0c02c 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -56,97 +56,97 @@ void show_commit_decorations(struct commit *commit) |
56 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
56 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
57 | } |
57 | } |
58 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
58 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
59 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
59 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
60 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
60 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
61 | } |
61 | } |
62 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
62 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
63 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
63 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
64 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
64 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
65 | sha1_to_hex(commit->object.sha1), |
65 | sha1_to_hex(commit->object.sha1), |
66 | ctx.qry.vpath, 0, NULL, NULL, |
66 | ctx.qry.vpath, 0, NULL, NULL, |
67 | ctx.qry.showmsg); |
67 | ctx.qry.showmsg); |
68 | } |
68 | } |
69 | else { |
69 | else { |
70 | strncpy(buf, deco->name, sizeof(buf) - 1); |
70 | strncpy(buf, deco->name, sizeof(buf) - 1); |
71 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
71 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
72 | sha1_to_hex(commit->object.sha1), |
72 | sha1_to_hex(commit->object.sha1), |
73 | ctx.qry.vpath, 0); |
73 | ctx.qry.vpath, 0); |
74 | } |
74 | } |
75 | deco = deco->next; |
75 | deco = deco->next; |
76 | } |
76 | } |
77 | } |
77 | } |
78 | |
78 | |
79 | void print_commit(struct commit *commit) |
79 | void print_commit(struct commit *commit) |
80 | { |
80 | { |
81 | struct commitinfo *info; |
81 | struct commitinfo *info; |
82 | char *tmp; |
82 | char *tmp; |
83 | int cols = 2; |
83 | int cols = 2; |
84 | |
84 | |
85 | info = cgit_parse_commit(commit); |
85 | info = cgit_parse_commit(commit); |
86 | htmlf("<tr%s><td>", |
86 | htmlf("<tr%s><td>", |
87 | ctx.qry.showmsg ? " class='logheader'" : ""); |
87 | ctx.qry.showmsg ? " class='logheader'" : ""); |
88 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
88 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
89 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
89 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
90 | html_link_open(tmp, NULL, NULL); |
90 | html_link_open(tmp, NULL, NULL); |
91 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
91 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
92 | html_link_close(); |
92 | html_link_close(); |
93 | htmlf("</td><td%s>", |
93 | htmlf("</td><td%s>", |
94 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
94 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
95 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
95 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
96 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
96 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
97 | show_commit_decorations(commit); |
97 | show_commit_decorations(commit); |
98 | html("</td><td>"); |
98 | html("</td><td>"); |
99 | html_txt(info->author); |
99 | html_txt(info->author); |
100 | if (ctx.repo->enable_log_filecount) { |
100 | if (ctx.repo->enable_log_filecount) { |
101 | files = 0; |
101 | files = 0; |
102 | add_lines = 0; |
102 | add_lines = 0; |
103 | rem_lines = 0; |
103 | rem_lines = 0; |
104 | cgit_diff_commit(commit, inspect_files); |
104 | cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); |
105 | html("</td><td>"); |
105 | html("</td><td>"); |
106 | htmlf("%d", files); |
106 | htmlf("%d", files); |
107 | if (ctx.repo->enable_log_linecount) { |
107 | if (ctx.repo->enable_log_linecount) { |
108 | html("</td><td>"); |
108 | html("</td><td>"); |
109 | htmlf("-%d/+%d", rem_lines, add_lines); |
109 | htmlf("-%d/+%d", rem_lines, add_lines); |
110 | } |
110 | } |
111 | } |
111 | } |
112 | html("</td></tr>\n"); |
112 | html("</td></tr>\n"); |
113 | if (ctx.qry.showmsg) { |
113 | if (ctx.qry.showmsg) { |
114 | struct strbuf notes = STRBUF_INIT; |
114 | struct strbuf notes = STRBUF_INIT; |
115 | format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); |
115 | format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); |
116 | |
116 | |
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) |
|