aboutsummaryrefslogtreecommitdiffstats
path: root/ui-log.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-log.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-log.c')
-rw-r--r--ui-log.c32
1 files changed, 17 insertions, 15 deletions
diff --git a/ui-log.c b/ui-log.c
index a41d2b2..60c9269 100644
--- a/ui-log.c
+++ b/ui-log.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
11int files, add_lines, rem_lines; 13int files, add_lines, rem_lines;
12 14
@@ -25,7 +27,7 @@ void count_lines(char *line, int size)
25void inspect_files(struct diff_filepair *pair) 27void inspect_files(struct diff_filepair *pair)
26{ 28{
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);
30} 32}
31 33
@@ -37,16 +39,16 @@ void print_commit(struct commit *commit)
37 html("<tr><td>"); 39 html("<tr><td>");
38 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); 40 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
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;
44 add_lines = 0; 46 add_lines = 0;
45 rem_lines = 0; 47 rem_lines = 0;
46 cgit_diff_commit(commit, inspect_files); 48 cgit_diff_commit(commit, inspect_files);
47 html("</td><td class='right'>"); 49 html("</td><td class='right'>");
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'>");
51 htmlf("-%d/+%d", rem_lines, add_lines); 53 htmlf("-%d/+%d", rem_lines, add_lines);
52 } 54 }
@@ -67,7 +69,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
67 int i; 69 int i;
68 70
69 if (!tip) 71 if (!tip)
70 argv[1] = cgit_query_head; 72 argv[1] = ctx.qry.head;
71 73
72 if (grep && pattern && (!strcmp(grep, "grep") || 74 if (grep && pattern && (!strcmp(grep, "grep") ||
73 !strcmp(grep, "author") || 75 !strcmp(grep, "author") ||
@@ -94,9 +96,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
94 html("<tr class='nohover'><th class='left'>Age</th>" 96 html("<tr class='nohover'><th class='left'>Age</th>"
95 "<th class='left'>Message</th>"); 97 "<th class='left'>Message</th>");
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>");
101 } 103 }
102 html("<th class='left'>Author</th></tr>\n"); 104 html("<th class='left'>Author</th></tr>\n");
@@ -123,17 +125,17 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
123 if (pager) { 125 if (pager) {
124 html("<div class='pager'>"); 126 html("<div class='pager'>");
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("&nbsp;"); 132 html("&nbsp;");
131 } 133 }
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 }
138 html("</div>"); 140 html("</div>");
139 } 141 }