-rw-r--r-- | ui-commit.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/ui-commit.c b/ui-commit.c index bd55a33..8019e36 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -1,21 +1,23 @@ | |||
1 | /* ui-commit.c: generate commit view | 1 | /* ui-commit.c: generate commit view |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 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 | ||
11 | static int files, slots; | 13 | static int files, slots; |
12 | static int total_adds, total_rems, max_changes; | 14 | static int total_adds, total_rems, max_changes; |
13 | static int lines_added, lines_removed; | 15 | static int lines_added, lines_removed; |
14 | static char *curr_rev; | 16 | static char *curr_rev; |
15 | 17 | ||
16 | static struct fileinfo { | 18 | static struct fileinfo { |
17 | char status; | 19 | char status; |
18 | unsigned char old_sha1[20]; | 20 | unsigned char old_sha1[20]; |
19 | unsigned char new_sha1[20]; | 21 | unsigned char new_sha1[20]; |
20 | unsigned short old_mode; | 22 | unsigned short old_mode; |
21 | unsigned short new_mode; | 23 | unsigned short new_mode; |
@@ -53,38 +55,38 @@ void print_fileinfo(struct fileinfo *info) | |||
53 | class = "unk"; | 55 | class = "unk"; |
54 | break; | 56 | break; |
55 | case DIFF_STATUS_UNMERGED: | 57 | case DIFF_STATUS_UNMERGED: |
56 | class = "stg"; | 58 | class = "stg"; |
57 | break; | 59 | break; |
58 | default: | 60 | default: |
59 | die("bug: unhandled diff status %c", info->status); | 61 | die("bug: unhandled diff status %c", info->status); |
60 | } | 62 | } |
61 | 63 | ||
62 | html("<tr>"); | 64 | html("<tr>"); |
63 | htmlf("<td class='mode'>"); | 65 | htmlf("<td class='mode'>"); |
64 | if (is_null_sha1(info->new_sha1)) { | 66 | if (is_null_sha1(info->new_sha1)) { |
65 | html_filemode(info->old_mode); | 67 | cgit_print_filemode(info->old_mode); |
66 | } else { | 68 | } else { |
67 | html_filemode(info->new_mode); | 69 | cgit_print_filemode(info->new_mode); |
68 | } | 70 | } |
69 | 71 | ||
70 | if (info->old_mode != info->new_mode && | 72 | if (info->old_mode != info->new_mode && |
71 | !is_null_sha1(info->old_sha1) && | 73 | !is_null_sha1(info->old_sha1) && |
72 | !is_null_sha1(info->new_sha1)) { | 74 | !is_null_sha1(info->new_sha1)) { |
73 | html("<span class='modechange'>["); | 75 | html("<span class='modechange'>["); |
74 | html_filemode(info->old_mode); | 76 | cgit_print_filemode(info->old_mode); |
75 | html("]</span>"); | 77 | html("]</span>"); |
76 | } | 78 | } |
77 | htmlf("</td><td class='%s'>", class); | 79 | htmlf("</td><td class='%s'>", class); |
78 | cgit_diff_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev, | 80 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev, |
79 | NULL, info->new_path); | 81 | NULL, info->new_path); |
80 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) | 82 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
81 | htmlf(" (%s from %s)", | 83 | htmlf(" (%s from %s)", |
82 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", | 84 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
83 | info->old_path); | 85 | info->old_path); |
84 | html("</td><td class='right'>"); | 86 | html("</td><td class='right'>"); |
85 | htmlf("%d", info->added + info->removed); | 87 | htmlf("%d", info->added + info->removed); |
86 | html("</td><td class='graph'>"); | 88 | html("</td><td class='graph'>"); |
87 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); | 89 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
88 | htmlf("<td class='add' style='width: %.1f%%;'/>", | 90 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
89 | info->added * 100.0 / max_changes); | 91 | info->added * 100.0 / max_changes); |
90 | htmlf("<td class='rem' style='width: %.1f%%;'/>", | 92 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
@@ -134,25 +136,25 @@ void inspect_filepair(struct diff_filepair *pair) | |||
134 | 136 | ||
135 | 137 | ||
136 | void cgit_print_commit(char *hex) | 138 | void cgit_print_commit(char *hex) |
137 | { | 139 | { |
138 | struct commit *commit, *parent; | 140 | struct commit *commit, *parent; |
139 | struct commitinfo *info; | 141 | struct commitinfo *info; |
140 | struct commit_list *p; | 142 | struct commit_list *p; |
141 | unsigned char sha1[20]; | 143 | unsigned char sha1[20]; |
142 | char *tmp; | 144 | char *tmp; |
143 | int i; | 145 | int i; |
144 | 146 | ||
145 | if (!hex) | 147 | if (!hex) |
146 | hex = cgit_query_head; | 148 | hex = ctx.qry.head; |
147 | curr_rev = hex; | 149 | curr_rev = hex; |
148 | 150 | ||
149 | if (get_sha1(hex, sha1)) { | 151 | if (get_sha1(hex, sha1)) { |
150 | cgit_print_error(fmt("Bad object id: %s", hex)); | 152 | cgit_print_error(fmt("Bad object id: %s", hex)); |
151 | return; | 153 | return; |
152 | } | 154 | } |
153 | commit = lookup_commit_reference(sha1); | 155 | commit = lookup_commit_reference(sha1); |
154 | if (!commit) { | 156 | if (!commit) { |
155 | cgit_print_error(fmt("Bad commit reference: %s", hex)); | 157 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
156 | return; | 158 | return; |
157 | } | 159 | } |
158 | info = cgit_parse_commit(commit); | 160 | info = cgit_parse_commit(commit); |
@@ -166,61 +168,61 @@ void cgit_print_commit(char *hex) | |||
166 | cgit_print_date(info->author_date, FMT_LONGDATE); | 168 | cgit_print_date(info->author_date, FMT_LONGDATE); |
167 | html("</td></tr>\n"); | 169 | html("</td></tr>\n"); |
168 | html("<tr><th>committer</th><td>"); | 170 | html("<tr><th>committer</th><td>"); |
169 | html_txt(info->committer); | 171 | html_txt(info->committer); |
170 | html(" "); | 172 | html(" "); |
171 | html_txt(info->committer_email); | 173 | html_txt(info->committer_email); |
172 | html("</td><td class='right'>"); | 174 | html("</td><td class='right'>"); |
173 | cgit_print_date(info->committer_date, FMT_LONGDATE); | 175 | cgit_print_date(info->committer_date, FMT_LONGDATE); |
174 | html("</td></tr>\n"); | 176 | html("</td></tr>\n"); |
175 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); | 177 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); |
176 | tmp = xstrdup(hex); | 178 | tmp = xstrdup(hex); |
177 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, | 179 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, |
178 | cgit_query_head, tmp, NULL); | 180 | ctx.qry.head, tmp, NULL); |
179 | html("</td></tr>\n"); | 181 | html("</td></tr>\n"); |
180 | for (p = commit->parents; p ; p = p->next) { | 182 | for (p = commit->parents; p ; p = p->next) { |
181 | parent = lookup_commit_reference(p->item->object.sha1); | 183 | parent = lookup_commit_reference(p->item->object.sha1); |
182 | if (!parent) { | 184 | if (!parent) { |
183 | html("<tr><td colspan='3'>"); | 185 | html("<tr><td colspan='3'>"); |
184 | cgit_print_error("Error reading parent commit"); | 186 | cgit_print_error("Error reading parent commit"); |
185 | html("</td></tr>"); | 187 | html("</td></tr>"); |
186 | continue; | 188 | continue; |
187 | } | 189 | } |
188 | html("<tr><th>parent</th>" | 190 | html("<tr><th>parent</th>" |
189 | "<td colspan='2' class='sha1'>"); | 191 | "<td colspan='2' class='sha1'>"); |
190 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, | 192 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, |
191 | cgit_query_head, sha1_to_hex(p->item->object.sha1)); | 193 | ctx.qry.head, sha1_to_hex(p->item->object.sha1)); |
192 | html(" ("); | 194 | html(" ("); |
193 | cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex, | 195 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, |
194 | sha1_to_hex(p->item->object.sha1), NULL); | 196 | sha1_to_hex(p->item->object.sha1), NULL); |
195 | html(")</td></tr>"); | 197 | html(")</td></tr>"); |
196 | } | 198 | } |
197 | if (cgit_repo->snapshots) { | 199 | if (ctx.repo->snapshots) { |
198 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); | 200 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); |
199 | cgit_print_snapshot_links(cgit_query_repo, cgit_query_head, | 201 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, |
200 | hex, cgit_repo->snapshots); | 202 | hex, ctx.repo->snapshots); |
201 | html("</td></tr>"); | 203 | html("</td></tr>"); |
202 | } | 204 | } |
203 | html("</table>\n"); | 205 | html("</table>\n"); |
204 | html("<div class='commit-subject'>"); | 206 | html("<div class='commit-subject'>"); |
205 | html_txt(info->subject); | 207 | html_txt(info->subject); |
206 | html("</div>"); | 208 | html("</div>"); |
207 | html("<div class='commit-msg'>"); | 209 | html("<div class='commit-msg'>"); |
208 | html_txt(info->msg); | 210 | html_txt(info->msg); |
209 | html("</div>"); | 211 | html("</div>"); |
210 | if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { | 212 | if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { |
211 | html("<div class='diffstat-header'>Diffstat</div>"); | 213 | html("<div class='diffstat-header'>Diffstat</div>"); |
212 | html("<table summary='diffstat' class='diffstat'>"); | 214 | html("<table summary='diffstat' class='diffstat'>"); |
213 | max_changes = 0; | 215 | max_changes = 0; |
214 | cgit_diff_commit(commit, inspect_filepair); | 216 | cgit_diff_commit(commit, inspect_filepair); |
215 | for(i = 0; i<files; i++) | 217 | for(i = 0; i<files; i++) |
216 | print_fileinfo(&items[i]); | 218 | print_fileinfo(&items[i]); |
217 | html("</table>"); | 219 | html("</table>"); |
218 | html("<div class='diffstat-summary'>"); | 220 | html("<div class='diffstat-summary'>"); |
219 | htmlf("%d files changed, %d insertions, %d deletions (", | 221 | htmlf("%d files changed, %d insertions, %d deletions (", |
220 | files, total_adds, total_rems); | 222 | files, total_adds, total_rems); |
221 | cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex, | 223 | cgit_diff_link("show diff", NULL, NULL, ctx.qry.head, hex, |
222 | NULL, NULL); | 224 | NULL, NULL); |
223 | html(")</div>"); | 225 | html(")</div>"); |
224 | } | 226 | } |
225 | cgit_free_commitinfo(info); | 227 | cgit_free_commitinfo(info); |
226 | } | 228 | } |