css: use less blurry icon for external link

[ps-cgit] / ui-diff.c

diff --git a/ui-diff.c b/ui-diff.c
index b7767b3c07a23ea06e3aa3aab103fe3bf765cfe4..52ed9426747088c21cd0de74b0f8efe58aceb073 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -1,12 +1,13 @@
 /* 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)
  */
 
 #include "cgit.h"
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #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"


@@ -30,11 +31,12 @@ static struct fileinfo {
        unsigned int removed;
        unsigned long old_size;
        unsigned long new_size;
        unsigned int removed;
        unsigned long old_size;
        unsigned long new_size;

-       int binary:1;
+       unsigned int binary:1;

 } *items;
 
 static int use_ssdiff = 0;
 static struct diff_filepair *current_filepair;
 } *items;
 
 static int use_ssdiff = 0;
 static struct diff_filepair *current_filepair;

+static const char *current_prefix;

 
 struct diff_filespec *cgit_get_current_old_file(void)
 {
 
 struct diff_filespec *cgit_get_current_old_file(void)
 {


@@ -96,11 +98,13 @@ 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);
-       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);
+                      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");
+               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",


@@ -129,11 +133,30 @@ static void count_diff_lines(char *line, int len)
        }
 }
 
        }
 }
 

+static int show_filepair(struct diff_filepair *pair)
+{
+       /* Always show if we have no limiting prefix. */
+       if (!current_prefix)
+               return 1;
+
+       /* Show if either path in the pair begins with the prefix. */
+       if (starts_with(pair->one->path, current_prefix) ||
+           starts_with(pair->two->path, current_prefix))
+               return 1;
+
+       /* Otherwise we don't want to show this filepair. */
+       return 0;
+}
+

 static void inspect_filepair(struct diff_filepair *pair)
 {
        int binary = 0;
        unsigned long old_size = 0;
        unsigned long new_size = 0;
 static void inspect_filepair(struct diff_filepair *pair)
 {
        int binary = 0;
        unsigned long old_size = 0;
        unsigned long new_size = 0;

+
+       if (!show_filepair(pair))
+               return;
+

        files++;
        lines_added = 0;
        lines_removed = 0;
        files++;
        lines_added = 0;
        lines_removed = 0;


@@ -164,14 +187,15 @@ 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;
 
        html("<div class='diffstat-header'>");
        cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
 {
        int i;
 
        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);


@@ -182,7 +206,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 +251,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 +268,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);


@@ -272,6 +299,9 @@ static void filepair_cb(struct diff_filepair *pair)
        int binary = 0;
        linediff_fn print_line_fn = print_line;
 
        int binary = 0;
        linediff_fn print_line_fn = print_line;
 

+       if (!show_filepair(pair))
+               return;
+

        current_filepair = pair;
        if (use_ssdiff) {
                cgit_ssdiff_header_begin();
        current_filepair = pair;
        if (use_ssdiff) {
                cgit_ssdiff_header_begin();


@@ -304,7 +334,7 @@ static void filepair_cb(struct diff_filepair *pair)
                cgit_ssdiff_footer();
 }
 
                cgit_ssdiff_footer();
 }
 

-void cgit_print_diff_ctrls()
+void cgit_print_diff_ctrls(void)

 {
        int i, curr;
 
 {
        int i, curr;
 


@@ -338,12 +368,11 @@ void cgit_print_diff_ctrls()
        html("</tr><tr>");
        html("<td class='label'>mode:</td>");
        html("<td class='ctrl'>");
        html("</tr><tr>");
        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;
+       html("<select name='dt' onchange='this.form.submit();'>");
+       curr = ctx.qry.has_difftype ? ctx.qry.difftype : ctx.cfg.difftype;

        html_intoption(0, "unified", curr);
        html_intoption(1, "ssdiff", curr);
        html_intoption(0, "unified", curr);
        html_intoption(1, "ssdiff", curr);

+       html_intoption(2, "stat only", curr);

        html("</select></td></tr>");
        html("<tr><td/><td class='ctrl'>");
        html("<noscript><input type='submit' value='reload'/></noscript>");
        html("</select></td></tr>");
        html("<tr><td/><td class='ctrl'>");
        html("<noscript><input type='submit' value='reload'/></noscript>");


@@ -353,50 +382,108 @@ 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;
+       diff_type difftype;
+
+       /*
+        * If "follow" is set then the diff machinery needs to examine the
+        * entire commit to detect renames so we must limit the paths in our
+        * own callbacks and not pass the prefix to the diff machinery.
+        */
+       if (ctx.qry.follow && ctx.cfg.enable_follow_links) {
+               current_prefix = prefix;
+               prefix = "";
+       } else {
+               current_prefix = NULL;
+       }

 
        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_page(404, "Not found",
+                       "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 (old_rev)
-               get_sha1(old_rev, old_rev_sha1);
-       else if (commit->parents && commit->parents->item)
-               hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
-       else
+       if (!commit || parse_commit(commit)) {
+               cgit_print_error_page(404, "Not found",
+                       "Bad commit: %s", sha1_to_hex(new_rev_sha1));
+               return;
+       }
+       new_tree_sha1 = commit->tree->object.oid.hash;
+
+       if (old_rev) {
+               if (get_sha1(old_rev, old_rev_sha1)) {
+                       cgit_print_error_page(404, "Not found",
+                               "Bad object name: %s", old_rev);
+                       return;
+               }
+       } else if (commit->parents && commit->parents->item) {
+               hashcpy(old_rev_sha1, commit->parents->item->object.oid.hash);
+       } 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)));
+               commit2 = lookup_commit_reference(old_rev_sha1);
+               if (!commit2 || parse_commit(commit2)) {
+                       cgit_print_error_page(404, "Not found",
+                               "Bad commit: %s", sha1_to_hex(old_rev_sha1));

                        return;
                }
                        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)));
+               old_tree_sha1 = commit2->tree->object.oid.hash;
+       } else {
+               old_tree_sha1 = NULL;

        }
 
        }
 

-       if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
-               use_ssdiff = 1;
+       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();
+               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);

 
 

-       if (show_ctrls)
+               return;
+       }
+
+       difftype = ctx.qry.has_difftype ? ctx.qry.difftype : ctx.cfg.difftype;
+       use_ssdiff = difftype == DIFF_SSDIFF;
+
+       if (show_ctrls) {
+               cgit_print_layout_start();

                cgit_print_diff_ctrls();
                cgit_print_diff_ctrls();

+       }
+
+       /*
+        * Clicking on a link to a file in the diff stat should show a diff
+        * of the file, showing the diff stat limited to a single file is
+        * pretty useless.  All links from this point on will be to
+        * individual files, so we simply reset the difftype in the query
+        * here to avoid propagating DIFF_STATONLY to the individual files.
+        */
+       if (difftype == DIFF_STATONLY)
+               ctx.qry.difftype = ctx.cfg.difftype;

 
        cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
 
 
        cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
 

+       if (difftype == DIFF_STATONLY)
+               return;
+

        if (use_ssdiff) {
                html("<table summary='ssdiff' class='ssdiff'>");
        } else {
        if (use_ssdiff) {
                html("<table summary='ssdiff' class='ssdiff'>");
        } else {


@@ -408,4 +495,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
        if (!use_ssdiff)
                html("</td></tr>");
        html("</table>");
        if (!use_ssdiff)
                html("</td></tr>");
        html("</table>");

+
+       if (show_ctrls)
+               cgit_print_layout_end();

 }
 }