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, 3 insertions, 0 deletions
diff --git a/ui-commit.c b/ui-commit.c
index 885f870..8864fc6 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -63,179 +63,182 @@ void print_fileinfo(struct fileinfo *info)
63 htmlf("<td class='mode'>"); 63 htmlf("<td class='mode'>");
64 if (is_null_sha1(info->new_sha1)) { 64 if (is_null_sha1(info->new_sha1)) {
65 html_filemode(info->old_mode); 65 html_filemode(info->old_mode);
66 } else { 66 } else {
67 html_filemode(info->new_mode); 67 html_filemode(info->new_mode);
68 } 68 }
69 69
70 if (info->old_mode != info->new_mode && 70 if (info->old_mode != info->new_mode &&
71 !is_null_sha1(info->old_sha1) && 71 !is_null_sha1(info->old_sha1) &&
72 !is_null_sha1(info->new_sha1)) { 72 !is_null_sha1(info->new_sha1)) {
73 html("<span class='modechange'>["); 73 html("<span class='modechange'>[");
74 html_filemode(info->old_mode); 74 html_filemode(info->old_mode);
75 html("]</span>"); 75 html("]</span>");
76 } 76 }
77 htmlf("</td><td class='%s'>", class); 77 htmlf("</td><td class='%s'>", class);
78 query = fmt("id=%s&amp;id2=%s&amp;path=%s", sha1_to_hex(info->old_sha1), 78 query = fmt("id=%s&amp;id2=%s&amp;path=%s", sha1_to_hex(info->old_sha1),
79 sha1_to_hex(info->new_sha1), info->new_path); 79 sha1_to_hex(info->new_sha1), info->new_path);
80 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), 80 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
81 NULL, NULL); 81 NULL, NULL);
82 if (info->status == DIFF_STATUS_COPIED || 82 if (info->status == DIFF_STATUS_COPIED ||
83 info->status == DIFF_STATUS_RENAMED) { 83 info->status == DIFF_STATUS_RENAMED) {
84 html_txt(info->new_path); 84 html_txt(info->new_path);
85 htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ? 85 htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ?
86 "copied" : "renamed"); 86 "copied" : "renamed");
87 query2 = fmt("id=%s", sha1_to_hex(info->old_sha1)); 87 query2 = fmt("id=%s", sha1_to_hex(info->old_sha1));
88 html_link_open(cgit_pageurl(cgit_query_repo, "view", query2), 88 html_link_open(cgit_pageurl(cgit_query_repo, "view", query2),
89 NULL, NULL); 89 NULL, NULL);
90 html_txt(info->old_path); 90 html_txt(info->old_path);
91 html("</a>)"); 91 html("</a>)");
92 } else { 92 } else {
93 html_txt(info->new_path); 93 html_txt(info->new_path);
94 html("</a>"); 94 html("</a>");
95 } 95 }
96 html("</td><td class='right'>"); 96 html("</td><td class='right'>");
97 htmlf("%d", info->added + info->removed); 97 htmlf("%d", info->added + info->removed);
98 html("</td><td class='graph'>"); 98 html("</td><td class='graph'>");
99 htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); 99 htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
100 htmlf("<td class='add' style='width: %.1f%%;'/>", 100 htmlf("<td class='add' style='width: %.1f%%;'/>",
101 info->added * 100.0 / max_changes); 101 info->added * 100.0 / max_changes);
102 htmlf("<td class='rem' style='width: %.1f%%;'/>", 102 htmlf("<td class='rem' style='width: %.1f%%;'/>",
103 info->removed * 100.0 / max_changes); 103 info->removed * 100.0 / max_changes);
104 htmlf("<td class='none' style='width: %.1f%%;'/>", 104 htmlf("<td class='none' style='width: %.1f%%;'/>",
105 (max_changes - info->removed - info->added) * 100.0 / max_changes); 105 (max_changes - info->removed - info->added) * 100.0 / max_changes);
106 html("</tr></table></td></tr>\n"); 106 html("</tr></table></td></tr>\n");
107} 107}
108 108
109void cgit_count_diff_lines(char *line, int len) 109void cgit_count_diff_lines(char *line, int len)
110{ 110{
111 if (line && (len > 0)) { 111 if (line && (len > 0)) {
112 if (line[0] == '+') 112 if (line[0] == '+')
113 lines_added++; 113 lines_added++;
114 else if (line[0] == '-') 114 else if (line[0] == '-')
115 lines_removed++; 115 lines_removed++;
116 } 116 }
117} 117}
118 118
119void inspect_filepair(struct diff_filepair *pair) 119void inspect_filepair(struct diff_filepair *pair)
120{ 120{
121 files++; 121 files++;
122 lines_added = 0; 122 lines_added = 0;
123 lines_removed = 0; 123 lines_removed = 0;
124 cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines); 124 cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines);
125 if (files >= slots) { 125 if (files >= slots) {
126 if (slots == 0) 126 if (slots == 0)
127 slots = 4; 127 slots = 4;
128 else 128 else
129 slots = slots * 2; 129 slots = slots * 2;
130 items = xrealloc(items, slots * sizeof(struct fileinfo)); 130 items = xrealloc(items, slots * sizeof(struct fileinfo));
131 } 131 }
132 items[files-1].status = pair->status; 132 items[files-1].status = pair->status;
133 hashcpy(items[files-1].old_sha1, pair->one->sha1); 133 hashcpy(items[files-1].old_sha1, pair->one->sha1);
134 hashcpy(items[files-1].new_sha1, pair->two->sha1); 134 hashcpy(items[files-1].new_sha1, pair->two->sha1);
135 items[files-1].old_mode = pair->one->mode; 135 items[files-1].old_mode = pair->one->mode;
136 items[files-1].new_mode = pair->two->mode; 136 items[files-1].new_mode = pair->two->mode;
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 char *tmp; 156 char *tmp;
157 int i; 157 int i;
158 158
159 if (!hex)
160 hex = cgit_query_head;
161
159 if (get_sha1(hex, sha1)) { 162 if (get_sha1(hex, sha1)) {
160 cgit_print_error(fmt("Bad object id: %s", hex)); 163 cgit_print_error(fmt("Bad object id: %s", hex));
161 return; 164 return;
162 } 165 }
163 commit = lookup_commit_reference(sha1); 166 commit = lookup_commit_reference(sha1);
164 if (!commit) { 167 if (!commit) {
165 cgit_print_error(fmt("Bad commit reference: %s", hex)); 168 cgit_print_error(fmt("Bad commit reference: %s", hex));
166 return; 169 return;
167 } 170 }
168 info = cgit_parse_commit(commit); 171 info = cgit_parse_commit(commit);
169 172
170 html("<table class='commit-info'>\n"); 173 html("<table class='commit-info'>\n");
171 html("<tr><th>author</th><td>"); 174 html("<tr><th>author</th><td>");
172 html_txt(info->author); 175 html_txt(info->author);
173 html(" "); 176 html(" ");
174 html_txt(info->author_email); 177 html_txt(info->author_email);
175 html("</td><td class='right'>"); 178 html("</td><td class='right'>");
176 cgit_print_date(info->author_date, FMT_LONGDATE); 179 cgit_print_date(info->author_date, FMT_LONGDATE);
177 html("</td></tr>\n"); 180 html("</td></tr>\n");
178 html("<tr><th>committer</th><td>"); 181 html("<tr><th>committer</th><td>");
179 html_txt(info->committer); 182 html_txt(info->committer);
180 html(" "); 183 html(" ");
181 html_txt(info->committer_email); 184 html_txt(info->committer_email);
182 html("</td><td class='right'>"); 185 html("</td><td class='right'>");
183 cgit_print_date(info->committer_date, FMT_LONGDATE); 186 cgit_print_date(info->committer_date, FMT_LONGDATE);
184 html("</td></tr>\n"); 187 html("</td></tr>\n");
185 html("<tr><th>tree</th><td colspan='2' class='sha1'>"); 188 html("<tr><th>tree</th><td colspan='2' class='sha1'>");
186 tmp = xstrdup(hex); 189 tmp = xstrdup(hex);
187 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, 190 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
188 cgit_query_head, tmp, NULL); 191 cgit_query_head, tmp, NULL);
189 html("</td></tr>\n"); 192 html("</td></tr>\n");
190 for (p = commit->parents; p ; p = p->next) { 193 for (p = commit->parents; p ; p = p->next) {
191 parent = lookup_commit_reference(p->item->object.sha1); 194 parent = lookup_commit_reference(p->item->object.sha1);
192 if (!parent) { 195 if (!parent) {
193 html("<tr><td colspan='3'>"); 196 html("<tr><td colspan='3'>");
194 cgit_print_error("Error reading parent commit"); 197 cgit_print_error("Error reading parent commit");
195 html("</td></tr>"); 198 html("</td></tr>");
196 continue; 199 continue;
197 } 200 }
198 html("<tr><th>parent</th>" 201 html("<tr><th>parent</th>"
199 "<td colspan='2' class='sha1'>" 202 "<td colspan='2' class='sha1'>"
200 "<a href='"); 203 "<a href='");
201 query = fmt("h=%s", sha1_to_hex(p->item->object.sha1)); 204 query = fmt("h=%s", sha1_to_hex(p->item->object.sha1));
202 html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); 205 html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
203 htmlf("'>%s</a> (<a href='", 206 htmlf("'>%s</a> (<a href='",
204 sha1_to_hex(p->item->object.sha1)); 207 sha1_to_hex(p->item->object.sha1));
205 query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1), 208 query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1),
206 sha1_to_hex(commit->tree->object.sha1)); 209 sha1_to_hex(commit->tree->object.sha1));
207 html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); 210 html_attr(cgit_pageurl(cgit_query_repo, "diff", query));
208 html("'>diff</a>)</td></tr>"); 211 html("'>diff</a>)</td></tr>");
209 } 212 }
210 if (cgit_repo->snapshots) { 213 if (cgit_repo->snapshots) {
211 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='");
212 filename = fmt("%s-%s.zip", cgit_query_repo, hex); 215 filename = fmt("%s-%s.zip", cgit_query_repo, hex);
213 html_attr(cgit_pageurl(cgit_query_repo, "snapshot", 216 html_attr(cgit_pageurl(cgit_query_repo, "snapshot",
214 fmt("id=%s&amp;name=%s", hex, filename))); 217 fmt("id=%s&amp;name=%s", hex, filename)));
215 htmlf("'>%s</a></td></tr>", filename); 218 htmlf("'>%s</a></td></tr>", filename);
216 } 219 }
217 html("</table>\n"); 220 html("</table>\n");
218 html("<div class='commit-subject'>"); 221 html("<div class='commit-subject'>");
219 html_txt(info->subject); 222 html_txt(info->subject);
220 html("</div>"); 223 html("</div>");
221 html("<div class='commit-msg'>"); 224 html("<div class='commit-msg'>");
222 html_txt(info->msg); 225 html_txt(info->msg);
223 html("</div>"); 226 html("</div>");
224 if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { 227 if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
225 html("<div class='diffstat-header'>Diffstat</div>"); 228 html("<div class='diffstat-header'>Diffstat</div>");
226 html("<table class='diffstat'>"); 229 html("<table class='diffstat'>");
227 max_changes = 0; 230 max_changes = 0;
228 cgit_diff_commit(commit, inspect_filepair); 231 cgit_diff_commit(commit, inspect_filepair);
229 for(i = 0; i<files; i++) 232 for(i = 0; i<files; i++)
230 print_fileinfo(&items[i]); 233 print_fileinfo(&items[i]);
231 html("</table>"); 234 html("</table>");
232 html("<div class='diffstat-summary'>"); 235 html("<div class='diffstat-summary'>");
233 htmlf("%d files changed, %d insertions, %d deletions (", 236 htmlf("%d files changed, %d insertions, %d deletions (",
234 files, total_adds, total_rems); 237 files, total_adds, total_rems);
235 query = fmt("h=%s", hex); 238 query = fmt("h=%s", hex);
236 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL); 239 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL);
237 html("show diff</a>)"); 240 html("show diff</a>)");
238 html("</div>"); 241 html("</div>");
239 } 242 }
240 cgit_free_commitinfo(info); 243 cgit_free_commitinfo(info);
241} 244}