author | Lars Hjemli <hjemli@gmail.com> | 2008-04-08 19:29:21 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-08 19:29:21 (UTC) |
commit | 23296ad648c0e2a9e3cf40a3de322b10ad25cce3 (patch) (unidiff) | |
tree | 136493d8228b0ff4971feb06b0e8aee296367b00 /ui-commit.c | |
parent | e2a44cf0923398396b7a321d5ce894ad3bf6f580 (diff) | |
parent | c6f747649ace1a92ed5dfaae9cc1ea3affe0bf51 (diff) | |
download | cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.zip cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.gz cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.bz2 |
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
...
-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 | |||
@@ -9,2 +9,4 @@ | |||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | ||
11 | #include "ui-shared.h" | ||
10 | 12 | ||
@@ -64,5 +66,5 @@ void print_fileinfo(struct fileinfo *info) | |||
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 | } |
@@ -73,3 +75,3 @@ void print_fileinfo(struct fileinfo *info) | |||
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>"); |
@@ -77,3 +79,3 @@ void print_fileinfo(struct fileinfo *info) | |||
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); |
@@ -145,3 +147,3 @@ void cgit_print_commit(char *hex) | |||
145 | if (!hex) | 147 | if (!hex) |
146 | hex = cgit_query_head; | 148 | hex = ctx.qry.head; |
147 | curr_rev = hex; | 149 | curr_rev = hex; |
@@ -177,3 +179,3 @@ void cgit_print_commit(char *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"); |
@@ -190,5 +192,5 @@ void cgit_print_commit(char *hex) | |||
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); |
@@ -196,6 +198,6 @@ void cgit_print_commit(char *hex) | |||
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>"); |
@@ -220,3 +222,3 @@ void cgit_print_commit(char *hex) | |||
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); |