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-log.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-log.c | 32 |
1 files changed, 17 insertions, 15 deletions
@@ -9,2 +9,4 @@ | |||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | ||
11 | #include "ui-shared.h" | ||
10 | 12 | ||
@@ -27,3 +29,3 @@ void inspect_files(struct diff_filepair *pair) | |||
27 | files++; | 29 | files++; |
28 | if (cgit_repo->enable_log_linecount) | 30 | if (ctx.repo->enable_log_linecount) |
29 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); | 31 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); |
@@ -39,5 +41,5 @@ void print_commit(struct commit *commit) | |||
39 | html("</td><td>"); | 41 | html("</td><td>"); |
40 | cgit_commit_link(info->subject, NULL, NULL, cgit_query_head, | 42 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
41 | sha1_to_hex(commit->object.sha1)); | 43 | sha1_to_hex(commit->object.sha1)); |
42 | if (cgit_repo->enable_log_filecount) { | 44 | if (ctx.repo->enable_log_filecount) { |
43 | files = 0; | 45 | files = 0; |
@@ -48,3 +50,3 @@ void print_commit(struct commit *commit) | |||
48 | htmlf("%d", files); | 50 | htmlf("%d", files); |
49 | if (cgit_repo->enable_log_linecount) { | 51 | if (ctx.repo->enable_log_linecount) { |
50 | html("</td><td class='right'>"); | 52 | html("</td><td class='right'>"); |
@@ -69,3 +71,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
69 | if (!tip) | 71 | if (!tip) |
70 | argv[1] = cgit_query_head; | 72 | argv[1] = ctx.qry.head; |
71 | 73 | ||
@@ -96,5 +98,5 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
96 | 98 | ||
97 | if (cgit_repo->enable_log_filecount) { | 99 | if (ctx.repo->enable_log_filecount) { |
98 | html("<th class='right'>Files</th>"); | 100 | html("<th class='right'>Files</th>"); |
99 | if (cgit_repo->enable_log_linecount) | 101 | if (ctx.repo->enable_log_linecount) |
100 | html("<th class='right'>Lines</th>"); | 102 | html("<th class='right'>Lines</th>"); |
@@ -125,6 +127,6 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
125 | if (ofs > 0) { | 127 | if (ofs > 0) { |
126 | cgit_log_link("[prev]", NULL, NULL, cgit_query_head, | 128 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, |
127 | cgit_query_sha1, cgit_query_path, | 129 | ctx.qry.sha1, ctx.qry.path, |
128 | ofs - cnt, cgit_query_grep, | 130 | ofs - cnt, ctx.qry.grep, |
129 | cgit_query_search); | 131 | ctx.qry.search); |
130 | html(" "); | 132 | html(" "); |
@@ -132,6 +134,6 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
132 | if ((commit = get_revision(&rev)) != NULL) { | 134 | if ((commit = get_revision(&rev)) != NULL) { |
133 | cgit_log_link("[next]", NULL, NULL, cgit_query_head, | 135 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, |
134 | cgit_query_sha1, cgit_query_path, | 136 | ctx.qry.sha1, ctx.qry.path, |
135 | ofs + cnt, cgit_query_grep, | 137 | ofs + cnt, ctx.qry.grep, |
136 | cgit_query_search); | 138 | ctx.qry.search); |
137 | } | 139 | } |