summaryrefslogtreecommitdiffabout
path: root/shared.c
authorJohan Herland <johan@herland.net>2010-06-24 15:52:57 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-07-18 08:53:48 (UTC)
commit2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58 (patch) (unidiff)
tree48d555b15c0432bb98712d746100bf6c0fe2be4a /shared.c
parentd20313e3daf855ee5d4808e050f54614c200d7b1 (diff)
downloadcgit-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>
Diffstat (limited to 'shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/shared.c b/shared.c
index 7cf1e59..d0973ab 100644
--- a/shared.c
+++ b/shared.c
@@ -264,5 +264,5 @@ 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;
@@ -287,4 +287,6 @@ int cgit_diff_files(const unsigned char *old_sha1,
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;
@@ -297,5 +299,5 @@ int cgit_diff_files(const unsigned char *old_sha1,
297void cgit_diff_tree(const unsigned char *old_sha1, 299void 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;
@@ -308,4 +310,6 @@ void cgit_diff_tree(const unsigned char *old_sha1,
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;
@@ -332,5 +336,6 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
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