|
diff --git a/cgit.h b/cgit.h index a9896cf..f5f68ac 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -291,13 +291,14 @@ extern int cgit_diff_files(const unsigned char *old_sha1, |
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); |
|
|
diff --git a/shared.c b/shared.c index 72ac140..765cd27 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -335,19 +335,19 @@ void cgit_diff_tree(const unsigned char *old_sha1, |
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; |
|
|
diff --git a/ui-log.c b/ui-log.c index 41b5225..bc0c02c 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -98,13 +98,13 @@ void print_commit(struct commit *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 | } |
|