author | Johan Herland <johan@herland.net> | 2010-06-24 15:52:57 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-07-18 08:53:48 (UTC) |
commit | 2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58 (patch) (unidiff) | |
tree | 48d555b15c0432bb98712d746100bf6c0fe2be4a /shared.c | |
parent | d20313e3daf855ee5d4808e050f54614c200d7b1 (diff) | |
download | cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.zip cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.tar.gz cgit-2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58.tar.bz2 |
Add URL parameter 'ignorews' for optionally ignoring whitespace in diffs
The new ctx.qry.ignorews variable is passed via cgit_diff_files() and
cgit_diff_tree() to Git's diff machinery. This is equivalent to passing
--ignore-all-space to 'git diff'.
Signed-off-by: Johan Herland <johan@herland.net>
-rw-r--r-- | shared.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -265,3 +265,3 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
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 | { |
@@ -288,2 +288,4 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
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; |
@@ -298,3 +300,3 @@ 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 | { |
@@ -309,2 +311,4 @@ void cgit_diff_tree(const unsigned char *old_sha1, | |||
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; |
@@ -333,3 +337,4 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn) | |||
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 | } |