summaryrefslogtreecommitdiffabout
path: root/ui-commit.c
Unidiff
Diffstat (limited to 'ui-commit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-commit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui-commit.c b/ui-commit.c
index b3d1c28..20a7cb2 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,239 +1,240 @@
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 10
11int files = 0, slots = 0; 11int files = 0, slots = 0;
12int total_adds = 0, total_rems = 0, max_changes = 0; 12int total_adds = 0, total_rems = 0, max_changes = 0;
13int lines_added, lines_removed; 13int lines_added, lines_removed;
14 14
15struct fileinfo { 15struct fileinfo {
16 char status; 16 char status;
17 unsigned char old_sha1[20]; 17 unsigned char old_sha1[20];
18 unsigned char new_sha1[20]; 18 unsigned char new_sha1[20];
19 unsigned short old_mode; 19 unsigned short old_mode;
20 unsigned short new_mode; 20 unsigned short new_mode;
21 char *old_path; 21 char *old_path;
22 char *new_path; 22 char *new_path;
23 unsigned int added; 23 unsigned int added;
24 unsigned int removed; 24 unsigned int removed;
25} *items; 25} *items;
26 26
27 27
28void print_fileinfo(struct fileinfo *info) 28void print_fileinfo(struct fileinfo *info)
29{ 29{
30 char *query, *query2; 30 char *query, *query2;
31 char *class; 31 char *class;
32 double width; 32 double width;
33 33
34 switch (info->status) { 34 switch (info->status) {
35 case DIFF_STATUS_ADDED: 35 case DIFF_STATUS_ADDED:
36 class = "add"; 36 class = "add";
37 break; 37 break;
38 case DIFF_STATUS_COPIED: 38 case DIFF_STATUS_COPIED:
39 class = "cpy"; 39 class = "cpy";
40 break; 40 break;
41 case DIFF_STATUS_DELETED: 41 case DIFF_STATUS_DELETED:
42 class = "del"; 42 class = "del";
43 break; 43 break;
44 case DIFF_STATUS_MODIFIED: 44 case DIFF_STATUS_MODIFIED:
45 class = "upd"; 45 class = "upd";
46 break; 46 break;
47 case DIFF_STATUS_RENAMED: 47 case DIFF_STATUS_RENAMED:
48 class = "mov"; 48 class = "mov";
49 break; 49 break;
50 case DIFF_STATUS_TYPE_CHANGED: 50 case DIFF_STATUS_TYPE_CHANGED:
51 class = "typ"; 51 class = "typ";
52 break; 52 break;
53 case DIFF_STATUS_UNKNOWN: 53 case DIFF_STATUS_UNKNOWN:
54 class = "unk"; 54 class = "unk";
55 break; 55 break;
56 case DIFF_STATUS_UNMERGED: 56 case DIFF_STATUS_UNMERGED:
57 class = "stg"; 57 class = "stg";
58 break; 58 break;
59 default: 59 default:
60 die("bug: unhandled diff status %c", info->status); 60 die("bug: unhandled diff status %c", info->status);
61 } 61 }
62 62
63 html("<tr>"); 63 html("<tr>");
64 htmlf("<td class='mode'>"); 64 htmlf("<td class='mode'>");
65 if (is_null_sha1(info->new_sha1)) { 65 if (is_null_sha1(info->new_sha1)) {
66 html_filemode(info->old_mode); 66 html_filemode(info->old_mode);
67 } else { 67 } else {
68 html_filemode(info->new_mode); 68 html_filemode(info->new_mode);
69 } 69 }
70 70
71 if (info->old_mode != info->new_mode && 71 if (info->old_mode != info->new_mode &&
72 !is_null_sha1(info->old_sha1) && 72 !is_null_sha1(info->old_sha1) &&
73 !is_null_sha1(info->new_sha1)) { 73 !is_null_sha1(info->new_sha1)) {
74 html("<span class='modechange'>["); 74 html("<span class='modechange'>[");
75 html_filemode(info->old_mode); 75 html_filemode(info->old_mode);
76 html("]</span>"); 76 html("]</span>");
77 } 77 }
78 htmlf("</td><td class='%s'>", class); 78 htmlf("</td><td class='%s'>", class);
79 query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), 79 query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1),
80 sha1_to_hex(info->new_sha1), info->new_path); 80 sha1_to_hex(info->new_sha1), info->new_path);
81 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), 81 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
82 NULL, NULL); 82 NULL, NULL);
83 if (info->status == DIFF_STATUS_COPIED || 83 if (info->status == DIFF_STATUS_COPIED ||
84 info->status == DIFF_STATUS_RENAMED) { 84 info->status == DIFF_STATUS_RENAMED) {
85 html_txt(info->new_path); 85 html_txt(info->new_path);
86 htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ? 86 htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ?
87 "copied" : "renamed"); 87 "copied" : "renamed");
88 query2 = fmt("id=%s", sha1_to_hex(info->old_sha1)); 88 query2 = fmt("id=%s", sha1_to_hex(info->old_sha1));
89 html_link_open(cgit_pageurl(cgit_query_repo, "view", query2), 89 html_link_open(cgit_pageurl(cgit_query_repo, "view", query2),
90 NULL, NULL); 90 NULL, NULL);
91 html_txt(info->old_path); 91 html_txt(info->old_path);
92 html("</a>)"); 92 html("</a>)");
93 } else { 93 } else {
94 html_txt(info->new_path); 94 html_txt(info->new_path);
95 html("</a>"); 95 html("</a>");
96 } 96 }
97 html("</td><td class='right'>"); 97 html("</td><td class='right'>");
98 htmlf("%d", info->added + info->removed); 98 htmlf("%d", info->added + info->removed);
99 99
100 html("</td><td class='graph'>"); 100 html("</td><td class='graph'>");
101 width = (info->added + info->removed) * 100.0 / max_changes; 101 width = (info->added + info->removed) * 100.0 / max_changes;
102 if (width < 0.1) 102 if (width < 0.1)
103 width = 0.1; 103 width = 0.1;
104 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), 104 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
105 NULL, NULL); 105 NULL, NULL);
106 htmlf("<img src='/cgit/add.png' style='width: %.1f%%;'/>", 106 htmlf("<img src='/cgit/add.png' style='width: %.1f%%;'/>",
107 info->added * width / (info->added + info->removed)); 107 info->added * width / (info->added + info->removed));
108 htmlf("<img src='/cgit/del.png' style='width: %.1f%%;'/>", 108 htmlf("<img src='/cgit/del.png' style='width: %.1f%%;'/>",
109 info->removed * width / (info->added + info->removed)); 109 info->removed * width / (info->added + info->removed));
110 html("</a></td></tr>\n"); 110 html("</a></td></tr>\n");
111} 111}
112 112
113void cgit_count_diff_lines(char *line, int len) 113void cgit_count_diff_lines(char *line, int len)
114{ 114{
115 if (line && (len > 0)) { 115 if (line && (len > 0)) {
116 if (line[0] == '+') 116 if (line[0] == '+')
117 lines_added++; 117 lines_added++;
118 else if (line[0] == '-') 118 else if (line[0] == '-')
119 lines_removed++; 119 lines_removed++;
120 } 120 }
121} 121}
122 122
123void inspect_filepair(struct diff_filepair *pair) 123void inspect_filepair(struct diff_filepair *pair)
124{ 124{
125 files++; 125 files++;
126 lines_added = 0; 126 lines_added = 0;
127 lines_removed = 0; 127 lines_removed = 0;
128 cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines); 128 cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines);
129 if (files >= slots) { 129 if (files >= slots) {
130 if (slots == 0) 130 if (slots == 0)
131 slots = 4; 131 slots = 4;
132 else 132 else
133 slots = slots * 2; 133 slots = slots * 2;
134 items = xrealloc(items, slots * sizeof(struct fileinfo)); 134 items = xrealloc(items, slots * sizeof(struct fileinfo));
135 } 135 }
136 items[files-1].status = pair->status; 136 items[files-1].status = pair->status;
137 hashcpy(items[files-1].old_sha1, pair->one->sha1); 137 hashcpy(items[files-1].old_sha1, pair->one->sha1);
138 hashcpy(items[files-1].new_sha1, pair->two->sha1); 138 hashcpy(items[files-1].new_sha1, pair->two->sha1);
139 items[files-1].old_mode = pair->one->mode; 139 items[files-1].old_mode = pair->one->mode;
140 items[files-1].new_mode = pair->two->mode; 140 items[files-1].new_mode = pair->two->mode;
141 items[files-1].old_path = xstrdup(pair->one->path); 141 items[files-1].old_path = xstrdup(pair->one->path);
142 items[files-1].new_path = xstrdup(pair->two->path); 142 items[files-1].new_path = xstrdup(pair->two->path);
143 items[files-1].added = lines_added; 143 items[files-1].added = lines_added;
144 items[files-1].removed = lines_removed; 144 items[files-1].removed = lines_removed;
145 if (lines_added + lines_removed > max_changes) 145 if (lines_added + lines_removed > max_changes)
146 max_changes = lines_added + lines_removed; 146 max_changes = lines_added + lines_removed;
147 total_adds += lines_added; 147 total_adds += lines_added;
148 total_rems += lines_removed; 148 total_rems += lines_removed;
149} 149}
150 150
151 151
152void cgit_print_commit(const char *hex) 152void cgit_print_commit(const char *hex)
153{ 153{
154 struct commit *commit, *parent; 154 struct commit *commit, *parent;
155 struct commitinfo *info; 155 struct commitinfo *info;
156 struct commit_list *p; 156 struct commit_list *p;
157 unsigned char sha1[20]; 157 unsigned char sha1[20];
158 char *query; 158 char *query;
159 char *filename; 159 char *filename;
160 int i; 160 int i;
161 161
162 if (get_sha1(hex, sha1)) { 162 if (get_sha1(hex, sha1)) {
163 cgit_print_error(fmt("Bad object id: %s", hex)); 163 cgit_print_error(fmt("Bad object id: %s", hex));
164 return; 164 return;
165 } 165 }
166 commit = lookup_commit_reference(sha1); 166 commit = lookup_commit_reference(sha1);
167 if (!commit) { 167 if (!commit) {
168 cgit_print_error(fmt("Bad commit reference: %s", hex)); 168 cgit_print_error(fmt("Bad commit reference: %s", hex));
169 return; 169 return;
170 } 170 }
171 info = cgit_parse_commit(commit); 171 info = cgit_parse_commit(commit);
172 172
173 html("<table class='commit-info'>\n"); 173 html("<table class='commit-info'>\n");
174 html("<tr><th>author</th><td>"); 174 html("<tr><th>author</th><td>");
175 html_txt(info->author); 175 html_txt(info->author);
176 html(" "); 176 html(" ");
177 html_txt(info->author_email); 177 html_txt(info->author_email);
178 html("</td><td class='right'>"); 178 html("</td><td class='right'>");
179 cgit_print_date(info->author_date); 179 cgit_print_date(info->author_date);
180 html("</td></tr>\n"); 180 html("</td></tr>\n");
181 html("<tr><th>committer</th><td>"); 181 html("<tr><th>committer</th><td>");
182 html_txt(info->committer); 182 html_txt(info->committer);
183 html(" "); 183 html(" ");
184 html_txt(info->committer_email); 184 html_txt(info->committer_email);
185 html("</td><td class='right'>"); 185 html("</td><td class='right'>");
186 cgit_print_date(info->committer_date); 186 cgit_print_date(info->committer_date);
187 html("</td></tr>\n"); 187 html("</td></tr>\n");
188 html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); 188 html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
189 query = fmt("id=%s", sha1_to_hex(commit->tree->object.sha1)); 189 query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1),
190 sha1_to_hex(commit->tree->object.sha1));
190 html_attr(cgit_pageurl(cgit_query_repo, "tree", query)); 191 html_attr(cgit_pageurl(cgit_query_repo, "tree", query));
191 htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); 192 htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
192 for (p = commit->parents; p ; p = p->next) { 193 for (p = commit->parents; p ; p = p->next) {
193 parent = lookup_commit_reference(p->item->object.sha1); 194 parent = lookup_commit_reference(p->item->object.sha1);
194 if (!parent) { 195 if (!parent) {
195 html("<tr><td colspan='3'>"); 196 html("<tr><td colspan='3'>");
196 cgit_print_error("Error reading parent commit"); 197 cgit_print_error("Error reading parent commit");
197 html("</td></tr>"); 198 html("</td></tr>");
198 continue; 199 continue;
199 } 200 }
200 html("<tr><th>parent</th>" 201 html("<tr><th>parent</th>"
201 "<td colspan='2' class='sha1'>" 202 "<td colspan='2' class='sha1'>"
202 "<a href='"); 203 "<a href='");
203 query = fmt("id=%s", sha1_to_hex(p->item->object.sha1)); 204 query = fmt("id=%s", sha1_to_hex(p->item->object.sha1));
204 html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); 205 html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
205 htmlf("'>%s</a> (<a href='", 206 htmlf("'>%s</a> (<a href='",
206 sha1_to_hex(p->item->object.sha1)); 207 sha1_to_hex(p->item->object.sha1));
207 query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1), 208 query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1),
208 sha1_to_hex(commit->tree->object.sha1)); 209 sha1_to_hex(commit->tree->object.sha1));
209 html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); 210 html_attr(cgit_pageurl(cgit_query_repo, "diff", query));
210 html("'>diff</a>)</td></tr>"); 211 html("'>diff</a>)</td></tr>");
211 } 212 }
212 if (cgit_repo->snapshots) { 213 if (cgit_repo->snapshots) {
213 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); 214 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
214 filename = fmt("%s-%s.zip", cgit_query_repo, hex); 215 filename = fmt("%s-%s.zip", cgit_query_repo, hex);
215 html_attr(cgit_pageurl(cgit_query_repo, "snapshot", 216 html_attr(cgit_pageurl(cgit_query_repo, "snapshot",
216 fmt("id=%s&name=%s", hex, filename))); 217 fmt("id=%s&name=%s", hex, filename)));
217 htmlf("'>%s</a></td></tr>", filename); 218 htmlf("'>%s</a></td></tr>", filename);
218 } 219 }
219 html("</table>\n"); 220 html("</table>\n");
220 html("<div class='commit-subject'>"); 221 html("<div class='commit-subject'>");
221 html_txt(info->subject); 222 html_txt(info->subject);
222 html("</div>"); 223 html("</div>");
223 html("<div class='commit-msg'>"); 224 html("<div class='commit-msg'>");
224 html_txt(info->msg); 225 html_txt(info->msg);
225 html("</div>"); 226 html("</div>");
226 if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { 227 if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
227 html("<table class='diffstat'>"); 228 html("<table class='diffstat'>");
228 max_changes = 0; 229 max_changes = 0;
229 cgit_diff_commit(commit, inspect_filepair); 230 cgit_diff_commit(commit, inspect_filepair);
230 for(i = 0; i<files; i++) 231 for(i = 0; i<files; i++)
231 print_fileinfo(&items[i]); 232 print_fileinfo(&items[i]);
232 html("</table>"); 233 html("</table>");
233 html("<div class='diffstat-summary'>"); 234 html("<div class='diffstat-summary'>");
234 htmlf("%d files changed, %d insertions, %d deletions\n", 235 htmlf("%d files changed, %d insertions, %d deletions\n",
235 files, total_adds, total_rems); 236 files, total_adds, total_rems);
236 html("</div>"); 237 html("</div>");
237 } 238 }
238 cgit_free_commitinfo(info); 239 cgit_free_commitinfo(info);
239} 240}