|
|
|
@@ -67,44 +67,48 @@ static void filepair_cb(struct diff_filepair *pair) |
67 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
67 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
68 | html("Error running diff"); |
68 | html("Error running diff"); |
69 | } |
69 | } |
70 | |
70 | |
71 | void cgit_print_patch(char *hex, struct cacheitem *item) |
71 | void cgit_print_patch(char *hex, struct cacheitem *item) |
72 | { |
72 | { |
73 | struct commit *commit; |
73 | struct commit *commit; |
74 | struct commitinfo *info; |
74 | struct commitinfo *info; |
75 | unsigned char sha1[20], old_sha1[20]; |
75 | unsigned char sha1[20], old_sha1[20]; |
76 | char *patchname; |
76 | char *patchname; |
77 | |
77 | |
78 | if (!hex) |
78 | if (!hex) |
79 | hex = cgit_query_head; |
79 | hex = cgit_query_head; |
80 | |
80 | |
81 | if (get_sha1(hex, sha1)) { |
81 | if (get_sha1(hex, sha1)) { |
82 | cgit_print_error(fmt("Bad object id: %s", hex)); |
82 | cgit_print_error(fmt("Bad object id: %s", hex)); |
83 | return; |
83 | return; |
84 | } |
84 | } |
85 | commit = lookup_commit_reference(sha1); |
85 | commit = lookup_commit_reference(sha1); |
86 | if (!commit) { |
86 | if (!commit) { |
87 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
87 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
88 | return; |
88 | return; |
89 | } |
89 | } |
90 | info = cgit_parse_commit(commit); |
90 | info = cgit_parse_commit(commit); |
91 | hashcpy(old_sha1, commit->parents->item->object.sha1); |
91 | |
| |
92 | if (commit->parents && commit->parents->item) |
| |
93 | hashcpy(old_sha1, commit->parents->item->object.sha1); |
| |
94 | else |
| |
95 | hashclr(old_sha1); |
92 | |
96 | |
93 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); |
97 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); |
94 | cgit_print_snapshot_start("text/plain", patchname, item); |
98 | cgit_print_snapshot_start("text/plain", patchname, item); |
95 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); |
99 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); |
96 | htmlf("From: %s%s\n", info->author, info->author_email); |
100 | htmlf("From: %s%s\n", info->author, info->author_email); |
97 | html("Date: "); |
101 | html("Date: "); |
98 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); |
102 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); |
99 | htmlf("Subject: %s\n\n", info->subject); |
103 | htmlf("Subject: %s\n\n", info->subject); |
100 | if (info->msg && *info->msg) { |
104 | if (info->msg && *info->msg) { |
101 | htmlf("%s", info->msg); |
105 | htmlf("%s", info->msg); |
102 | if (info->msg[strlen(info->msg) - 1] != '\n') |
106 | if (info->msg[strlen(info->msg) - 1] != '\n') |
103 | html("\n"); |
107 | html("\n"); |
104 | } |
108 | } |
105 | html("---\n"); |
109 | html("---\n"); |
106 | cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); |
110 | cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); |
107 | html("--\n"); |
111 | html("--\n"); |
108 | htmlf("cgit %s\n", CGIT_VERSION); |
112 | htmlf("cgit %s\n", CGIT_VERSION); |
109 | cgit_free_commitinfo(info); |
113 | cgit_free_commitinfo(info); |
110 | } |
114 | } |
|