|
diff --git a/shared.c b/shared.c index 9f7d6a5..b42c2a2 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -263,9 +263,9 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
263 | |
263 | |
264 | int cgit_diff_files(const unsigned char *old_sha1, |
264 | int cgit_diff_files(const unsigned char *old_sha1, |
265 | const unsigned char *new_sha1, unsigned long *old_size, |
265 | const unsigned char *new_sha1, unsigned long *old_size, |
266 | unsigned long *new_size, int *binary, int context, |
266 | unsigned long *new_size, int *binary, int context, |
267 | linediff_fn fn) |
267 | int ignorews, linediff_fn fn) |
268 | { |
268 | { |
269 | mmfile_t file1, file2; |
269 | mmfile_t file1, file2; |
270 | xpparam_t diff_params; |
270 | xpparam_t diff_params; |
271 | xdemitconf_t emit_params; |
271 | xdemitconf_t emit_params; |
@@ -290,8 +290,10 @@ int cgit_diff_files(const unsigned char *old_sha1, |
290 | memset(&diff_params, 0, sizeof(diff_params)); |
290 | memset(&diff_params, 0, sizeof(diff_params)); |
291 | memset(&emit_params, 0, sizeof(emit_params)); |
291 | memset(&emit_params, 0, sizeof(emit_params)); |
292 | memset(&emit_cb, 0, sizeof(emit_cb)); |
292 | memset(&emit_cb, 0, sizeof(emit_cb)); |
293 | diff_params.flags = XDF_NEED_MINIMAL; |
293 | diff_params.flags = XDF_NEED_MINIMAL; |
| |
294 | if (ignorews) |
| |
295 | diff_params.flags |= XDF_IGNORE_WHITESPACE; |
294 | emit_params.ctxlen = context > 0 ? context : 3; |
296 | emit_params.ctxlen = context > 0 ? context : 3; |
295 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
297 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
296 | emit_cb.outf = filediff_cb; |
298 | emit_cb.outf = filediff_cb; |
297 | emit_cb.priv = fn; |
299 | emit_cb.priv = fn; |
@@ -304,9 +306,9 @@ int cgit_diff_files(const unsigned char *old_sha1, |
304 | } |
306 | } |
305 | |
307 | |
306 | void cgit_diff_tree(const unsigned char *old_sha1, |
308 | void cgit_diff_tree(const unsigned char *old_sha1, |
307 | const unsigned char *new_sha1, |
309 | const unsigned char *new_sha1, |
308 | filepair_fn fn, const char *prefix) |
310 | filepair_fn fn, const char *prefix, int ignorews) |
309 | { |
311 | { |
310 | struct diff_options opt; |
312 | struct diff_options opt; |
311 | int ret; |
313 | int ret; |
312 | int prefixlen; |
314 | int prefixlen; |
@@ -315,8 +317,10 @@ void cgit_diff_tree(const unsigned char *old_sha1, |
315 | opt.output_format = DIFF_FORMAT_CALLBACK; |
317 | opt.output_format = DIFF_FORMAT_CALLBACK; |
316 | opt.detect_rename = 1; |
318 | opt.detect_rename = 1; |
317 | opt.rename_limit = ctx.cfg.renamelimit; |
319 | opt.rename_limit = ctx.cfg.renamelimit; |
318 | DIFF_OPT_SET(&opt, RECURSIVE); |
320 | DIFF_OPT_SET(&opt, RECURSIVE); |
| |
321 | if (ignorews) |
| |
322 | DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); |
319 | opt.format_callback = cgit_diff_tree_cb; |
323 | opt.format_callback = cgit_diff_tree_cb; |
320 | opt.format_callback_data = fn; |
324 | opt.format_callback_data = fn; |
321 | if (prefix) { |
325 | if (prefix) { |
322 | opt.nr_paths = 1; |
326 | opt.nr_paths = 1; |
@@ -339,9 +343,10 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
339 | unsigned char *old_sha1 = NULL; |
343 | unsigned char *old_sha1 = NULL; |
340 | |
344 | |
341 | if (commit->parents) |
345 | if (commit->parents) |
342 | old_sha1 = commit->parents->item->object.sha1; |
346 | old_sha1 = commit->parents->item->object.sha1; |
343 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
347 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL, |
| |
348 | ctx.qry.ignorews); |
344 | } |
349 | } |
345 | |
350 | |
346 | int cgit_parse_snapshots_mask(const char *str) |
351 | int cgit_parse_snapshots_mask(const char *str) |
347 | { |
352 | { |
|