|
diff --git a/cgit.c b/cgit.c index e9bafb5..9452884 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -249,12 +249,14 @@ static void querystring_cb(const char *name, const char *value) |
249 | } else if (!strcmp(name, "period")) { |
249 | } else if (!strcmp(name, "period")) { |
250 | ctx.qry.period = xstrdup(value); |
250 | ctx.qry.period = xstrdup(value); |
251 | } else if (!strcmp(name, "ss")) { |
251 | } else if (!strcmp(name, "ss")) { |
252 | ctx.qry.ssdiff = atoi(value); |
252 | ctx.qry.ssdiff = atoi(value); |
253 | } else if (!strcmp(name, "context")) { |
253 | } else if (!strcmp(name, "context")) { |
254 | ctx.qry.context = atoi(value); |
254 | ctx.qry.context = atoi(value); |
| |
255 | } else if (!strcmp(name, "ignorews")) { |
| |
256 | ctx.qry.ignorews = atoi(value); |
255 | } |
257 | } |
256 | } |
258 | } |
257 | |
259 | |
258 | char *xstrdupn(const char *str) |
260 | char *xstrdupn(const char *str) |
259 | { |
261 | { |
260 | return (str ? xstrdup(str) : NULL); |
262 | return (str ? xstrdup(str) : NULL); |
|
|
diff --git a/cgit.h b/cgit.h index bb8f598..1bdfbc6 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -143,12 +143,13 @@ struct cgit_query { |
143 | int ofs; |
143 | int ofs; |
144 | int nohead; |
144 | int nohead; |
145 | char *sort; |
145 | char *sort; |
146 | int showmsg; |
146 | int showmsg; |
147 | int ssdiff; |
147 | int ssdiff; |
148 | int context; |
148 | int context; |
| |
149 | int ignorews; |
149 | char *vpath; |
150 | char *vpath; |
150 | }; |
151 | }; |
151 | |
152 | |
152 | struct cgit_config { |
153 | struct cgit_config { |
153 | char *agefile; |
154 | char *agefile; |
154 | char *cache_root; |
155 | char *cache_root; |
@@ -272,17 +273,18 @@ extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
272 | |
273 | |
273 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
274 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
274 | |
275 | |
275 | extern int cgit_diff_files(const unsigned char *old_sha1, |
276 | extern int cgit_diff_files(const unsigned char *old_sha1, |
276 | const unsigned char *new_sha1, |
277 | const unsigned char *new_sha1, |
277 | unsigned long *old_size, unsigned long *new_size, |
278 | unsigned long *old_size, unsigned long *new_size, |
278 | int *binary, int context, linediff_fn fn); |
279 | int *binary, int context, int ignorews, |
| |
280 | linediff_fn fn); |
279 | |
281 | |
280 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
282 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
281 | const unsigned char *new_sha1, |
283 | const unsigned char *new_sha1, |
282 | filepair_fn fn, const char *prefix); |
284 | filepair_fn fn, const char *prefix, int ignorews); |
283 | |
285 | |
284 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
286 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
285 | |
287 | |
286 | extern char *fmt(const char *format,...); |
288 | extern char *fmt(const char *format,...); |
287 | |
289 | |
288 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
290 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
|
|
diff --git a/shared.c b/shared.c index 7cf1e59..d0973ab 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -260,13 +260,13 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
260 | return 0; |
260 | return 0; |
261 | } |
261 | } |
262 | |
262 | |
263 | int cgit_diff_files(const unsigned char *old_sha1, |
263 | int cgit_diff_files(const unsigned char *old_sha1, |
264 | const unsigned char *new_sha1, unsigned long *old_size, |
264 | const unsigned char *new_sha1, unsigned long *old_size, |
265 | unsigned long *new_size, int *binary, int context, |
265 | unsigned long *new_size, int *binary, int context, |
266 | linediff_fn fn) |
266 | int ignorews, linediff_fn fn) |
267 | { |
267 | { |
268 | mmfile_t file1, file2; |
268 | mmfile_t file1, file2; |
269 | xpparam_t diff_params; |
269 | xpparam_t diff_params; |
270 | xdemitconf_t emit_params; |
270 | xdemitconf_t emit_params; |
271 | xdemitcb_t emit_cb; |
271 | xdemitcb_t emit_cb; |
272 | |
272 | |
@@ -283,33 +283,37 @@ int cgit_diff_files(const unsigned char *old_sha1, |
283 | } |
283 | } |
284 | |
284 | |
285 | memset(&diff_params, 0, sizeof(diff_params)); |
285 | memset(&diff_params, 0, sizeof(diff_params)); |
286 | memset(&emit_params, 0, sizeof(emit_params)); |
286 | memset(&emit_params, 0, sizeof(emit_params)); |
287 | memset(&emit_cb, 0, sizeof(emit_cb)); |
287 | memset(&emit_cb, 0, sizeof(emit_cb)); |
288 | diff_params.flags = XDF_NEED_MINIMAL; |
288 | diff_params.flags = XDF_NEED_MINIMAL; |
| |
289 | if (ignorews) |
| |
290 | diff_params.flags |= XDF_IGNORE_WHITESPACE; |
289 | emit_params.ctxlen = context > 0 ? context : 3; |
291 | emit_params.ctxlen = context > 0 ? context : 3; |
290 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
292 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
291 | emit_cb.outf = filediff_cb; |
293 | emit_cb.outf = filediff_cb; |
292 | emit_cb.priv = fn; |
294 | emit_cb.priv = fn; |
293 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
295 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
294 | return 0; |
296 | return 0; |
295 | } |
297 | } |
296 | |
298 | |
297 | void cgit_diff_tree(const unsigned char *old_sha1, |
299 | void cgit_diff_tree(const unsigned char *old_sha1, |
298 | const unsigned char *new_sha1, |
300 | const unsigned char *new_sha1, |
299 | filepair_fn fn, const char *prefix) |
301 | filepair_fn fn, const char *prefix, int ignorews) |
300 | { |
302 | { |
301 | struct diff_options opt; |
303 | struct diff_options opt; |
302 | int ret; |
304 | int ret; |
303 | int prefixlen; |
305 | int prefixlen; |
304 | |
306 | |
305 | diff_setup(&opt); |
307 | diff_setup(&opt); |
306 | opt.output_format = DIFF_FORMAT_CALLBACK; |
308 | opt.output_format = DIFF_FORMAT_CALLBACK; |
307 | opt.detect_rename = 1; |
309 | opt.detect_rename = 1; |
308 | opt.rename_limit = ctx.cfg.renamelimit; |
310 | opt.rename_limit = ctx.cfg.renamelimit; |
309 | DIFF_OPT_SET(&opt, RECURSIVE); |
311 | DIFF_OPT_SET(&opt, RECURSIVE); |
| |
312 | if (ignorews) |
| |
313 | DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); |
310 | opt.format_callback = cgit_diff_tree_cb; |
314 | opt.format_callback = cgit_diff_tree_cb; |
311 | opt.format_callback_data = fn; |
315 | opt.format_callback_data = fn; |
312 | if (prefix) { |
316 | if (prefix) { |
313 | opt.nr_paths = 1; |
317 | opt.nr_paths = 1; |
314 | opt.paths = &prefix; |
318 | opt.paths = &prefix; |
315 | prefixlen = strlen(prefix); |
319 | prefixlen = strlen(prefix); |
@@ -328,13 +332,14 @@ void cgit_diff_tree(const unsigned char *old_sha1, |
328 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
332 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
329 | { |
333 | { |
330 | unsigned char *old_sha1 = NULL; |
334 | unsigned char *old_sha1 = NULL; |
331 | |
335 | |
332 | if (commit->parents) |
336 | if (commit->parents) |
333 | old_sha1 = commit->parents->item->object.sha1; |
337 | old_sha1 = commit->parents->item->object.sha1; |
334 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
338 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL, |
| |
339 | ctx.qry.ignorews); |
335 | } |
340 | } |
336 | |
341 | |
337 | int cgit_parse_snapshots_mask(const char *str) |
342 | int cgit_parse_snapshots_mask(const char *str) |
338 | { |
343 | { |
339 | const struct cgit_snapshot_format *f; |
344 | const struct cgit_snapshot_format *f; |
340 | static const char *delim = " \t,:/|;"; |
345 | static const char *delim = " \t,:/|;"; |
|
|
diff --git a/ui-diff.c b/ui-diff.c index e0a72f7..1656b77 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -124,13 +124,13 @@ static void inspect_filepair(struct diff_filepair *pair) |
124 | unsigned long old_size = 0; |
124 | unsigned long old_size = 0; |
125 | unsigned long new_size = 0; |
125 | unsigned long new_size = 0; |
126 | files++; |
126 | files++; |
127 | lines_added = 0; |
127 | lines_added = 0; |
128 | lines_removed = 0; |
128 | lines_removed = 0; |
129 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
129 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
130 | &binary, 0, count_diff_lines); |
130 | &binary, 0, ctx.qry.ignorews, count_diff_lines); |
131 | if (files >= slots) { |
131 | if (files >= slots) { |
132 | if (slots == 0) |
132 | if (slots == 0) |
133 | slots = 4; |
133 | slots = 4; |
134 | else |
134 | else |
135 | slots = slots * 2; |
135 | slots = slots * 2; |
136 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
136 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
@@ -171,13 +171,14 @@ void cgit_print_diffstat(const unsigned char *old_sha1, |
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("</div>"); |
174 | html("</div>"); |
175 | html("<table summary='diffstat' class='diffstat'>"); |
175 | html("<table summary='diffstat' class='diffstat'>"); |
176 | max_changes = 0; |
176 | max_changes = 0; |
177 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix); |
177 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix, |
| |
178 | ctx.qry.ignorews); |
178 | for(i = 0; i<files; i++) |
179 | for(i = 0; i<files; i++) |
179 | print_fileinfo(&items[i]); |
180 | print_fileinfo(&items[i]); |
180 | html("</table>"); |
181 | html("</table>"); |
181 | html("<div class='diffstat-summary'>"); |
182 | html("<div class='diffstat-summary'>"); |
182 | htmlf("%d files changed, %d insertions, %d deletions", |
183 | htmlf("%d files changed, %d insertions, %d deletions", |
183 | files, total_adds, total_rems); |
184 | files, total_adds, total_rems); |
@@ -293,13 +294,14 @@ static void filepair_cb(struct diff_filepair *pair) |
293 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
294 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
294 | if (use_ssdiff) |
295 | if (use_ssdiff) |
295 | cgit_ssdiff_footer(); |
296 | cgit_ssdiff_footer(); |
296 | return; |
297 | return; |
297 | } |
298 | } |
298 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
299 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
299 | &new_size, &binary, ctx.qry.context, print_line_fn)) |
300 | &new_size, &binary, ctx.qry.context, |
| |
301 | ctx.qry.ignorews, print_line_fn)) |
300 | cgit_print_error("Error running diff"); |
302 | cgit_print_error("Error running diff"); |
301 | if (binary) { |
303 | if (binary) { |
302 | if (use_ssdiff) |
304 | if (use_ssdiff) |
303 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
305 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
304 | else |
306 | else |
305 | html("Binary files differ"); |
307 | html("Binary files differ"); |
@@ -353,11 +355,12 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi |
353 | if (use_ssdiff) { |
355 | if (use_ssdiff) { |
354 | html("<table summary='ssdiff' class='ssdiff'>"); |
356 | html("<table summary='ssdiff' class='ssdiff'>"); |
355 | } else { |
357 | } else { |
356 | html("<table summary='diff' class='diff'>"); |
358 | html("<table summary='diff' class='diff'>"); |
357 | html("<tr><td>"); |
359 | html("<tr><td>"); |
358 | } |
360 | } |
359 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
361 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix, |
| |
362 | ctx.qry.ignorews); |
360 | if (!use_ssdiff) |
363 | if (!use_ssdiff) |
361 | html("</td></tr>"); |
364 | html("</td></tr>"); |
362 | html("</table>"); |
365 | html("</table>"); |
363 | } |
366 | } |
|
|
diff --git a/ui-log.c b/ui-log.c index 5eb5c81..354ee08 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -30,13 +30,14 @@ void inspect_files(struct diff_filepair *pair) |
30 | unsigned long new_size = 0; |
30 | unsigned long new_size = 0; |
31 | int binary = 0; |
31 | int binary = 0; |
32 | |
32 | |
33 | files++; |
33 | files++; |
34 | if (ctx.repo->enable_log_linecount) |
34 | if (ctx.repo->enable_log_linecount) |
35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
36 | &new_size, &binary, 0, count_lines); |
36 | &new_size, &binary, 0, ctx.qry.ignorews, |
| |
37 | count_lines); |
37 | } |
38 | } |
38 | |
39 | |
39 | void show_commit_decorations(struct commit *commit) |
40 | void show_commit_decorations(struct commit *commit) |
40 | { |
41 | { |
41 | struct name_decoration *deco; |
42 | struct name_decoration *deco; |
42 | static char buf[1024]; |
43 | static char buf[1024]; |
|
|
|
|
@@ -68,13 +68,13 @@ static void filepair_cb(struct diff_filepair *pair) |
68 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
68 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
69 | if (S_ISGITLINK(pair->two->mode)) |
69 | if (S_ISGITLINK(pair->two->mode)) |
70 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
70 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
71 | return; |
71 | return; |
72 | } |
72 | } |
73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
74 | &new_size, &binary, 0, print_line)) |
74 | &new_size, &binary, 0, 0, print_line)) |
75 | html("Error running diff"); |
75 | html("Error running diff"); |
76 | if (binary) |
76 | if (binary) |
77 | html("Binary files differ\n"); |
77 | html("Binary files differ\n"); |
78 | } |
78 | } |
79 | |
79 | |
80 | void cgit_print_patch(char *hex, const char *prefix) |
80 | void cgit_print_patch(char *hex, const char *prefix) |
@@ -121,11 +121,11 @@ void cgit_print_patch(char *hex, const char *prefix) |
121 | if (info->msg[strlen(info->msg) - 1] != '\n') |
121 | if (info->msg[strlen(info->msg) - 1] != '\n') |
122 | html("\n"); |
122 | html("\n"); |
123 | } |
123 | } |
124 | html("---\n"); |
124 | html("---\n"); |
125 | if (prefix) |
125 | if (prefix) |
126 | htmlf("(limited to '%s')\n\n", prefix); |
126 | htmlf("(limited to '%s')\n\n", prefix); |
127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix); |
127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix, 0); |
128 | html("--\n"); |
128 | html("--\n"); |
129 | htmlf("cgit %s\n", CGIT_VERSION); |
129 | htmlf("cgit %s\n", CGIT_VERSION); |
130 | cgit_free_commitinfo(info); |
130 | cgit_free_commitinfo(info); |
131 | } |
131 | } |
|