summaryrefslogtreecommitdiffabout
path: root/ui-commit.c
Unidiff
Diffstat (limited to 'ui-commit.c') (more/less context) (show whitespace changes)
-rw-r--r--ui-commit.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui-commit.c b/ui-commit.c
index 1d12bbb..ed5384d 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -137,98 +137,97 @@ void inspect_filepair(struct diff_filepair *pair)
137 items[files-1].old_path = xstrdup(pair->one->path); 137 items[files-1].old_path = xstrdup(pair->one->path);
138 items[files-1].new_path = xstrdup(pair->two->path); 138 items[files-1].new_path = xstrdup(pair->two->path);
139 items[files-1].added = lines_added; 139 items[files-1].added = lines_added;
140 items[files-1].removed = lines_removed; 140 items[files-1].removed = lines_removed;
141 if (lines_added + lines_removed > max_changes) 141 if (lines_added + lines_removed > max_changes)
142 max_changes = lines_added + lines_removed; 142 max_changes = lines_added + lines_removed;
143 total_adds += lines_added; 143 total_adds += lines_added;
144 total_rems += lines_removed; 144 total_rems += lines_removed;
145} 145}
146 146
147 147
148void cgit_print_commit(const char *hex) 148void cgit_print_commit(const char *hex)
149{ 149{
150 struct commit *commit, *parent; 150 struct commit *commit, *parent;
151 struct commitinfo *info; 151 struct commitinfo *info;
152 struct commit_list *p; 152 struct commit_list *p;
153 unsigned char sha1[20]; 153 unsigned char sha1[20];
154 char *query; 154 char *query;
155 char *filename; 155 char *filename;
156 int i; 156 int i;
157 157
158 if (get_sha1(hex, sha1)) { 158 if (get_sha1(hex, sha1)) {
159 cgit_print_error(fmt("Bad object id: %s", hex)); 159 cgit_print_error(fmt("Bad object id: %s", hex));
160 return; 160 return;
161 } 161 }
162 commit = lookup_commit_reference(sha1); 162 commit = lookup_commit_reference(sha1);
163 if (!commit) { 163 if (!commit) {
164 cgit_print_error(fmt("Bad commit reference: %s", hex)); 164 cgit_print_error(fmt("Bad commit reference: %s", hex));
165 return; 165 return;
166 } 166 }
167 info = cgit_parse_commit(commit); 167 info = cgit_parse_commit(commit);
168 168
169 html("<table class='commit-info'>\n"); 169 html("<table class='commit-info'>\n");
170 html("<tr><th>author</th><td>"); 170 html("<tr><th>author</th><td>");
171 html_txt(info->author); 171 html_txt(info->author);
172 html(" "); 172 html(" ");
173 html_txt(info->author_email); 173 html_txt(info->author_email);
174 html("</td><td class='right'>"); 174 html("</td><td class='right'>");
175 cgit_print_date(info->author_date, FMT_LONGDATE); 175 cgit_print_date(info->author_date, FMT_LONGDATE);
176 html("</td></tr>\n"); 176 html("</td></tr>\n");
177 html("<tr><th>committer</th><td>"); 177 html("<tr><th>committer</th><td>");
178 html_txt(info->committer); 178 html_txt(info->committer);
179 html(" "); 179 html(" ");
180 html_txt(info->committer_email); 180 html_txt(info->committer_email);
181 html("</td><td class='right'>"); 181 html("</td><td class='right'>");
182 cgit_print_date(info->committer_date, FMT_LONGDATE); 182 cgit_print_date(info->committer_date, FMT_LONGDATE);
183 html("</td></tr>\n"); 183 html("</td></tr>\n");
184 html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); 184 html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
185 query = fmt("h=%s&amp;id=%s", sha1_to_hex(commit->object.sha1), 185 query = fmt("h=%s", sha1_to_hex(commit->object.sha1));
186 sha1_to_hex(commit->tree->object.sha1));
187 html_attr(cgit_pageurl(cgit_query_repo, "tree", query)); 186 html_attr(cgit_pageurl(cgit_query_repo, "tree", query));
188 htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); 187 htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
189 for (p = commit->parents; p ; p = p->next) { 188 for (p = commit->parents; p ; p = p->next) {
190 parent = lookup_commit_reference(p->item->object.sha1); 189 parent = lookup_commit_reference(p->item->object.sha1);
191 if (!parent) { 190 if (!parent) {
192 html("<tr><td colspan='3'>"); 191 html("<tr><td colspan='3'>");
193 cgit_print_error("Error reading parent commit"); 192 cgit_print_error("Error reading parent commit");
194 html("</td></tr>"); 193 html("</td></tr>");
195 continue; 194 continue;
196 } 195 }
197 html("<tr><th>parent</th>" 196 html("<tr><th>parent</th>"
198 "<td colspan='2' class='sha1'>" 197 "<td colspan='2' class='sha1'>"
199 "<a href='"); 198 "<a href='");
200 query = fmt("h=%s", sha1_to_hex(p->item->object.sha1)); 199 query = fmt("h=%s", sha1_to_hex(p->item->object.sha1));
201 html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); 200 html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
202 htmlf("'>%s</a> (<a href='", 201 htmlf("'>%s</a> (<a href='",
203 sha1_to_hex(p->item->object.sha1)); 202 sha1_to_hex(p->item->object.sha1));
204 query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1), 203 query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1),
205 sha1_to_hex(commit->tree->object.sha1)); 204 sha1_to_hex(commit->tree->object.sha1));
206 html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); 205 html_attr(cgit_pageurl(cgit_query_repo, "diff", query));
207 html("'>diff</a>)</td></tr>"); 206 html("'>diff</a>)</td></tr>");
208 } 207 }
209 if (cgit_repo->snapshots) { 208 if (cgit_repo->snapshots) {
210 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); 209 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
211 filename = fmt("%s-%s.zip", cgit_query_repo, hex); 210 filename = fmt("%s-%s.zip", cgit_query_repo, hex);
212 html_attr(cgit_pageurl(cgit_query_repo, "snapshot", 211 html_attr(cgit_pageurl(cgit_query_repo, "snapshot",
213 fmt("id=%s&amp;name=%s", hex, filename))); 212 fmt("id=%s&amp;name=%s", hex, filename)));
214 htmlf("'>%s</a></td></tr>", filename); 213 htmlf("'>%s</a></td></tr>", filename);
215 } 214 }
216 html("</table>\n"); 215 html("</table>\n");
217 html("<div class='commit-subject'>"); 216 html("<div class='commit-subject'>");
218 html_txt(info->subject); 217 html_txt(info->subject);
219 html("</div>"); 218 html("</div>");
220 html("<div class='commit-msg'>"); 219 html("<div class='commit-msg'>");
221 html_txt(info->msg); 220 html_txt(info->msg);
222 html("</div>"); 221 html("</div>");
223 if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { 222 if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
224 html("<div class='diffstat-header'>Diffstat</div>"); 223 html("<div class='diffstat-header'>Diffstat</div>");
225 html("<table class='diffstat'>"); 224 html("<table class='diffstat'>");
226 max_changes = 0; 225 max_changes = 0;
227 cgit_diff_commit(commit, inspect_filepair); 226 cgit_diff_commit(commit, inspect_filepair);
228 for(i = 0; i<files; i++) 227 for(i = 0; i<files; i++)
229 print_fileinfo(&items[i]); 228 print_fileinfo(&items[i]);
230 html("</table>"); 229 html("</table>");
231 html("<div class='diffstat-summary'>"); 230 html("<div class='diffstat-summary'>");
232 htmlf("%d files changed, %d insertions, %d deletions (", 231 htmlf("%d files changed, %d insertions, %d deletions (",
233 files, total_adds, total_rems); 232 files, total_adds, total_rems);
234 query = fmt("h=%s", hex); 233 query = fmt("h=%s", hex);