|
|
|
@@ -63,63 +63,67 @@ static void filepair_cb(struct diff_filepair *pair) |
63 | |
63 | |
64 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
64 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
65 | pair->two->sha1, pair->two->path, pair->two->mode); |
65 | pair->two->sha1, pair->two->path, pair->two->mode); |
66 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
66 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
67 | if (S_ISGITLINK(pair->one->mode)) |
67 | if (S_ISGITLINK(pair->one->mode)) |
68 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
68 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
69 | if (S_ISGITLINK(pair->two->mode)) |
69 | if (S_ISGITLINK(pair->two->mode)) |
70 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
70 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
71 | return; |
71 | return; |
72 | } |
72 | } |
73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
74 | &new_size, &binary, print_line)) |
74 | &new_size, &binary, print_line)) |
75 | html("Error running diff"); |
75 | html("Error running diff"); |
76 | if (binary) |
76 | if (binary) |
77 | html("Binary files differ\n"); |
77 | html("Binary files differ\n"); |
78 | } |
78 | } |
79 | |
79 | |
80 | void cgit_print_patch(char *hex) |
80 | void cgit_print_patch(char *hex) |
81 | { |
81 | { |
82 | struct commit *commit; |
82 | struct commit *commit; |
83 | struct commitinfo *info; |
83 | struct commitinfo *info; |
84 | unsigned char sha1[20], old_sha1[20]; |
84 | unsigned char sha1[20], old_sha1[20]; |
85 | char *patchname; |
85 | char *patchname; |
86 | |
86 | |
87 | if (!hex) |
87 | if (!hex) |
88 | hex = ctx.qry.head; |
88 | hex = ctx.qry.head; |
89 | |
89 | |
90 | if (get_sha1(hex, sha1)) { |
90 | if (get_sha1(hex, sha1)) { |
91 | cgit_print_error(fmt("Bad object id: %s", hex)); |
91 | cgit_print_error(fmt("Bad object id: %s", hex)); |
92 | return; |
92 | return; |
93 | } |
93 | } |
94 | commit = lookup_commit_reference(sha1); |
94 | commit = lookup_commit_reference(sha1); |
95 | if (!commit) { |
95 | if (!commit) { |
96 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
96 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
97 | return; |
97 | return; |
98 | } |
98 | } |
99 | info = cgit_parse_commit(commit); |
99 | info = cgit_parse_commit(commit); |
100 | |
100 | |
101 | if (commit->parents && commit->parents->item) |
101 | if (commit->parents && commit->parents->item) |
102 | hashcpy(old_sha1, commit->parents->item->object.sha1); |
102 | hashcpy(old_sha1, commit->parents->item->object.sha1); |
103 | else |
103 | else |
104 | hashclr(old_sha1); |
104 | hashclr(old_sha1); |
105 | |
105 | |
106 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); |
106 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); |
107 | ctx.page.mimetype = "text/plain"; |
107 | ctx.page.mimetype = "text/plain"; |
108 | ctx.page.filename = patchname; |
108 | ctx.page.filename = patchname; |
109 | cgit_print_http_headers(&ctx); |
109 | cgit_print_http_headers(&ctx); |
110 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); |
110 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); |
111 | htmlf("From: %s %s\n", info->author, info->author_email); |
111 | htmlf("From: %s", info->author); |
| |
112 | if (!ctx.cfg.noplainemail) { |
| |
113 | htmlf(" %s", info->author_email); |
| |
114 | } |
| |
115 | html("\n"); |
112 | html("Date: "); |
116 | html("Date: "); |
113 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); |
117 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); |
114 | htmlf("Subject: %s\n\n", info->subject); |
118 | htmlf("Subject: %s\n\n", info->subject); |
115 | if (info->msg && *info->msg) { |
119 | if (info->msg && *info->msg) { |
116 | htmlf("%s", info->msg); |
120 | htmlf("%s", info->msg); |
117 | if (info->msg[strlen(info->msg) - 1] != '\n') |
121 | if (info->msg[strlen(info->msg) - 1] != '\n') |
118 | html("\n"); |
122 | html("\n"); |
119 | } |
123 | } |
120 | html("---\n"); |
124 | html("---\n"); |
121 | cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); |
125 | cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); |
122 | html("--\n"); |
126 | html("--\n"); |
123 | htmlf("cgit %s\n", CGIT_VERSION); |
127 | htmlf("cgit %s\n", CGIT_VERSION); |
124 | cgit_free_commitinfo(info); |
128 | cgit_free_commitinfo(info); |
125 | } |
129 | } |
|