Add possibility to switch between unidiff and side-by-side-diff.

A new config option side-by-side-diffs added, defaulting to 0,
meaning unidiff. Also a query option (ss) is used toggle this.

In the commit page you can switch between the two diff formats by
clicking on the link on the "commit"-row, to the right of (patch).

In the diff page you can switch by using the link at the start
of the page.

All commit-links and diff-links will remember the choice.

Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

9 files changed, 73 insertions, 16 deletions

diff --git a/cgit.c b/cgit.c
index bd37788..ff678fb 100644
--- a/cgit.c
+++ b/cgit.c
@@ -184,2 +184,4 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.summary_tags = atoi(value);
+        else if (!strcmp(name, "side-by-side-diffs"))
+                ctx.cfg.ssdiff = atoi(value);
         else if (!strcmp(name, "agefile"))
@@ -240,2 +242,4 @@ 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);
         }
@@ -281,2 +285,3 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.summary_tags = 10;
+        ctx->cfg.ssdiff = 0;
         ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
diff --git a/cgit.h b/cgit.h
index 6c6c460..b7b0adb 100644
--- a/cgit.h
+++ b/cgit.h
@@ -145,2 +145,3 @@ struct cgit_query {
         int showmsg;
+        int ssdiff;
 };
@@ -196,2 +197,3 @@ struct cgit_config {
         int summary_tags;
+        int ssdiff;
         struct string_list mimetypes;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 4dc383d..252d546 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -240,2 +240,6 @@ section::
 
+side-by-side-diffs::
+        If set to "1" shows side-by-side diffs instead of unidiffs per
+        default. Default value: "0".
+
 snapshots::
diff --git a/ui-commit.c b/ui-commit.c
index f5b0ae5..b5e3c01 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -60,5 +60,10 @@ void cgit_print_commit(char *hex)
         tmp = sha1_to_hex(commit->object.sha1);
-        cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp);
+        cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0);
         html(" (");
         cgit_patch_link("patch", NULL, NULL, NULL, tmp);
+        html(") (");
+        if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
+                cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1);
+        else
+                cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1);
         html(")</td></tr>\n");
@@ -80,6 +85,6 @@ void cgit_print_commit(char *hex)
                 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
-                                 ctx.qry.head, sha1_to_hex(p->item->object.sha1));
+                                 ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0);
                 html(" (");
                 cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
-                               sha1_to_hex(p->item->object.sha1), NULL);
+                               sha1_to_hex(p->item->object.sha1), NULL, 0);
                 html(")</td></tr>");
diff --git a/ui-diff.c b/ui-diff.c
index 0c6f8d7..42e81ac 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -87,3 +87,3 @@ static void print_fileinfo(struct fileinfo *info)
         cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-                       ctx.qry.sha2, info->new_path);
+                       ctx.qry.sha2, info->new_path, 0);
         if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
@@ -162,3 +162,3 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
         cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-                       ctx.qry.sha2, NULL);
+                       ctx.qry.sha2, NULL, 0);
         html("</div>");
@@ -252,2 +252,15 @@ static void header(unsigned char *sha1, char *path1, int mode1,
 
+static void print_ssdiff_link()
+{
+        if (!strcmp(ctx.qry.page, "diff")) {
+                if (use_ssdiff)
+                        cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
+                                       ctx.qry.sha1, ctx.qry.sha2, NULL, 1);
+                else
+                        cgit_diff_link("Side-by-side diff", NULL, NULL,
+                                       ctx.qry.head, ctx.qry.sha1,
+                                       ctx.qry.sha2, NULL, 1);
+        }
+}
+
 static void filepair_cb(struct diff_filepair *pair)
@@ -316,2 +329,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
         }
+
+        if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
+                use_ssdiff = 1;
+
+        print_ssdiff_link();
         cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
diff --git a/ui-log.c b/ui-log.c
index f3132c9..0947604 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -68,3 +68,3 @@ void show_commit_decorations(struct commit *commit)
                         cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
-                                sha1_to_hex(commit->object.sha1));
+                                sha1_to_hex(commit->object.sha1), 0);
                 }
@@ -91,3 +91,3 @@ void print_commit(struct commit *commit)
         cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
-                         sha1_to_hex(commit->object.sha1));
+                         sha1_to_hex(commit->object.sha1), 0);
         show_commit_decorations(commit);
diff --git a/ui-refs.c b/ui-refs.c
index d3b4f6e..33d9bec 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -76,3 +76,3 @@ static int print_branch(struct refinfo *ref)
         if (ref->object->type == OBJ_COMMIT) {
-                cgit_commit_link(info->subject, NULL, NULL, name, NULL);
+                cgit_commit_link(info->subject, NULL, NULL, name, NULL, 0);
                 html("</td><td>");
diff --git a/ui-shared.c b/ui-shared.c
index 07d5dd4..de55eff 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -319,3 +319,3 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 void cgit_commit_link(char *name, char *title, char *class, char *head,
-                      char *rev)
+                      char *rev, int toggle_ssdiff)
 {
@@ -327,3 +327,19 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
         }
-        reporevlink("commit", name, title, class, head, rev, NULL);
+
+        char *delim;
+
+        delim = repolink(title, class, "commit", head, NULL);
+        if (rev && strcmp(rev, ctx.qry.head)) {
+                html(delim);
+                html("id=");
+                html_url_arg(rev);
+                delim = "&amp;";
+        }
+        if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+                html(delim);
+                html("ss=1");
+        }
+        html("'>");
+        html_txt(name);
+        html("</a>");
 }
@@ -343,3 +359,4 @@ void cgit_snapshot_link(char *name, char *title, char *class, char *head,
 void cgit_diff_link(char *name, char *title, char *class, char *head,
-                    char *new_rev, char *old_rev, char *path)
+                    char *new_rev, char *old_rev, char *path,
+                    int toggle_ssdiff)
 {
@@ -358,2 +375,7 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
                 html_url_arg(old_rev);
+                delim = "&amp;";
+        }
+        if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+                html(delim);
+                html("ss=1");
         }
@@ -385,3 +407,3 @@ void cgit_object_link(struct object *obj)
                 cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
-                                 ctx.qry.head, fullrev);
+                                 ctx.qry.head, fullrev, 0);
                 return;
@@ -697,5 +719,5 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                 cgit_commit_link("commit", NULL, hc(cmd, "commit"),
-                                 ctx->qry.head, ctx->qry.sha1);
+                                 ctx->qry.head, ctx->qry.sha1, 0);
                 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
-                               ctx->qry.sha1, ctx->qry.sha2, NULL);
+                               ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
                 if (ctx->repo->max_stats)
diff --git a/ui-shared.h b/ui-shared.h
index bff4826..166246d 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -24,3 +24,3 @@ extern void cgit_log_link(char *name, char *title, char *class, char *head,
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
-                             char *rev);
+                             char *rev, int toggle_ssdiff);
 extern void cgit_patch_link(char *name, char *title, char *class, char *head,
@@ -32,3 +32,4 @@ extern void cgit_snapshot_link(char *name, char *title, char *class,
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
-                           char *new_rev, char *old_rev, char *path);
+                           char *new_rev, char *old_rev, char *path,
+                           int toggle_ssdiff);
 extern void cgit_stats_link(char *name, char *title, char *class, char *head,