aboutsummaryrefslogtreecommitdiffstats
path: root/ui-commit.c
diff options
context:
space:
mode:
Diffstat (limited to 'ui-commit.c')
-rw-r--r--ui-commit.c78
1 files changed, 32 insertions, 46 deletions
diff --git a/ui-commit.c b/ui-commit.c
index 1d12bbb..90e09ed 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -11,6 +11,7 @@
11static int files, slots; 11static int files, slots;
12static int total_adds, total_rems, max_changes; 12static int total_adds, total_rems, max_changes;
13static int lines_added, lines_removed; 13static int lines_added, lines_removed;
14static char *curr_rev;
14 15
15static struct fileinfo { 16static struct fileinfo {
16 char status; 17 char status;
@@ -27,7 +28,6 @@ static struct fileinfo {
27 28
28void print_fileinfo(struct fileinfo *info) 29void print_fileinfo(struct fileinfo *info)
29{ 30{
30 char *query, *query2;
31 char *class; 31 char *class;
32 32
33 switch (info->status) { 33 switch (info->status) {
@@ -75,24 +75,12 @@ void print_fileinfo(struct fileinfo *info)
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 cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
79 sha1_to_hex(info->new_sha1), info->new_path); 79 info->new_path);
80 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), 80 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
81 NULL, NULL); 81 htmlf(" (%s from %s)",
82 if (info->status == DIFF_STATUS_COPIED || 82 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
83 info->status == DIFF_STATUS_RENAMED) { 83 info->old_path);
84 html_txt(info->new_path);
85 htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ?
86 "copied" : "renamed");
87 query2 = fmt("id=%s", sha1_to_hex(info->old_sha1));
88 html_link_open(cgit_pageurl(cgit_query_repo, "view", query2),
89 NULL, NULL);
90 html_txt(info->old_path);
91 html("</a>)");
92 } else {
93 html_txt(info->new_path);
94 html("</a>");
95 }
96 html("</td><td class='right'>"); 84 html("</td><td class='right'>");
97 htmlf("%d", info->added + info->removed); 85 htmlf("%d", info->added + info->removed);
98 html("</td><td class='graph'>"); 86 html("</td><td class='graph'>");
@@ -145,16 +133,19 @@ void inspect_filepair(struct diff_filepair *pair)
145} 133}
146 134
147 135
148void cgit_print_commit(const char *hex) 136void cgit_print_commit(char *hex)
149{ 137{
150 struct commit *commit, *parent; 138 struct commit *commit, *parent;
151 struct commitinfo *info; 139 struct commitinfo *info;
152 struct commit_list *p; 140 struct commit_list *p;
153 unsigned char sha1[20]; 141 unsigned char sha1[20];
154 char *query; 142 char *tmp;
155 char *filename;
156 int i; 143 int i;
157 144
145 if (!hex)
146 hex = cgit_query_head;
147 curr_rev = hex;
148
158 if (get_sha1(hex, sha1)) { 149 if (get_sha1(hex, sha1)) {
159 cgit_print_error(fmt("Bad object id: %s", hex)); 150 cgit_print_error(fmt("Bad object id: %s", hex));
160 return; 151 return;
@@ -181,11 +172,11 @@ void cgit_print_commit(const char *hex)
181 html("</td><td class='right'>"); 172 html("</td><td class='right'>");
182 cgit_print_date(info->committer_date, FMT_LONGDATE); 173 cgit_print_date(info->committer_date, FMT_LONGDATE);
183 html("</td></tr>\n"); 174 html("</td></tr>\n");
184 html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); 175 html("<tr><th>tree</th><td colspan='2' class='sha1'>");
185 query = fmt("h=%s&amp;id=%s", sha1_to_hex(commit->object.sha1), 176 tmp = xstrdup(hex);
186 sha1_to_hex(commit->tree->object.sha1)); 177 cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
187 html_attr(cgit_pageurl(cgit_query_repo, "tree", query)); 178 cgit_query_head, tmp, NULL);
188 htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); 179 html("</td></tr>\n");
189 for (p = commit->parents; p ; p = p->next) { 180 for (p = commit->parents; p ; p = p->next) {
190 parent = lookup_commit_reference(p->item->object.sha1); 181 parent = lookup_commit_reference(p->item->object.sha1);
191 if (!parent) { 182 if (!parent) {
@@ -195,23 +186,19 @@ void cgit_print_commit(const char *hex)
195 continue; 186 continue;
196 } 187 }
197 html("<tr><th>parent</th>" 188 html("<tr><th>parent</th>"
198 "<td colspan='2' class='sha1'>" 189 "<td colspan='2' class='sha1'>");
199 "<a href='"); 190 cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
200 query = fmt("h=%s", sha1_to_hex(p->item->object.sha1)); 191 cgit_query_head, sha1_to_hex(p->item->object.sha1));
201 html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); 192 html(" (");
202 htmlf("'>%s</a> (<a href='", 193 cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex,
203 sha1_to_hex(p->item->object.sha1)); 194 sha1_to_hex(p->item->object.sha1), NULL);
204 query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1), 195 html(")</td></tr>");
205 sha1_to_hex(commit->tree->object.sha1));
206 html_attr(cgit_pageurl(cgit_query_repo, "diff", query));
207 html("'>diff</a>)</td></tr>");
208 } 196 }
209 if (cgit_repo->snapshots) { 197 if (cgit_repo->snapshots) {
210 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); 198 html("<tr><th>download</th><td colspan='2' class='sha1'>");
211 filename = fmt("%s-%s.zip", cgit_query_repo, hex); 199 cgit_print_snapshot_links(cgit_query_repo, cgit_query_head,
212 html_attr(cgit_pageurl(cgit_query_repo, "snapshot", 200 hex, cgit_repo->snapshots);
213 fmt("id=%s&amp;name=%s", hex, filename))); 201 html("</td></tr>");
214 htmlf("'>%s</a></td></tr>", filename);
215 } 202 }
216 html("</table>\n"); 203 html("</table>\n");
217 html("<div class='commit-subject'>"); 204 html("<div class='commit-subject'>");
@@ -231,10 +218,9 @@ void cgit_print_commit(const char *hex)
231 html("<div class='diffstat-summary'>"); 218 html("<div class='diffstat-summary'>");
232 htmlf("%d files changed, %d insertions, %d deletions (", 219 htmlf("%d files changed, %d insertions, %d deletions (",
233 files, total_adds, total_rems); 220 files, total_adds, total_rems);
234 query = fmt("h=%s", hex); 221 cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex,
235 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL); 222 NULL, NULL);
236 html("show diff</a>)"); 223 html(")</div>");
237 html("</div>");
238 } 224 }
239 cgit_free_commitinfo(info); 225 cgit_free_commitinfo(info);
240} 226}