author | Lars Hjemli <hjemli@gmail.com> | 2007-06-16 18:20:42 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-16 18:20:42 (UTC) |
commit | ffc69736a606fd8f9a10468cce48b9a37b428944 (patch) (unidiff) | |
tree | b080c702391244a525fa0e7c97758f7f7fa0c383 /ui-commit.c | |
parent | 849f0f0f02f858e21fbe59295846e51628f82915 (diff) | |
download | cgit-ffc69736a606fd8f9a10468cce48b9a37b428944.zip cgit-ffc69736a606fd8f9a10468cce48b9a37b428944.tar.gz cgit-ffc69736a606fd8f9a10468cce48b9a37b428944.tar.bz2 |
ui-tree: unify with ui-view, use path to select tree/blob
This teaches ui-tree to show both trees and blobs, thereby making ui-view
superfluous. At the same time, ui-tree is extended to honour the specified
path instead of requiering a tree/blob sha1.
-rw-r--r-- | ui-commit.c | 3 |
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 | |||
@@ -169,34 +169,33 @@ void cgit_print_commit(const char *hex) | |||
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&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='", |