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