author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:15:48 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:15:48 (UTC) |
commit | 37a24e4e39737edaa5cdde501346a65eeb280e63 (patch) (unidiff) | |
tree | ff23eb0d57edf108edd1aa3e64a8d6cf70062954 /ui-diff.c | |
parent | 47187b33be1c3de43fbed6f350ab05bc978aacd0 (diff) | |
parent | a2cbd3c30b64a26b52b2003ba6569f3c083f4092 (diff) | |
download | cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.zip cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.gz cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.bz2 |
Merge branch 'jh/path-limit'
Conflicts:
cgit.h
ui-commit.c
-rw-r--r-- | ui-diff.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -155,5 +155,5 @@ static void inspect_filepair(struct diff_filepair *pair) | |||
155 | 155 | ||
156 | void cgit_print_diffstat(const unsigned char *old_sha1, | 156 | void cgit_print_diffstat(const unsigned char *old_sha1, |
157 | const unsigned char *new_sha1) | 157 | const unsigned char *new_sha1, const char *prefix) |
158 | { | 158 | { |
159 | int i; | 159 | int i; |
@@ -162,8 +162,10 @@ void cgit_print_diffstat(const unsigned char *old_sha1, | |||
162 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, | 162 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
163 | ctx.qry.sha2, NULL, 0); | 163 | ctx.qry.sha2, NULL, 0); |
164 | if (prefix) | ||
165 | htmlf(" (limited to '%s')", prefix); | ||
164 | html("</div>"); | 166 | html("</div>"); |
165 | html("<table summary='diffstat' class='diffstat'>"); | 167 | html("<table summary='diffstat' class='diffstat'>"); |
166 | max_changes = 0; | 168 | max_changes = 0; |
167 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL); | 169 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix); |
168 | for(i = 0; i<files; i++) | 170 | for(i = 0; i<files; i++) |
169 | print_fileinfo(&items[i]); | 171 | print_fileinfo(&items[i]); |
@@ -339,5 +341,5 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi | |||
339 | 341 | ||
340 | print_ssdiff_link(); | 342 | print_ssdiff_link(); |
341 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1); | 343 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); |
342 | 344 | ||
343 | if (use_ssdiff) { | 345 | if (use_ssdiff) { |