Allow for creating raw diffs with cgit_print_diff()

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index b7767b3c07a23ea06e3aa3aab103fe3bf765cfe4..838db8c29a42df4e6355a3cd62d404fd4e5efeec 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"


@@ -97,10 +98,12 @@ 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,
                       ctx.qry.sha2, info->new_path, 0);
        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);

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

        html("</td><td class='right'>");
        if (info->binary) {
                htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
        html("</td><td class='right'>");
        if (info->binary) {
                htmlf("bin</td><td class='graph'>%ld -> %ld bytes",


@@ -164,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;
 


@@ -182,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'>");


@@ -227,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);
 


@@ -249,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);


@@ -339,9 +346,7 @@ void cgit_print_diff_ctrls()
        html("<td class='label'>mode:</td>");
        html("<td class='ctrl'>");
        html("<select name='ss' onchange='this.form.submit();'>");
        html("<td class='label'>mode:</td>");
        html("<td class='ctrl'>");
        html("<select name='ss' onchange='this.form.submit();'>");

-       curr = ctx.qry.ssdiff;
-       if (!curr && ctx.cfg.ssdiff)
-               curr = 1;
+       curr = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;

        html_intoption(0, "unified", curr);
        html_intoption(1, "ssdiff", curr);
        html("</select></td></tr>");
        html_intoption(0, "unified", curr);
        html_intoption(1, "ssdiff", curr);
        html("</select></td></tr>");


@@ -353,7 +358,7 @@ 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;
 {
        enum object_type type;
        unsigned long size;


@@ -364,12 +369,14 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
        get_sha1(new_rev, new_rev_sha1);
        type = sha1_object_info(new_rev_sha1, &size);
        if (type == OBJ_BAD) {
        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));
+               cgit_print_error("Bad object name: %s", new_rev);

                return;
        }
        commit = lookup_commit_reference(new_rev_sha1);
                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)));
+       if (!commit || parse_commit(commit)) {
+               cgit_print_error("Bad commit: %s", sha1_to_hex(new_rev_sha1));
+               return;
+       }

 
        if (old_rev)
                get_sha1(old_rev, old_rev_sha1);
 
        if (old_rev)
                get_sha1(old_rev, old_rev_sha1);


@@ -381,16 +388,25 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
        if (!is_null_sha1(old_rev_sha1)) {
                type = sha1_object_info(old_rev_sha1, &size);
                if (type == OBJ_BAD) {
        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)));
+                       cgit_print_error("Bad object name: %s", sha1_to_hex(old_rev_sha1));

                        return;
                }
                commit2 = lookup_commit_reference(old_rev_sha1);
                        return;
                }
                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)));
+               if (!commit2 || parse_commit(commit2)) {
+                       cgit_print_error("Bad commit: %s", sha1_to_hex(old_rev_sha1));
+                       return;
+               }
+       }
+
+       if (raw) {
+               ctx.page.mimetype = "text/plain";
+               cgit_print_http_headers(&ctx);
+               cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb_raw,
+                              prefix, 0);
+               return;

        }
 
        }
 

-       if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
-               use_ssdiff = 1;
+       use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;

 
        if (show_ctrls)
                cgit_print_diff_ctrls();
 
        if (show_ctrls)
                cgit_print_diff_ctrls();