diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 16:15:48 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 16:15:48 +0200 |
| commit | 37a24e4e39737edaa5cdde501346a65eeb280e63 (patch) | |
| tree | ff23eb0d57edf108edd1aa3e64a8d6cf70062954 /ui-diff.c | |
| parent | Fix style of commit-filter links in commit-subject. (diff) | |
| parent | ui-shared.c: path-limit style nitpick (diff) | |
| download | cgit-pink-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.gz cgit-pink-37a24e4e39737edaa5cdde501346a65eeb280e63.zip | |
Merge branch 'jh/path-limit'
Conflicts: cgit.h ui-commit.c
Diffstat (limited to 'ui-diff.c')
| -rw-r--r-- | ui-diff.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui-diff.c b/ui-diff.c index a92a768..fb836df 100644 --- a/ui-diff.c +++ b/ui-diff.c @@ -154,17 +154,19 @@ static void inspect_filepair(struct diff_filepair *pair) } 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>"); @@ -338,7 +340,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi 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'>"); |