author | Johan Herland <johan@herland.net> | 2010-06-24 15:53:20 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 08:54:02 (UTC) |
commit | 72ef913514288bd2aae23509581097bfd3edf8c4 (patch) (unidiff) | |
tree | 3a8b48aa0ebcc74a7e8b7f05f964432c6d577921 /ui-diff.c | |
parent | 2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58 (diff) | |
download | cgit-72ef913514288bd2aae23509581097bfd3edf8c4.zip cgit-72ef913514288bd2aae23509581097bfd3edf8c4.tar.gz cgit-72ef913514288bd2aae23509581097bfd3edf8c4.tar.bz2 |
ui-diff: Add link to ignore/show whitespace changes in diffs
Add a link to the "Diffstat" line to ignore/show whitespace changes in the
generated diff.
To support this, cgit_commit_link() and cgit_diff_link() has learned to
preserve the ctx.qry.ignorews variable.
Signed-off-by: Johan Herland <johan@herland.net>
-rw-r--r-- | ui-diff.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -142,64 +142,69 @@ static void inspect_filepair(struct diff_filepair *pair) | |||
142 | items[files-1].new_mode = pair->two->mode; | 142 | items[files-1].new_mode = pair->two->mode; |
143 | items[files-1].old_path = xstrdup(pair->one->path); | 143 | items[files-1].old_path = xstrdup(pair->one->path); |
144 | items[files-1].new_path = xstrdup(pair->two->path); | 144 | items[files-1].new_path = xstrdup(pair->two->path); |
145 | items[files-1].added = lines_added; | 145 | items[files-1].added = lines_added; |
146 | items[files-1].removed = lines_removed; | 146 | items[files-1].removed = lines_removed; |
147 | items[files-1].old_size = old_size; | 147 | items[files-1].old_size = old_size; |
148 | items[files-1].new_size = new_size; | 148 | items[files-1].new_size = new_size; |
149 | items[files-1].binary = binary; | 149 | items[files-1].binary = binary; |
150 | if (lines_added + lines_removed > max_changes) | 150 | if (lines_added + lines_removed > max_changes) |
151 | max_changes = lines_added + lines_removed; | 151 | max_changes = lines_added + lines_removed; |
152 | total_adds += lines_added; | 152 | total_adds += lines_added; |
153 | total_rems += lines_removed; | 153 | total_rems += lines_removed; |
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, const char *prefix) | 157 | const unsigned char *new_sha1, const char *prefix) |
158 | { | 158 | { |
159 | int i, save_context = ctx.qry.context; | 159 | int i, save_context = ctx.qry.context; |
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) | 164 | if (prefix) |
165 | htmlf(" (limited to '%s')", prefix); | 165 | htmlf(" (limited to '%s')", prefix); |
166 | html(" ("); | 166 | html(" ("); |
167 | ctx.qry.context = (save_context > 0 ? save_context : 3) << 1; | 167 | ctx.qry.context = (save_context > 0 ? save_context : 3) << 1; |
168 | cgit_self_link("more", NULL, NULL, &ctx); | 168 | cgit_self_link("more", NULL, NULL, &ctx); |
169 | html("/"); | 169 | html("/"); |
170 | ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1; | 170 | ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1; |
171 | cgit_self_link("less", NULL, NULL, &ctx); | 171 | cgit_self_link("less", NULL, NULL, &ctx); |
172 | ctx.qry.context = save_context; | 172 | ctx.qry.context = save_context; |
173 | html(" context)"); | 173 | html(" context)"); |
174 | html(" ("); | ||
175 | ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2; | ||
176 | cgit_self_link(ctx.qry.ignorews ? "ignore" : "show", NULL, NULL, &ctx); | ||
177 | ctx.qry.ignorews = (ctx.qry.ignorews + 1) % 2; | ||
178 | html(" whitespace changes)"); | ||
174 | html("</div>"); | 179 | html("</div>"); |
175 | html("<table summary='diffstat' class='diffstat'>"); | 180 | html("<table summary='diffstat' class='diffstat'>"); |
176 | max_changes = 0; | 181 | max_changes = 0; |
177 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix, | 182 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix, |
178 | ctx.qry.ignorews); | 183 | ctx.qry.ignorews); |
179 | for(i = 0; i<files; i++) | 184 | for(i = 0; i<files; i++) |
180 | print_fileinfo(&items[i]); | 185 | print_fileinfo(&items[i]); |
181 | html("</table>"); | 186 | html("</table>"); |
182 | html("<div class='diffstat-summary'>"); | 187 | html("<div class='diffstat-summary'>"); |
183 | htmlf("%d files changed, %d insertions, %d deletions", | 188 | htmlf("%d files changed, %d insertions, %d deletions", |
184 | files, total_adds, total_rems); | 189 | files, total_adds, total_rems); |
185 | html("</div>"); | 190 | html("</div>"); |
186 | } | 191 | } |
187 | 192 | ||
188 | 193 | ||
189 | /* | 194 | /* |
190 | * print a single line returned from xdiff | 195 | * print a single line returned from xdiff |
191 | */ | 196 | */ |
192 | static void print_line(char *line, int len) | 197 | static void print_line(char *line, int len) |
193 | { | 198 | { |
194 | char *class = "ctx"; | 199 | char *class = "ctx"; |
195 | char c = line[len-1]; | 200 | char c = line[len-1]; |
196 | 201 | ||
197 | if (line[0] == '+') | 202 | if (line[0] == '+') |
198 | class = "add"; | 203 | class = "add"; |
199 | else if (line[0] == '-') | 204 | else if (line[0] == '-') |
200 | class = "del"; | 205 | class = "del"; |
201 | else if (line[0] == '@') | 206 | else if (line[0] == '@') |
202 | class = "hunk"; | 207 | class = "hunk"; |
203 | 208 | ||
204 | htmlf("<div class='%s'>", class); | 209 | htmlf("<div class='%s'>", class); |
205 | line[len-1] = '\0'; | 210 | line[len-1] = '\0'; |