Merge branch 'jh/context-lines'

Conflicts:
	cgit.c
	cgit.h

diff --git a/cgit.c b/cgit.c
index d4fcfa70b18952e72bf4bde7b1050cc148db5188..ab25b6a00efe4889863b7625c22e9ea180d0fe61 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -258,6 +258,8 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.ssdiff = atoi(value);
        } else if (!strcmp(name, "all")) {
                ctx.qry.show_all = atoi(value);
+       } else if (!strcmp(name, "context")) {
+               ctx.qry.context = atoi(value);
        }
 }
 

diff --git a/cgit.h b/cgit.h
index 80c3902b5e5dec8e16b6b2bbaf60207ada344854..2b28d636e20ba1f79c398a83f9383d43cba9e2e0 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -147,6 +147,7 @@ struct cgit_query {
        int showmsg;
        int ssdiff;
        int show_all;
+       int context;
        char *vpath;
 };
 
@@ -278,7 +279,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,
-                          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,

diff --git a/shared.c b/shared.c
index 58837dc76ec4830d9bf82c6b613c1f7d6899a7e4..06f70bb141587c25565664ef42cbdd9b1addec09 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -263,7 +263,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,
-                   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;
@@ -290,7 +291,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;
-       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;

diff --git a/ui-diff.c b/ui-diff.c
index fb836df1342e3475558f5f3c8c9fbb84c99a95be..e0a72f757e79eb904e1fdf512fc876518f04d2df 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,
-                       &binary, count_diff_lines);
+                       &binary, 0, count_diff_lines);
        if (files >= slots) {
                if (slots == 0)
                        slots = 4;
@@ -156,13 +156,21 @@ static void inspect_filepair(struct diff_filepair *pair)
 void cgit_print_diffstat(const unsigned char *old_sha1,
                         const unsigned char *new_sha1, const char *prefix)
 {
-       int i;
+       int i, save_context = ctx.qry.context;
 
        html("<div class='diffstat-header'>");
        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                       ctx.qry.sha2, NULL, 0);
        if (prefix)
                htmlf(" (limited to '%s')", prefix);
+       html(" (");
+       ctx.qry.context = (save_context > 0 ? save_context : 3) << 1;
+       cgit_self_link("more", NULL, NULL, &ctx);
+       html("/");
+       ctx.qry.context = (save_context > 3 ? save_context : 3) >> 1;
+       cgit_self_link("less", NULL, NULL, &ctx);
+       ctx.qry.context = save_context;
+       html(" context)");
        html("</div>");
        html("<table summary='diffstat' class='diffstat'>");
        max_changes = 0;
@@ -288,7 +296,7 @@ static void filepair_cb(struct diff_filepair *pair)
                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)

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,
-                               &new_size, &binary, count_lines);
+                               &new_size, &binary, 0, count_lines);
 }
 
 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,
-                           &new_size, &binary, print_line))
+                           &new_size, &binary, 0, print_line))
                html("Error running diff");
        if (binary)
                html("Binary files differ\n");

diff --git a/ui-shared.c b/ui-shared.c
index e9917993fb2d4181bf3adb6ff4c01dea0cb52f26..c99bcecdf7905fa373d8839d83e3935d9c30faeb 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -341,6 +341,13 @@ void cgit_commit_link(char *name, const char *title, const char *class,
        if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
                html(delim);
                html("ss=1");
+               delim = "&";
+       }
+       if (ctx.qry.context > 0 && ctx.qry.context != 3) {
+               html(delim);
+               html("context=");
+               htmlf("%d", ctx.qry.context);
+               delim = "&";
        }
        html("'>");
        html_txt(name);
@@ -382,6 +389,13 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
        if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
                html(delim);
                html("ss=1");
+               delim = "&";
+       }
+       if (ctx.qry.context > 0 && ctx.qry.context != 3) {
+               html(delim);
+               html("context=");
+               htmlf("%d", ctx.qry.context);
+               delim = "&";
        }
        html("'>");
        html_txt(name);