diff options
Diffstat (limited to 'shared.c')
-rw-r--r-- | shared.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -263,7 +263,7 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | |||
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; |
@@ -286,6 +286,8 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
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; |
@@ -296,7 +298,7 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
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; |
@@ -307,6 +309,8 @@ void cgit_diff_tree(const unsigned char *old_sha1, | |||
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) { |
@@ -331,7 +335,8 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn) | |||
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) |