author | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 13:03:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 13:03:30 (UTC) |
commit | 6821d8ea4a64d15b8f284d1af01ab184ef1e76c3 (patch) (unidiff) | |
tree | e9d2ea0555f801653cc9caa382e33afc7c5d804d /shared.c | |
parent | 5c5d189635287a3bfaa1a4aef133dc0c582a27c2 (diff) | |
parent | 72ef913514288bd2aae23509581097bfd3edf8c4 (diff) | |
download | cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.zip cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.gz cgit-6821d8ea4a64d15b8f284d1af01ab184ef1e76c3.tar.bz2 |
Merge branch 'jh/ignorews'
-rw-r--r-- | shared.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -265,5 +265,5 @@ 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; |
@@ -292,4 +292,6 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
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; |
@@ -306,5 +308,5 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
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; |
@@ -317,4 +319,6 @@ void cgit_diff_tree(const unsigned char *old_sha1, | |||
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; |
@@ -341,5 +345,6 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn) | |||
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 | ||