Extract filepair_cb from ui-patch.c

[ps-cgit] / ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index 36bfae4836df393cd1c24c94b58e15702e2bc134..3922a4411772dcf3934e1b67d9b8aff0de839383 100644 (file)
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -7,70 +7,11 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "ui-patch.h"

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

-static void print_line(char *line, int len)
-{
-       char c = line[len-1];
-
-       line[len-1] = '\0';
-       htmlf("%s\n", line);
-       line[len-1] = c;
-}
-
-static void header(unsigned char *sha1, char *path1, int mode1,
-                  unsigned char *sha2, char *path2, int mode2)
-{
-       char *abbrev1, *abbrev2;
-       int subproject;
-
-       subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
-       htmlf("diff --git a/%s b/%s\n", path1, path2);
-
-       if (is_null_sha1(sha1))
-               path1 = "dev/null";
-       if (is_null_sha1(sha2))
-               path2 = "dev/null";
-
-       if (mode1 == 0)
-               htmlf("new file mode %.6o\n", mode2);
-
-       if (mode2 == 0)
-               htmlf("deleted file mode %.6o\n", mode1);
-
-       if (!subproject) {
-               abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
-               abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
-               htmlf("index %s..%s", abbrev1, abbrev2);
-               free(abbrev1);
-               free(abbrev2);
-               if (mode1 != 0 && mode2 != 0) {
-                       htmlf(" %.6o", mode1);
-                       if (mode2 != mode1)
-                               htmlf("..%.6o", mode2);
-               }
-               htmlf("\n--- a/%s\n", path1);
-               htmlf("+++ b/%s\n", path2);
-       }
-}
-
-static void filepair_cb(struct diff_filepair *pair)
-{
-       header(pair->one->sha1, pair->one->path, pair->one->mode,
-              pair->two->sha1, pair->two->path, pair->two->mode);
-       if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
-               if (S_ISGITLINK(pair->one->mode))
-                       print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
-               if (S_ISGITLINK(pair->two->mode))
-                       print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
-               return;
-       }
-       if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
-               html("Error running diff");
-}
-
-void cgit_print_patch(char *hex)
+void cgit_print_patch(char *hex, const char *prefix)

 {
        struct commit *commit;
        struct commitinfo *info;
 {
        struct commit *commit;
        struct commitinfo *info;


@@ -81,25 +22,33 @@ void cgit_print_patch(char *hex)
                hex = ctx.qry.head;
 
        if (get_sha1(hex, sha1)) {
                hex = ctx.qry.head;
 
        if (get_sha1(hex, sha1)) {

-               cgit_print_error(fmt("Bad object id: %s", hex));
+               cgit_print_error("Bad object id: %s", hex);

                return;
        }
        commit = lookup_commit_reference(sha1);
        if (!commit) {
                return;
        }
        commit = lookup_commit_reference(sha1);
        if (!commit) {

-               cgit_print_error(fmt("Bad commit reference: %s", hex));
+               cgit_print_error("Bad commit reference: %s", hex);

                return;
        }
        info = cgit_parse_commit(commit);
                return;
        }
        info = cgit_parse_commit(commit);

-       hashcpy(old_sha1, commit->parents->item->object.sha1);
+
+       if (commit->parents && commit->parents->item)
+               hashcpy(old_sha1, commit->parents->item->object.sha1);
+       else
+               hashclr(old_sha1);

 
        patchname = fmt("%s.patch", sha1_to_hex(sha1));
        ctx.page.mimetype = "text/plain";
        ctx.page.filename = patchname;
        cgit_print_http_headers(&ctx);
        htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
 
        patchname = fmt("%s.patch", sha1_to_hex(sha1));
        ctx.page.mimetype = "text/plain";
        ctx.page.filename = patchname;
        cgit_print_http_headers(&ctx);
        htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));

-       htmlf("From: %s%s\n", info->author, info->author_email);
+       htmlf("From: %s", info->author);
+       if (!ctx.cfg.noplainemail) {
+               htmlf(" %s", info->author_email);
+       }
+       html("\n");

        html("Date: ");
        html("Date: ");

-       cgit_print_date(info->author_date, "%a, %d  %b  %Y  %H:%M:%S  %z%n");
+       cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time);

        htmlf("Subject: %s\n\n", info->subject);
        if (info->msg && *info->msg) {
                htmlf("%s", info->msg);
        htmlf("Subject: %s\n\n", info->subject);
        if (info->msg && *info->msg) {
                htmlf("%s", info->msg);


@@ -107,8 +56,10 @@ void cgit_print_patch(char *hex)
                        html("\n");
        }
        html("---\n");
                        html("\n");
        }
        html("---\n");

-       cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
+       if (prefix)
+               htmlf("(limited to '%s')\n\n", prefix);
+       cgit_diff_tree(old_sha1, sha1, filepair_cb_raw, prefix, 0);

        html("--\n");
        html("--\n");

-       htmlf("cgit %s\n", CGIT_VERSION);
+       htmlf("cgit %s\n", cgit_version);

        cgit_free_commitinfo(info);
 }
        cgit_free_commitinfo(info);
 }