aboutsummaryrefslogtreecommitdiffstats
path: root/ui-commit.c
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2008-04-09 04:29:21 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2008-04-09 04:29:21 (JST)
commit23296ad648c0e2a9e3cf40a3de322b10ad25cce3 (patch)
tree136493d8228b0ff4971feb06b0e8aee296367b00 /ui-commit.c
parente2a44cf0923398396b7a321d5ce894ad3bf6f580 (diff)
parentc6f747649ace1a92ed5dfaae9cc1ea3affe0bf51 (diff)
downloadcgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.zip
cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.gz
Merge branch 'lh/cleanup'
* lh/cleanup: (21 commits) Reset ctx.repo to NULL when the config parser is finished Move cgit_parse_query() from parsing.c to html.c as http_parse_querystring() Move function for configfile parsing into configfile.[ch] Add cache.h Remove global and obsolete cgit_cmd Makefile: copy the QUIET constructs from the Makefile in git.git Move cgit_version from shared.c to cgit.c Makefile: autobuild dependency rules Initial Makefile cleanup Move non-generic functions from shared.c to cgit.c Add ui-shared.h Add separate header-files for each page/view Refactor snapshot support Add command dispatcher Remove obsolete cacheitem parameter to ui-functions Add struct cgit_page to cgit_context Introduce html.h Improve initialization of git directory Move cgit_repo into cgit_context Add all config variables into struct cgit_context ...
Diffstat (limited to 'ui-commit.c')
-rw-r--r--ui-commit.c26
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
@@ -7,6 +7,8 @@
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h"
11#include "ui-shared.h"
10 12
11static int files, slots; 13static int files, slots;
12static int total_adds, total_rems, max_changes; 14static int total_adds, total_rems, max_changes;
@@ -62,20 +64,20 @@ void print_fileinfo(struct fileinfo *info)
62 html("<tr>"); 64 html("<tr>");
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
70 if (info->old_mode != info->new_mode && 72 if (info->old_mode != info->new_mode &&
71 !is_null_sha1(info->old_sha1) && 73 !is_null_sha1(info->old_sha1) &&
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)
81 htmlf(" (%s from %s)", 83 htmlf(" (%s from %s)",
@@ -143,7 +145,7 @@ void cgit_print_commit(char *hex)
143 int i; 145 int i;
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
149 if (get_sha1(hex, sha1)) { 151 if (get_sha1(hex, sha1)) {
@@ -175,7 +177,7 @@ void cgit_print_commit(char *hex)
175 html("<tr><th>tree</th><td colspan='2' class='sha1'>"); 177 html("<tr><th>tree</th><td colspan='2' class='sha1'>");
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) {
181 parent = lookup_commit_reference(p->item->object.sha1); 183 parent = lookup_commit_reference(p->item->object.sha1);
@@ -188,16 +190,16 @@ void cgit_print_commit(char *hex)
188 html("<tr><th>parent</th>" 190 html("<tr><th>parent</th>"
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 }
203 html("</table>\n"); 205 html("</table>\n");
@@ -218,7 +220,7 @@ void cgit_print_commit(char *hex)
218 html("<div class='diffstat-summary'>"); 220 html("<div class='diffstat-summary'>");
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>");
224 } 226 }