summaryrefslogtreecommitdiffabout
path: root/ui-patch.c
Unidiff
Diffstat (limited to 'ui-patch.c') (more/less context) (show whitespace changes)
-rw-r--r--ui-patch.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/ui-patch.c b/ui-patch.c
index 7ee2c41..c1c4ce3 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -1,21 +1,23 @@
1/* ui-patch.c: generate patch view 1/* ui-patch.c: generate patch view
2 * 2 *
3 * Copyright (C) 2007 Lars Hjemli 3 * Copyright (C) 2007 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h"
11#include "ui-shared.h"
10 12
11static void print_line(char *line, int len) 13static void print_line(char *line, int len)
12{ 14{
13 char c = line[len-1]; 15 char c = line[len-1];
14 16
15 line[len-1] = '\0'; 17 line[len-1] = '\0';
16 htmlf("%s\n", line); 18 htmlf("%s\n", line);
17 line[len-1] = c; 19 line[len-1] = c;
18} 20}
19 21
20static void header(unsigned char *sha1, char *path1, int mode1, 22static void header(unsigned char *sha1, char *path1, int mode1,
21 unsigned char *sha2, char *path2, int mode2) 23 unsigned char *sha2, char *path2, int mode2)
@@ -59,52 +61,54 @@ static void filepair_cb(struct diff_filepair *pair)
59 pair->two->sha1, pair->two->path, pair->two->mode); 61 pair->two->sha1, pair->two->path, pair->two->mode);
60 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { 62 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
61 if (S_ISGITLINK(pair->one->mode)) 63 if (S_ISGITLINK(pair->one->mode))
62 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); 64 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
63 if (S_ISGITLINK(pair->two->mode)) 65 if (S_ISGITLINK(pair->two->mode))
64 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); 66 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
65 return; 67 return;
66 } 68 }
67 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 69 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
68 html("Error running diff"); 70 html("Error running diff");
69} 71}
70 72
71void cgit_print_patch(char *hex, struct cacheitem *item) 73void cgit_print_patch(char *hex)
72{ 74{
73 struct commit *commit; 75 struct commit *commit;
74 struct commitinfo *info; 76 struct commitinfo *info;
75 unsigned char sha1[20], old_sha1[20]; 77 unsigned char sha1[20], old_sha1[20];
76 char *patchname; 78 char *patchname;
77 79
78 if (!hex) 80 if (!hex)
79 hex = cgit_query_head; 81 hex = ctx.qry.head;
80 82
81 if (get_sha1(hex, sha1)) { 83 if (get_sha1(hex, sha1)) {
82 cgit_print_error(fmt("Bad object id: %s", hex)); 84 cgit_print_error(fmt("Bad object id: %s", hex));
83 return; 85 return;
84 } 86 }
85 commit = lookup_commit_reference(sha1); 87 commit = lookup_commit_reference(sha1);
86 if (!commit) { 88 if (!commit) {
87 cgit_print_error(fmt("Bad commit reference: %s", hex)); 89 cgit_print_error(fmt("Bad commit reference: %s", hex));
88 return; 90 return;
89 } 91 }
90 info = cgit_parse_commit(commit); 92 info = cgit_parse_commit(commit);
91 93
92 if (commit->parents && commit->parents->item) 94 if (commit->parents && commit->parents->item)
93 hashcpy(old_sha1, commit->parents->item->object.sha1); 95 hashcpy(old_sha1, commit->parents->item->object.sha1);
94 else 96 else
95 hashclr(old_sha1); 97 hashclr(old_sha1);
96 98
97 patchname = fmt("%s.patch", sha1_to_hex(sha1)); 99 patchname = fmt("%s.patch", sha1_to_hex(sha1));
98 cgit_print_snapshot_start("text/plain", patchname, item); 100 ctx.page.mimetype = "text/plain";
101 ctx.page.filename = patchname;
102 cgit_print_http_headers(&ctx);
99 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); 103 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
100 htmlf("From: %s%s\n", info->author, info->author_email); 104 htmlf("From: %s%s\n", info->author, info->author_email);
101 html("Date: "); 105 html("Date: ");
102 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); 106 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n");
103 htmlf("Subject: %s\n\n", info->subject); 107 htmlf("Subject: %s\n\n", info->subject);
104 if (info->msg && *info->msg) { 108 if (info->msg && *info->msg) {
105 htmlf("%s", info->msg); 109 htmlf("%s", info->msg);
106 if (info->msg[strlen(info->msg) - 1] != '\n') 110 if (info->msg[strlen(info->msg) - 1] != '\n')
107 html("\n"); 111 html("\n");
108 } 112 }
109 html("---\n"); 113 html("---\n");
110 cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); 114 cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);