diff options
| author | Lars Hjemli | 2010-06-22 16:15:48 +0200 | 
|---|---|---|
| committer | Lars Hjemli | 2010-06-22 16:15:48 +0200 | 
| commit | 37a24e4e39737edaa5cdde501346a65eeb280e63 (patch) | |
| tree | ff23eb0d57edf108edd1aa3e64a8d6cf70062954 /ui-diff.c | |
| parent | 47187b33be1c3de43fbed6f350ab05bc978aacd0 (diff) | |
| parent | a2cbd3c30b64a26b52b2003ba6569f3c083f4092 (diff) | |
| download | cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.gz cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.bz2 cgit-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
| @@ -154,17 +154,19 @@ static void inspect_filepair(struct diff_filepair *pair) | |||
| 154 | } | 154 | } | 
| 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; | 
| 160 | 160 | ||
| 161 | html("<div class='diffstat-header'>"); | 161 | html("<div class='diffstat-header'>"); | 
| 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]); | 
| 170 | html("</table>"); | 172 | html("</table>"); | 
| @@ -338,7 +340,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi | |||
| 338 | use_ssdiff = 1; | 340 | use_ssdiff = 1; | 
| 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) { | 
| 344 | html("<table summary='ssdiff' class='ssdiff'>"); | 346 | html("<table summary='ssdiff' class='ssdiff'>"); | 
