author | Lars Hjemli <hjemli@gmail.com> | 2007-06-17 13:44:22 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-17 13:44:22 (UTC) |
commit | faaca447b071592c9a1e1f14b4d0d2a39b4c795a (patch) (unidiff) | |
tree | 98c53a63df0fd01b4421201d7dadd5ee2351fb1b | |
parent | cd79c16844b4006d4fd6f4b82d2f6e7e19b20c8e (diff) | |
download | cgit-faaca447b071592c9a1e1f14b4d0d2a39b4c795a.zip cgit-faaca447b071592c9a1e1f14b4d0d2a39b4c795a.tar.gz cgit-faaca447b071592c9a1e1f14b4d0d2a39b4c795a.tar.bz2 |
ui-commit: use cgit_commit_link() for parent links
This replaces the old cgit_pageurl() function with the brand new
cgit_commit_link() function, making parent links in commit view preserve
the current branch.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-commit.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ui-commit.c b/ui-commit.c index 8864fc6..d489d7c 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -186,38 +186,36 @@ void cgit_print_commit(const char *hex) | |||
186 | cgit_print_date(info->committer_date, FMT_LONGDATE); | 186 | cgit_print_date(info->committer_date, FMT_LONGDATE); |
187 | html("</td></tr>\n"); | 187 | html("</td></tr>\n"); |
188 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); | 188 | html("<tr><th>tree</th><td colspan='2' class='sha1'>"); |
189 | tmp = xstrdup(hex); | 189 | tmp = xstrdup(hex); |
190 | 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, |
191 | cgit_query_head, tmp, NULL); | 191 | cgit_query_head, tmp, NULL); |
192 | html("</td></tr>\n"); | 192 | html("</td></tr>\n"); |
193 | for (p = commit->parents; p ; p = p->next) { | 193 | for (p = commit->parents; p ; p = p->next) { |
194 | parent = lookup_commit_reference(p->item->object.sha1); | 194 | parent = lookup_commit_reference(p->item->object.sha1); |
195 | if (!parent) { | 195 | if (!parent) { |
196 | html("<tr><td colspan='3'>"); | 196 | html("<tr><td colspan='3'>"); |
197 | cgit_print_error("Error reading parent commit"); | 197 | cgit_print_error("Error reading parent commit"); |
198 | html("</td></tr>"); | 198 | html("</td></tr>"); |
199 | continue; | 199 | continue; |
200 | } | 200 | } |
201 | html("<tr><th>parent</th>" | 201 | html("<tr><th>parent</th>" |
202 | "<td colspan='2' class='sha1'>" | 202 | "<td colspan='2' class='sha1'>"); |
203 | "<a href='"); | 203 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, |
204 | query = fmt("h=%s", sha1_to_hex(p->item->object.sha1)); | 204 | cgit_query_head, sha1_to_hex(p->item->object.sha1)); |
205 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); | 205 | html(" (<a href='"); |
206 | htmlf("'>%s</a> (<a href='", | ||
207 | sha1_to_hex(p->item->object.sha1)); | ||
208 | query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1), | 206 | query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1), |
209 | sha1_to_hex(commit->tree->object.sha1)); | 207 | sha1_to_hex(commit->tree->object.sha1)); |
210 | html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); | 208 | html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); |
211 | html("'>diff</a>)</td></tr>"); | 209 | html("'>diff</a>)</td></tr>"); |
212 | } | 210 | } |
213 | if (cgit_repo->snapshots) { | 211 | if (cgit_repo->snapshots) { |
214 | htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); | 212 | htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); |
215 | filename = fmt("%s-%s.zip", cgit_query_repo, hex); | 213 | filename = fmt("%s-%s.zip", cgit_query_repo, hex); |
216 | html_attr(cgit_pageurl(cgit_query_repo, "snapshot", | 214 | html_attr(cgit_pageurl(cgit_query_repo, "snapshot", |
217 | fmt("id=%s&name=%s", hex, filename))); | 215 | fmt("id=%s&name=%s", hex, filename))); |
218 | htmlf("'>%s</a></td></tr>", filename); | 216 | htmlf("'>%s</a></td></tr>", filename); |
219 | } | 217 | } |
220 | html("</table>\n"); | 218 | html("</table>\n"); |
221 | html("<div class='commit-subject'>"); | 219 | html("<div class='commit-subject'>"); |
222 | html_txt(info->subject); | 220 | html_txt(info->subject); |
223 | html("</div>"); | 221 | html("</div>"); |