author | Johan Herland <johan@herland.net> | 2010-06-09 23:09:31 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 08:40:23 (UTC) |
commit | c46e468dd229d5a20d99801072b4a8f8d970104f (patch) (side-by-side diff) | |
tree | c75f13ee117732ff4a41d8ec05a14e52f5117691 /ui-diff.c | |
parent | 48f7b982d3bb52f1307df73ceb6dd4cab3fdcc80 (diff) | |
download | cgit-c46e468dd229d5a20d99801072b4a8f8d970104f.zip cgit-c46e468dd229d5a20d99801072b4a8f8d970104f.tar.gz cgit-c46e468dd229d5a20d99801072b4a8f8d970104f.tar.bz2 |
ui-diff: Teach diffstat to obey path limit
Also indicate in the diffstat header if a path limit is in effect.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-diff.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -145,35 +145,37 @@ static void inspect_filepair(struct diff_filepair *pair) items[files-1].added = lines_added; items[files-1].removed = lines_removed; items[files-1].old_size = old_size; items[files-1].new_size = new_size; items[files-1].binary = binary; if (lines_added + lines_removed > max_changes) max_changes = lines_added + lines_removed; total_adds += lines_added; total_rems += lines_removed; } void cgit_print_diffstat(const unsigned char *old_sha1, - const unsigned char *new_sha1) + const unsigned char *new_sha1, const char *prefix) { int i; html("<div class='diffstat-header'>"); cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, ctx.qry.sha2, NULL, 0); + if (prefix) + htmlf(" (limited to '%s')", prefix); html("</div>"); html("<table summary='diffstat' class='diffstat'>"); max_changes = 0; - cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); + cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix); for(i = 0; i<files; i++) print_fileinfo(&items[i]); html("</table>"); html("<div class='diffstat-summary'>"); htmlf("%d files changed, %d insertions, %d deletions", files, total_adds, total_rems); html("</div>"); } /* * print a single line returned from xdiff @@ -329,25 +331,25 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1))); return; } commit2 = lookup_commit_reference(old_rev_sha1); if (!commit2 || parse_commit(commit2)) cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); } if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) use_ssdiff = 1; print_ssdiff_link(); - cgit_print_diffstat(old_rev_sha1, new_rev_sha1); + cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); if (use_ssdiff) { html("<table summary='ssdiff' class='ssdiff'>"); } else { html("<table summary='diff' class='diff'>"); html("<tr><td>"); } cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); if (!use_ssdiff) html("</td></tr>"); html("</table>"); } |