|
diff --git a/cgit.h b/cgit.h index a9896cf..f5f68ac 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -281,33 +281,34 @@ extern char *strrpart(char *txt, int maxlen); |
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); |
|
|
diff --git a/shared.c b/shared.c index 72ac140..765cd27 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -325,39 +325,39 @@ void cgit_diff_tree(const unsigned char *old_sha1, |
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) |
|
|
diff --git a/ui-log.c b/ui-log.c index 41b5225..bc0c02c 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -88,33 +88,33 @@ void print_commit(struct commit *commit) |
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++; |
|