summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h1
-rw-r--r--shared.c3
-rw-r--r--ui-summary.c10
3 files changed, 11 insertions, 3 deletions
diff --git a/cgit.h b/cgit.h
index 75e919b..53e1336 100644
--- a/cgit.h
+++ b/cgit.h
@@ -134,24 +134,25 @@ extern char *cgit_repo_group;
134extern int cgit_nocache; 134extern int cgit_nocache;
135extern int cgit_snapshots; 135extern int cgit_snapshots;
136extern int cgit_enable_index_links; 136extern int cgit_enable_index_links;
137extern int cgit_enable_log_filecount; 137extern int cgit_enable_log_filecount;
138extern int cgit_enable_log_linecount; 138extern int cgit_enable_log_linecount;
139extern int cgit_max_lock_attempts; 139extern int cgit_max_lock_attempts;
140extern int cgit_cache_root_ttl; 140extern int cgit_cache_root_ttl;
141extern int cgit_cache_repo_ttl; 141extern int cgit_cache_repo_ttl;
142extern int cgit_cache_dynamic_ttl; 142extern int cgit_cache_dynamic_ttl;
143extern int cgit_cache_static_ttl; 143extern int cgit_cache_static_ttl;
144extern int cgit_cache_max_create_time; 144extern int cgit_cache_max_create_time;
145extern int cgit_summary_log; 145extern int cgit_summary_log;
146extern int cgit_summary_tags;
146 147
147extern int cgit_max_msg_len; 148extern int cgit_max_msg_len;
148extern int cgit_max_repodesc_len; 149extern int cgit_max_repodesc_len;
149extern int cgit_max_commit_count; 150extern int cgit_max_commit_count;
150 151
151extern int cgit_query_has_symref; 152extern int cgit_query_has_symref;
152extern int cgit_query_has_sha1; 153extern int cgit_query_has_sha1;
153 154
154extern char *cgit_querystring; 155extern char *cgit_querystring;
155extern char *cgit_query_repo; 156extern char *cgit_query_repo;
156extern char *cgit_query_page; 157extern char *cgit_query_page;
157extern char *cgit_query_search; 158extern char *cgit_query_search;
diff --git a/shared.c b/shared.c
index d815cb1..7e5eaba 100644
--- a/shared.c
+++ b/shared.c
@@ -29,24 +29,25 @@ char *cgit_repo_group = NULL;
29int cgit_nocache = 0; 29int cgit_nocache = 0;
30int cgit_snapshots = 0; 30int cgit_snapshots = 0;
31int cgit_enable_index_links = 0; 31int cgit_enable_index_links = 0;
32int cgit_enable_log_filecount = 0; 32int cgit_enable_log_filecount = 0;
33int cgit_enable_log_linecount = 0; 33int cgit_enable_log_linecount = 0;
34int cgit_max_lock_attempts = 5; 34int cgit_max_lock_attempts = 5;
35int cgit_cache_root_ttl = 5; 35int cgit_cache_root_ttl = 5;
36int cgit_cache_repo_ttl = 5; 36int cgit_cache_repo_ttl = 5;
37int cgit_cache_dynamic_ttl = 5; 37int cgit_cache_dynamic_ttl = 5;
38int cgit_cache_static_ttl = -1; 38int cgit_cache_static_ttl = -1;
39int cgit_cache_max_create_time = 5; 39int cgit_cache_max_create_time = 5;
40int cgit_summary_log = 0; 40int cgit_summary_log = 0;
41int cgit_summary_tags = 0;
41int cgit_renamelimit = -1; 42int cgit_renamelimit = -1;
42 43
43int cgit_max_msg_len = 60; 44int cgit_max_msg_len = 60;
44int cgit_max_repodesc_len = 60; 45int cgit_max_repodesc_len = 60;
45int cgit_max_commit_count = 50; 46int cgit_max_commit_count = 50;
46 47
47int cgit_query_has_symref = 0; 48int cgit_query_has_symref = 0;
48int cgit_query_has_sha1 = 0; 49int cgit_query_has_sha1 = 0;
49 50
50char *cgit_querystring = NULL; 51char *cgit_querystring = NULL;
51char *cgit_query_repo = NULL; 52char *cgit_query_repo = NULL;
52char *cgit_query_page = NULL; 53char *cgit_query_page = NULL;
@@ -172,24 +173,26 @@ void cgit_global_config_cb(const char *name, const char *value)
172 else if (!strcmp(name, "cache-static-ttl")) 173 else if (!strcmp(name, "cache-static-ttl"))
173 cgit_cache_static_ttl = atoi(value); 174 cgit_cache_static_ttl = atoi(value);
174 else if (!strcmp(name, "cache-dynamic-ttl")) 175 else if (!strcmp(name, "cache-dynamic-ttl"))
175 cgit_cache_dynamic_ttl = atoi(value); 176 cgit_cache_dynamic_ttl = atoi(value);
176 else if (!strcmp(name, "max-message-length")) 177 else if (!strcmp(name, "max-message-length"))
177 cgit_max_msg_len = atoi(value); 178 cgit_max_msg_len = atoi(value);
178 else if (!strcmp(name, "max-repodesc-length")) 179 else if (!strcmp(name, "max-repodesc-length"))
179 cgit_max_repodesc_len = atoi(value); 180 cgit_max_repodesc_len = atoi(value);
180 else if (!strcmp(name, "max-commit-count")) 181 else if (!strcmp(name, "max-commit-count"))
181 cgit_max_commit_count = atoi(value); 182 cgit_max_commit_count = atoi(value);
182 else if (!strcmp(name, "summary-log")) 183 else if (!strcmp(name, "summary-log"))
183 cgit_summary_log = atoi(value); 184 cgit_summary_log = atoi(value);
185 else if (!strcmp(name, "summary-tags"))
186 cgit_summary_tags = atoi(value);
184 else if (!strcmp(name, "agefile")) 187 else if (!strcmp(name, "agefile"))
185 cgit_agefile = xstrdup(value); 188 cgit_agefile = xstrdup(value);
186 else if (!strcmp(name, "renamelimit")) 189 else if (!strcmp(name, "renamelimit"))
187 cgit_renamelimit = atoi(value); 190 cgit_renamelimit = atoi(value);
188 else if (!strcmp(name, "repo.group")) 191 else if (!strcmp(name, "repo.group"))
189 cgit_repo_group = xstrdup(value); 192 cgit_repo_group = xstrdup(value);
190 else if (!strcmp(name, "repo.url")) 193 else if (!strcmp(name, "repo.url"))
191 cgit_repo = add_repo(value); 194 cgit_repo = add_repo(value);
192 else if (!strcmp(name, "repo.name")) 195 else if (!strcmp(name, "repo.name"))
193 cgit_repo->name = xstrdup(value); 196 cgit_repo->name = xstrdup(value);
194 else if (cgit_repo && !strcmp(name, "repo.path")) 197 else if (cgit_repo && !strcmp(name, "repo.path"))
195 cgit_repo->path = trim_end(value, '/'); 198 cgit_repo->path = trim_end(value, '/');
diff --git a/ui-summary.c b/ui-summary.c
index 43582da..3d5eda8 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -153,38 +153,42 @@ static void cgit_print_branches()
153 html("<tr class='nohover'><th class='left'>Branch</th>" 153 html("<tr class='nohover'><th class='left'>Branch</th>"
154 "<th class='left'>Idle</th>" 154 "<th class='left'>Idle</th>"
155 "<th class='left'>Author</th>" 155 "<th class='left'>Author</th>"
156 "<th class='left'>Head commit</th></tr>\n"); 156 "<th class='left'>Head commit</th></tr>\n");
157 157
158 list.refs = NULL; 158 list.refs = NULL;
159 list.alloc = list.count = 0; 159 list.alloc = list.count = 0;
160 for_each_branch_ref(cgit_refs_cb, &list); 160 for_each_branch_ref(cgit_refs_cb, &list);
161 for(i=0; i<list.count; i++) 161 for(i=0; i<list.count; i++)
162 cgit_print_branch(list.refs[i]); 162 cgit_print_branch(list.refs[i]);
163} 163}
164 164
165static void cgit_print_tags() 165static void cgit_print_tags(int maxcount)
166{ 166{
167 struct reflist list; 167 struct reflist list;
168 int i; 168 int i;
169 169
170 header = 0; 170 header = 0;
171 list.refs = NULL; 171 list.refs = NULL;
172 list.alloc = list.count = 0; 172 list.alloc = list.count = 0;
173 for_each_tag_ref(cgit_refs_cb, &list); 173 for_each_tag_ref(cgit_refs_cb, &list);
174 if (list.count == 0) 174 if (list.count == 0)
175 return; 175 return;
176 qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age); 176 qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age);
177 if (!maxcount)
178 maxcount = list.count;
179 else if (maxcount > list.count)
180 maxcount = list.count;
177 print_tag_header(); 181 print_tag_header();
178 for(i=0; i<list.count; i++) 182 for(i=0; i<maxcount; i++)
179 print_tag(list.refs[i]); 183 print_tag(list.refs[i]);
180} 184}
181 185
182static void cgit_print_archives() 186static void cgit_print_archives()
183{ 187{
184 header = 0; 188 header = 0;
185 for_each_ref(cgit_print_archive_cb, NULL); 189 for_each_ref(cgit_print_archive_cb, NULL);
186 if (header) 190 if (header)
187 html("</table>"); 191 html("</table>");
188} 192}
189 193
190void cgit_print_summary() 194void cgit_print_summary()
@@ -197,15 +201,15 @@ void cgit_print_summary()
197 html_txt(cgit_repo->desc); 201 html_txt(cgit_repo->desc);
198 html("</h2>"); 202 html("</h2>");
199 if (cgit_repo->readme) 203 if (cgit_repo->readme)
200 html_include(cgit_repo->readme); 204 html_include(cgit_repo->readme);
201 html("</div>"); 205 html("</div>");
202 if (cgit_summary_log > 0) 206 if (cgit_summary_log > 0)
203 cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0); 207 cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0);
204 html("<table class='list nowrap'>"); 208 html("<table class='list nowrap'>");
205 if (cgit_summary_log > 0) 209 if (cgit_summary_log > 0)
206 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 210 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
207 cgit_print_branches(); 211 cgit_print_branches();
208 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 212 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
209 cgit_print_tags(); 213 cgit_print_tags(cgit_summary_tags);
210 html("</table>"); 214 html("</table>");
211} 215}