ui-diff: Use diff_tree_sha1() for raw diff formatting

[cgit.git] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index c6bad6374b0f1074b6cd7d86ea37c9c857365754..7395c4573966adc23a8fb16fb97f0cad21b7bdee 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "ui-diff.h"

 #include "html.h"
 #include "ui-shared.h"
 #include "ui-ssdiff.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-ssdiff.h"


@@ -166,8 +167,9 @@ static void inspect_filepair(struct diff_filepair *pair)
        total_rems += lines_removed;
 }
 
        total_rems += lines_removed;
 }
 

-void cgit_print_diffstat(const unsigned char *old_sha1,
-                        const unsigned char *new_sha1, const char *prefix)
+static void cgit_print_diffstat(const unsigned char *old_sha1,
+                               const unsigned char *new_sha1,
+                               const char *prefix)

 {
        int i;
 
 {
        int i;
 


@@ -184,7 +186,7 @@ void cgit_print_diffstat(const unsigned char *old_sha1,
        max_changes = 0;
        cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
                       ctx.qry.ignorews);
        max_changes = 0;
        cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
                       ctx.qry.ignorews);

-       for(i = 0; i<files; i++)
+       for (i = 0; i<files; i++)

                print_fileinfo(&items[i]);
        html("</table>");
        html("<div class='diffstat-summary'>");
                print_fileinfo(&items[i]);
        html("</table>");
        html("<div class='diffstat-summary'>");


@@ -229,11 +231,6 @@ static void header(unsigned char *sha1, char *path1, int mode1,
        html(" b/");
        html_txt(path2);
 
        html(" b/");
        html_txt(path2);
 

-       if (is_null_sha1(sha1))
-               path1 = "dev/null";
-       if (is_null_sha1(sha2))
-               path2 = "dev/null";
-

        if (mode1 == 0)
                htmlf("<br/>new file mode %.6o", mode2);
 
        if (mode1 == 0)
                htmlf("<br/>new file mode %.6o", mode2);
 


@@ -251,13 +248,21 @@ static void header(unsigned char *sha1, char *path1, int mode1,
                        if (mode2 != mode1)
                                htmlf("..%.6o", mode2);
                }
                        if (mode2 != mode1)
                                htmlf("..%.6o", mode2);
                }

-               html("<br/>--- a/");
+               if (is_null_sha1(sha1)) {
+                       path1 = "dev/null";
+                       html("<br/>--- /");
+               } else
+                       html("<br/>--- a/");

                if (mode1 != 0)
                        cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
                                       sha1_to_hex(old_rev_sha1), path1);
                else
                        html_txt(path1);
                if (mode1 != 0)
                        cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
                                       sha1_to_hex(old_rev_sha1), path1);
                else
                        html_txt(path1);

-               html("<br/>+++ b/");
+               if (is_null_sha1(sha2)) {
+                       path2 = "dev/null";
+                       html("<br/>+++ /");
+               } else
+                       html("<br/>+++ b/");

                if (mode2 != 0)
                        cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
                                       sha1_to_hex(new_rev_sha1), path2);
                if (mode2 != 0)
                        cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
                                       sha1_to_hex(new_rev_sha1), path2);


@@ -353,44 +358,66 @@ void cgit_print_diff_ctrls()
 }
 
 void cgit_print_diff(const char *new_rev, const char *old_rev,
 }
 
 void cgit_print_diff(const char *new_rev, const char *old_rev,

-                    const char *prefix, int show_ctrls)
+                    const char *prefix, int show_ctrls, int raw)

 {
 {

-       enum object_type type;
-       unsigned long size;

        struct commit *commit, *commit2;
        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;

-       get_sha1(new_rev, new_rev_sha1);
-       type = sha1_object_info(new_rev_sha1, &size);
-       if (type == OBJ_BAD) {
-               cgit_print_error(fmt("Bad object name: %s", new_rev));
+       if (get_sha1(new_rev, new_rev_sha1)) {
+               cgit_print_error("Bad object name: %s", new_rev);

                return;
        }
        commit = lookup_commit_reference(new_rev_sha1);
        if (!commit || parse_commit(commit)) {
                return;
        }
        commit = lookup_commit_reference(new_rev_sha1);
        if (!commit || parse_commit(commit)) {

-               cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
+               cgit_print_error("Bad commit: %s", sha1_to_hex(new_rev_sha1));

                return;
        }
                return;
        }

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

 
 

-       if (old_rev)
-               get_sha1(old_rev, old_rev_sha1);
-       else if (commit->parents && commit->parents->item)
+       if (old_rev) {
+               if (get_sha1(old_rev, old_rev_sha1)) {
+                       cgit_print_error("Bad object name: %s", old_rev);
+                       return;
+               }
+       } else if (commit->parents && commit->parents->item) {

                hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
                hashcpy(old_rev_sha1, commit->parents->item->object.sha1);

-       else
+       } else {

                hashclr(old_rev_sha1);
                hashclr(old_rev_sha1);

+       }

 
        if (!is_null_sha1(old_rev_sha1)) {
 
        if (!is_null_sha1(old_rev_sha1)) {

-               type = sha1_object_info(old_rev_sha1, &size);
-               if (type == OBJ_BAD) {
-                       cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
-                       return;
-               }

                commit2 = lookup_commit_reference(old_rev_sha1);
                if (!commit2 || parse_commit(commit2)) {
                commit2 = lookup_commit_reference(old_rev_sha1);
                if (!commit2 || parse_commit(commit2)) {

-                       cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
+                       cgit_print_error("Bad commit: %s", sha1_to_hex(old_rev_sha1));

                        return;
                }
                        return;
                }

+               old_tree_sha1 = commit2->tree->object.sha1;
+       } else {
+               old_tree_sha1 = NULL;
+       }
+
+       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";
+               cgit_print_http_headers(&ctx);
+               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;

        }
 
        use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
        }
 
        use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;