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>
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
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
@@ -234,133 +234,138 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
                if (mb[i].ptr[mb[i].size-1] != '\n') {
                        /* Incomplete line */
                        diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
                        memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
                        buflen += mb[i].size;
                        continue;
                }
                /* we have a complete line */
                if (!diffbuf) {
                        ((linediff_fn)priv)(mb[i].ptr, mb[i].size);
                        continue;
                }
                diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
                memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
                ((linediff_fn)priv)(diffbuf, buflen + mb[i].size);
                free(diffbuf);
                diffbuf = NULL;
                buflen = 0;
        }
        if (diffbuf) {
                ((linediff_fn)priv)(diffbuf, buflen);
                free(diffbuf);
                diffbuf = NULL;
                buflen = 0;
        }
        return 0;
 }
 int cgit_diff_files(const unsigned char *old_sha1,
                    const unsigned char *new_sha1, unsigned long *old_size,
                    unsigned long *new_size, int *binary, int context,
-                    linediff_fn fn)
+                    int ignorews, linediff_fn fn)
 {
        mmfile_t file1, file2;
        xpparam_t diff_params;
        xdemitconf_t emit_params;
        xdemitcb_t emit_cb;
        if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
                return 1;
        *old_size = file1.size;
        *new_size = file2.size;
        if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
            (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
                *binary = 1;
                return 0;
        }
        memset(&diff_params, 0, sizeof(diff_params));
        memset(&emit_params, 0, sizeof(emit_params));
        memset(&emit_cb, 0, sizeof(emit_cb));
        diff_params.flags = XDF_NEED_MINIMAL;
+        if (ignorews)
+                diff_params.flags |= XDF_IGNORE_WHITESPACE;
        emit_params.ctxlen = context > 0 ? context : 3;
        emit_params.flags = XDL_EMIT_FUNCNAMES;
        emit_cb.outf = filediff_cb;
        emit_cb.priv = fn;
        xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
        return 0;
 }
 void cgit_diff_tree(const unsigned char *old_sha1,
                    const unsigned char *new_sha1,
-                    filepair_fn fn, const char *prefix)
+                    filepair_fn fn, const char *prefix, int ignorews)
 {
        struct diff_options opt;
        int ret;
        int prefixlen;
        diff_setup(&opt);
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;
        opt.rename_limit = ctx.cfg.renamelimit;
        DIFF_OPT_SET(&opt, RECURSIVE);
+        if (ignorews)
+                DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        if (prefix) {
                opt.nr_paths = 1;
                opt.paths = &prefix;
                prefixlen = strlen(prefix);
                opt.pathlens = &prefixlen;
        }
        diff_setup_done(&opt);
        if (old_sha1 && !is_null_sha1(old_sha1))
                ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
        else
                ret = diff_root_tree_sha1(new_sha1, "", &opt);
        diffcore_std(&opt);
        diff_flush(&opt);
 }
 void cgit_diff_commit(struct commit *commit, filepair_fn fn)
 {
        unsigned char *old_sha1 = NULL;
        if (commit->parents)
                old_sha1 = commit->parents->item->object.sha1;
-        cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
+        cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL,
+                       ctx.qry.ignorews);
 }
 int cgit_parse_snapshots_mask(const char *str)
 {
        const struct cgit_snapshot_format *f;
        static const char *delim = " \t,:/|;";
        int tl, sl, rv = 0;
        /* favor legacy setting */
        if(atoi(str))
                return 1;
        for(;;) {
                str += strspn(str,delim);
                tl = strcspn(str,delim);
                if (!tl)
                        break;
                for (f = cgit_snapshot_formats; f->suffix; f++) {
                        sl = strlen(f->suffix);
                        if((tl == sl && !strncmp(f->suffix, str, tl)) ||
                           (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) {
                                rv |= f->bit;
                                break;
                        }
                }
                str += tl;
        }
        return rv;
 }
 int cgit_open_filter(struct cgit_filter *filter)
 {
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