-rw-r--r-- | ui-commit.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/ui-commit.c b/ui-commit.c index bd55a33..8019e36 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -8,4 +8,6 @@ | |||
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | ||
11 | #include "ui-shared.h" | ||
10 | 12 | ||
11 | static int files, slots; | 13 | static int files, slots; |
@@ -63,7 +65,7 @@ void print_fileinfo(struct fileinfo *info) | |||
63 | htmlf("<td class='mode'>"); | 65 | htmlf("<td class='mode'>"); |
64 | if (is_null_sha1(info->new_sha1)) { | 66 | if (is_null_sha1(info->new_sha1)) { |
65 | html_filemode(info->old_mode); | 67 | cgit_print_filemode(info->old_mode); |
66 | } else { | 68 | } else { |
67 | html_filemode(info->new_mode); | 69 | cgit_print_filemode(info->new_mode); |
68 | } | 70 | } |
69 | 71 | ||
@@ -72,9 +74,9 @@ void print_fileinfo(struct fileinfo *info) | |||
72 | !is_null_sha1(info->new_sha1)) { | 74 | !is_null_sha1(info->new_sha1)) { |
73 | html("<span class='modechange'>["); | 75 | html("<span class='modechange'>["); |
74 | html_filemode(info->old_mode); | 76 | cgit_print_filemode(info->old_mode); |
75 | html("]</span>"); | 77 | html("]</span>"); |
76 | } | 78 | } |
77 | htmlf("</td><td class='%s'>", class); | 79 | htmlf("</td><td class='%s'>", class); |
78 | cgit_diff_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev, | 80 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev, |
79 | NULL, info->new_path); | 81 | NULL, info->new_path); |
80 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) | 82 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
@@ -144,5 +146,5 @@ void cgit_print_commit(char *hex) | |||
144 | 146 | ||
145 | if (!hex) | 147 | if (!hex) |
146 | hex = cgit_query_head; | 148 | hex = ctx.qry.head; |
147 | curr_rev = hex; | 149 | curr_rev = hex; |
148 | 150 | ||
@@ -176,5 +178,5 @@ void cgit_print_commit(char *hex) | |||
176 | tmp = xstrdup(hex); | 178 | tmp = xstrdup(hex); |
177 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, | 179 | cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL, |
178 | cgit_query_head, tmp, NULL); | 180 | ctx.qry.head, tmp, NULL); |
179 | html("</td></tr>\n"); | 181 | html("</td></tr>\n"); |
180 | for (p = commit->parents; p ; p = p->next) { | 182 | for (p = commit->parents; p ; p = p->next) { |
@@ -189,14 +191,14 @@ void cgit_print_commit(char *hex) | |||
189 | "<td colspan='2' class='sha1'>"); | 191 | "<td colspan='2' class='sha1'>"); |
190 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, | 192 | cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, |
191 | cgit_query_head, sha1_to_hex(p->item->object.sha1)); | 193 | ctx.qry.head, sha1_to_hex(p->item->object.sha1)); |
192 | html(" ("); | 194 | html(" ("); |
193 | cgit_diff_link("diff", NULL, NULL, cgit_query_head, hex, | 195 | cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, |
194 | sha1_to_hex(p->item->object.sha1), NULL); | 196 | sha1_to_hex(p->item->object.sha1), NULL); |
195 | html(")</td></tr>"); | 197 | html(")</td></tr>"); |
196 | } | 198 | } |
197 | if (cgit_repo->snapshots) { | 199 | if (ctx.repo->snapshots) { |
198 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); | 200 | html("<tr><th>download</th><td colspan='2' class='sha1'>"); |
199 | cgit_print_snapshot_links(cgit_query_repo, cgit_query_head, | 201 | cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, |
200 | hex, cgit_repo->snapshots); | 202 | hex, ctx.repo->snapshots); |
201 | html("</td></tr>"); | 203 | html("</td></tr>"); |
202 | } | 204 | } |
@@ -219,5 +221,5 @@ void cgit_print_commit(char *hex) | |||
219 | htmlf("%d files changed, %d insertions, %d deletions (", | 221 | htmlf("%d files changed, %d insertions, %d deletions (", |
220 | files, total_adds, total_rems); | 222 | files, total_adds, total_rems); |
221 | cgit_diff_link("show diff", NULL, NULL, cgit_query_head, hex, | 223 | cgit_diff_link("show diff", NULL, NULL, ctx.qry.head, hex, |
222 | NULL, NULL); | 224 | NULL, NULL); |
223 | html(")</div>"); | 225 | html(")</div>"); |