Merge branch 'stable'

[cgit.git] / ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index ef79c7cef02933107bd7e249c3e2b8d7de33fdaf..ca008f360c4e73d0af3f15980379409845c86ab6 100644 (file)
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -7,6 +7,8 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

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

 
 static void print_line(char *line, int len)
 {
 
 static void print_line(char *line, int len)
 {


@@ -55,6 +57,10 @@ static void header(unsigned char *sha1, char *path1, int mode1,
 
 static void filepair_cb(struct diff_filepair *pair)
 {
 
 static void filepair_cb(struct diff_filepair *pair)
 {

+       unsigned long old_size = 0;
+       unsigned long new_size = 0;
+       int binary = 0;
+

        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)) {
        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)) {


@@ -64,11 +70,14 @@ static void filepair_cb(struct diff_filepair *pair)
                        print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
                return;
        }
                        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))
+       if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
+                           &new_size, &binary, 0, 0, print_line))

                html("Error running diff");
                html("Error running diff");

+       if (binary)
+               html("Binary files differ\n");

 }
 
 }
 

-void cgit_print_patch(char *hex, struct cacheitem *item)
+void cgit_print_patch(char *hex, const char *prefix)

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


@@ -76,7 +85,7 @@ void cgit_print_patch(char *hex, struct cacheitem *item)
        char *patchname;
 
        if (!hex)
        char *patchname;
 
        if (!hex)

-               hex = cgit_query_head;
+               hex = ctx.qry.head;

 
        if (get_sha1(hex, sha1)) {
                cgit_print_error(fmt("Bad object id: %s", hex));
 
        if (get_sha1(hex, sha1)) {
                cgit_print_error(fmt("Bad object id: %s", hex));


@@ -88,17 +97,34 @@ void cgit_print_patch(char *hex, struct cacheitem *item)
                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));
 
        patchname = fmt("%s.patch", sha1_to_hex(sha1));

-       cgit_print_snapshot_start("text/plain", patchname, item);
+       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 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");
-       htmlf("Subject: %s\n\n%s", info->subject, info->msg);
+       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);
+               if (info->msg[strlen(info->msg) - 1] != '\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, prefix, 0);

        html("--\n");
        htmlf("cgit %s\n", CGIT_VERSION);
        cgit_free_commitinfo(info);
        html("--\n");
        htmlf("cgit %s\n", CGIT_VERSION);
        cgit_free_commitinfo(info);