ui-shared: remove toggle_ssdiff arg to cgit_diff_link()

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index 1209c47c6c0b45f599dd98813dfab3282992a0a7..49bd7480c573df06c41abb9d305d1ae8ac3e459c 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -1,6 +1,6 @@
 /* ui-diff.c: show diff between two blobs
  *
 /* ui-diff.c: show diff between two blobs
  *

- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)


@@ -97,7 +97,7 @@ static void print_fileinfo(struct fileinfo *info)
        }
        htmlf("</td><td class='%s'>", class);
        cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
        }
        htmlf("</td><td class='%s'>", class);
        cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,

-                      ctx.qry.sha2, info->new_path, 0);
+                      ctx.qry.sha2, info->new_path);

        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
                htmlf(" (%s from ",
                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
                htmlf(" (%s from ",
                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");


@@ -175,7 +175,7 @@ static void cgit_print_diffstat(const unsigned char *old_sha1,
 
        html("<div class='diffstat-header'>");
        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
 
        html("<div class='diffstat-header'>");
        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,

-                      ctx.qry.sha2, NULL, 0);
+                      ctx.qry.sha2, NULL);

        if (prefix) {
                html(" (limited to '");
                html_txt(prefix);
        if (prefix) {
                html(" (limited to '");
                html_txt(prefix);


@@ -361,6 +361,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                     const char *prefix, int show_ctrls, int raw)
 {
        struct commit *commit, *commit2;
                     const char *prefix, int show_ctrls, int raw)
 {
        struct commit *commit, *commit2;

+       const unsigned char *old_tree_sha1, *new_tree_sha1;

 
        if (!new_rev)
                new_rev = ctx.qry.head;
 
        if (!new_rev)
                new_rev = ctx.qry.head;


@@ -373,6 +374,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                cgit_print_error("Bad commit: %s", sha1_to_hex(new_rev_sha1));
                return;
        }
                cgit_print_error("Bad commit: %s", sha1_to_hex(new_rev_sha1));
                return;
        }

+       new_tree_sha1 = commit->tree->object.sha1;

 
        if (old_rev) {
                if (get_sha1(old_rev, old_rev_sha1)) {
 
        if (old_rev) {
                if (get_sha1(old_rev, old_rev_sha1)) {


@@ -391,13 +393,30 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
                        cgit_print_error("Bad commit: %s", sha1_to_hex(old_rev_sha1));
                        return;
                }
                        cgit_print_error("Bad commit: %s", sha1_to_hex(old_rev_sha1));
                        return;
                }

+               old_tree_sha1 = commit2->tree->object.sha1;
+       } else {
+               old_tree_sha1 = NULL;

        }
 
        if (raw) {
        }
 
        if (raw) {

+               struct diff_options diffopt;
+
+               diff_setup(&diffopt);
+               diffopt.output_format = DIFF_FORMAT_PATCH;
+               DIFF_OPT_SET(&diffopt, RECURSIVE);
+               diff_setup_done(&diffopt);
+

                ctx.page.mimetype = "text/plain";
                ctx.page.mimetype = "text/plain";

-               cgit_print_http_headers(&ctx);
-               cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb_raw,
-                              prefix, 0);
+               cgit_print_http_headers();
+               if (old_tree_sha1) {
+                       diff_tree_sha1(old_tree_sha1, new_tree_sha1, "",
+                                      &diffopt);
+               } else {
+                       diff_root_tree_sha1(new_tree_sha1, "", &diffopt);
+               }
+               diffcore_std(&diffopt);
+               diff_flush(&diffopt);
+

                return;
        }
 
                return;
        }