Add URL parameter 'context' for changing the number of context lines in diffs

The new ctx.qry.context variable is picked up by cgit_print_diff(), and
passed via cgit_diff_files() to Git's diff machinery.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/cgit.c b/cgit.c
index 2c3ad73e064b556a23629194b9ca0a0a696186ee..e9bafb506ef38c24c4b4300de08d0b5965a738f6 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -250,6 +250,8 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.period = xstrdup(value);
        } else if (!strcmp(name, "ss")) {
                ctx.qry.ssdiff = atoi(value);
                ctx.qry.period = xstrdup(value);
        } else if (!strcmp(name, "ss")) {
                ctx.qry.ssdiff = atoi(value);

+       } else if (!strcmp(name, "context")) {
+               ctx.qry.context = atoi(value);

        }
 }
 
        }
 }
 

diff --git a/cgit.h b/cgit.h
index f990b1506e29cdc10e89697041da06959319fdaa..bb8f598b1f60457cebbf1beeb8f7de8e673e59e0 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -145,6 +145,7 @@ struct cgit_query {
        char *sort;
        int showmsg;
        int ssdiff;
        char *sort;
        int showmsg;
        int ssdiff;

+       int context;

        char *vpath;
 };
 
        char *vpath;
 };
 


@@ -274,7 +275,7 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 extern int cgit_diff_files(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
                           unsigned long *old_size, unsigned long *new_size,
 extern int cgit_diff_files(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
                           unsigned long *old_size, unsigned long *new_size,

-                          int *binary, linediff_fn fn);
+                          int *binary, int context, linediff_fn fn);

 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,

diff --git a/shared.c b/shared.c
index 6e8f0ce89f5be4c0d53b29a12f200c1c10f7cbc7..7cf1e59a2bdac66900592cc87827332b767eb492 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -262,7 +262,8 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 
 int cgit_diff_files(const unsigned char *old_sha1,
                    const unsigned char *new_sha1, unsigned long *old_size,
 
 int cgit_diff_files(const unsigned char *old_sha1,
                    const unsigned char *new_sha1, unsigned long *old_size,

-                   unsigned long *new_size, int *binary, linediff_fn fn)
+                   unsigned long *new_size, int *binary, int context,
+                   linediff_fn fn)

 {
        mmfile_t file1, file2;
        xpparam_t diff_params;
 {
        mmfile_t file1, file2;
        xpparam_t diff_params;


@@ -285,7 +286,7 @@ int cgit_diff_files(const unsigned char *old_sha1,
        memset(&emit_params, 0, sizeof(emit_params));
        memset(&emit_cb, 0, sizeof(emit_cb));
        diff_params.flags = XDF_NEED_MINIMAL;
        memset(&emit_params, 0, sizeof(emit_params));
        memset(&emit_cb, 0, sizeof(emit_cb));
        diff_params.flags = XDF_NEED_MINIMAL;

-       emit_params.ctxlen = 3;
+       emit_params.ctxlen = context > 0 ? context : 3;

        emit_params.flags = XDL_EMIT_FUNCNAMES;
        emit_cb.outf = filediff_cb;
        emit_cb.priv = fn;
        emit_params.flags = XDL_EMIT_FUNCNAMES;
        emit_cb.outf = filediff_cb;
        emit_cb.priv = fn;

diff --git a/ui-diff.c b/ui-diff.c
index fb836df1342e3475558f5f3c8c9fbb84c99a95be..d3a3b2c8bd04977232baa77004ec2e7015eb51b6 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -127,7 +127,7 @@ static void inspect_filepair(struct diff_filepair *pair)
        lines_added = 0;
        lines_removed = 0;
        cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
        lines_added = 0;
        lines_removed = 0;
        cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,

-                       &binary, count_diff_lines);
+                       &binary, 0, count_diff_lines);

        if (files >= slots) {
                if (slots == 0)
                        slots = 4;
        if (files >= slots) {
                if (slots == 0)
                        slots = 4;


@@ -288,7 +288,7 @@ static void filepair_cb(struct diff_filepair *pair)
                return;
        }
        if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
                return;
        }
        if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,

-                           &new_size, &binary, print_line_fn))
+                           &new_size, &binary, ctx.qry.context, print_line_fn))

                cgit_print_error("Error running diff");
        if (binary) {
                if (use_ssdiff)
                cgit_print_error("Error running diff");
        if (binary) {
                if (use_ssdiff)

diff --git a/ui-log.c b/ui-log.c
index bfbe436099953599f0ef77abd2c76094599fbf89..5eb5c813beedaebf7bb0921f20c892c0556f9628 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -33,7 +33,7 @@ void inspect_files(struct diff_filepair *pair)
        files++;
        if (ctx.repo->enable_log_linecount)
                cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
        files++;
        if (ctx.repo->enable_log_linecount)
                cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,

-                               &new_size, &binary, count_lines);
+                               &new_size, &binary, 0, count_lines);

 }
 
 void show_commit_decorations(struct commit *commit)
 }
 
 void show_commit_decorations(struct commit *commit)

diff --git a/ui-patch.c b/ui-patch.c
index 25dc9fed9913fd396ff4ff6de6979b50bd28a000..d13104cf5fa05b30dc15f0377f7943fa6d3faec5 100644 (file)
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -71,7 +71,7 @@ static void filepair_cb(struct diff_filepair *pair)
                return;
        }
        if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
                return;
        }
        if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,

-                           &new_size, &binary, print_line))
+                           &new_size, &binary, 0, print_line))

                html("Error running diff");
        if (binary)
                html("Binary files differ\n");
                html("Error running diff");
        if (binary)
                html("Binary files differ\n");