summaryrefslogtreecommitdiffabout
path: root/ui-patch.c
Unidiff
Diffstat (limited to 'ui-patch.c') (more/less context) (show whitespace changes)
-rw-r--r--ui-patch.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui-patch.c b/ui-patch.c
index d93426b..a77f3f6 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -47,65 +47,67 @@ static void header(unsigned char *sha1, char *path1, int mode1,
47 if (mode1 != 0 && mode2 != 0) { 47 if (mode1 != 0 && mode2 != 0) {
48 htmlf(" %.6o", mode1); 48 htmlf(" %.6o", mode1);
49 if (mode2 != mode1) 49 if (mode2 != mode1)
50 htmlf("..%.6o", mode2); 50 htmlf("..%.6o", mode2);
51 } 51 }
52 htmlf("\n--- a/%s\n", path1); 52 htmlf("\n--- a/%s\n", path1);
53 htmlf("+++ b/%s\n", path2); 53 htmlf("+++ b/%s\n", path2);
54 } 54 }
55} 55}
56 56
57static void filepair_cb(struct diff_filepair *pair) 57static void filepair_cb(struct diff_filepair *pair)
58{ 58{
59 header(pair->one->sha1, pair->one->path, pair->one->mode, 59 header(pair->one->sha1, pair->one->path, pair->one->mode,
60 pair->two->sha1, pair->two->path, pair->two->mode); 60 pair->two->sha1, pair->two->path, pair->two->mode);
61 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { 61 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
62 if (S_ISGITLINK(pair->one->mode)) 62 if (S_ISGITLINK(pair->one->mode))
63 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); 63 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
64 if (S_ISGITLINK(pair->two->mode)) 64 if (S_ISGITLINK(pair->two->mode))
65 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); 65 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
66 return; 66 return;
67 } 67 }
68 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 68 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
69 html("Error running diff"); 69 html("Error running diff");
70} 70}
71 71
72void cgit_print_patch(char *hex, struct cacheitem *item) 72void cgit_print_patch(char *hex, struct cacheitem *item)
73{ 73{
74 struct commit *commit; 74 struct commit *commit;
75 struct commitinfo *info; 75 struct commitinfo *info;
76 unsigned char sha1[20], old_sha1[20]; 76 unsigned char sha1[20], old_sha1[20];
77 char *patchname; 77 char *patchname;
78 78
79 if (!hex) 79 if (!hex)
80 hex = ctx.qry.head; 80 hex = ctx.qry.head;
81 81
82 if (get_sha1(hex, sha1)) { 82 if (get_sha1(hex, sha1)) {
83 cgit_print_error(fmt("Bad object id: %s", hex)); 83 cgit_print_error(fmt("Bad object id: %s", hex));
84 return; 84 return;
85 } 85 }
86 commit = lookup_commit_reference(sha1); 86 commit = lookup_commit_reference(sha1);
87 if (!commit) { 87 if (!commit) {
88 cgit_print_error(fmt("Bad commit reference: %s", hex)); 88 cgit_print_error(fmt("Bad commit reference: %s", hex));
89 return; 89 return;
90 } 90 }
91 info = cgit_parse_commit(commit); 91 info = cgit_parse_commit(commit);
92 hashcpy(old_sha1, commit->parents->item->object.sha1); 92 hashcpy(old_sha1, commit->parents->item->object.sha1);
93 93
94 patchname = fmt("%s.patch", sha1_to_hex(sha1)); 94 patchname = fmt("%s.patch", sha1_to_hex(sha1));
95 cgit_print_snapshot_start("text/plain", patchname, item); 95 ctx.page.mimetype = "text/plain";
96 ctx.page.filename = patchname;
97 cgit_print_http_headers(&ctx);
96 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); 98 htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
97 htmlf("From: %s%s\n", info->author, info->author_email); 99 htmlf("From: %s%s\n", info->author, info->author_email);
98 html("Date: "); 100 html("Date: ");
99 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); 101 cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n");
100 htmlf("Subject: %s\n\n", info->subject); 102 htmlf("Subject: %s\n\n", info->subject);
101 if (info->msg && *info->msg) { 103 if (info->msg && *info->msg) {
102 htmlf("%s", info->msg); 104 htmlf("%s", info->msg);
103 if (info->msg[strlen(info->msg) - 1] != '\n') 105 if (info->msg[strlen(info->msg) - 1] != '\n')
104 html("\n"); 106 html("\n");
105 } 107 }
106 html("---\n"); 108 html("---\n");
107 cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); 109 cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL);
108 html("--\n"); 110 html("--\n");
109 htmlf("cgit %s\n", CGIT_VERSION); 111 htmlf("cgit %s\n", CGIT_VERSION);
110 cgit_free_commitinfo(info); 112 cgit_free_commitinfo(info);
111} 113}