summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-13 15:15:06 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-13 15:15:06 (UTC)
commitc6cf3a424a0860d69b290254d9b19d35527b2d27 (patch) (unidiff)
tree2874f2c42e907cba1187ae32ee686daebc2de59e
parent80e577c3ef2a73becabff7e9c9c242f317a87de9 (diff)
downloadcgit-c6cf3a424a0860d69b290254d9b19d35527b2d27.zip
cgit-c6cf3a424a0860d69b290254d9b19d35527b2d27.tar.gz
cgit-c6cf3a424a0860d69b290254d9b19d35527b2d27.tar.bz2
Add max-commit-count parameter to cgitrc
This enabled customizing number of commits shown per page in log view. It also changes the default from 100 to 50, mainly due to the more cpu intensive log pages (number of files/lines changed) but also since 100 log messages requires excessive scrolling. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c4
-rw-r--r--cgit.h1
-rw-r--r--cgitrc4
-rw-r--r--shared.c3
4 files changed, 10 insertions, 2 deletions
diff --git a/cgit.c b/cgit.c
index 28bab8d..aee7ba3 100644
--- a/cgit.c
+++ b/cgit.c
@@ -104,14 +104,14 @@ static void cgit_print_repo_page(struct cacheitem *item)
104 return; 104 return;
105 } 105 }
106 106
107 cgit_print_pageheader(cgit_query_page, show_search); 107 cgit_print_pageheader(cgit_query_page, show_search);
108 108
109 if (!strcmp(cgit_query_page, "log")) { 109 if (!strcmp(cgit_query_page, "log")) {
110 cgit_print_log(cgit_query_head, cgit_query_ofs, 100, 110 cgit_print_log(cgit_query_head, cgit_query_ofs,
111 cgit_query_search); 111 cgit_max_commit_count, cgit_query_search);
112 } else if (!strcmp(cgit_query_page, "tree")) { 112 } else if (!strcmp(cgit_query_page, "tree")) {
113 cgit_print_tree(cgit_query_sha1, cgit_query_path); 113 cgit_print_tree(cgit_query_sha1, cgit_query_path);
114 } else if (!strcmp(cgit_query_page, "commit")) { 114 } else if (!strcmp(cgit_query_page, "commit")) {
115 cgit_print_commit(cgit_query_sha1); 115 cgit_print_commit(cgit_query_sha1);
116 } else if (!strcmp(cgit_query_page, "view")) { 116 } else if (!strcmp(cgit_query_page, "view")) {
117 cgit_print_view(cgit_query_sha1, cgit_query_path); 117 cgit_print_view(cgit_query_sha1, cgit_query_path);
diff --git a/cgit.h b/cgit.h
index 43de375..46f3173 100644
--- a/cgit.h
+++ b/cgit.h
@@ -84,12 +84,13 @@ extern int cgit_cache_root_ttl;
84extern int cgit_cache_repo_ttl; 84extern int cgit_cache_repo_ttl;
85extern int cgit_cache_dynamic_ttl; 85extern int cgit_cache_dynamic_ttl;
86extern int cgit_cache_static_ttl; 86extern int cgit_cache_static_ttl;
87extern int cgit_cache_max_create_time; 87extern int cgit_cache_max_create_time;
88 88
89extern int cgit_max_msg_len; 89extern int cgit_max_msg_len;
90extern int cgit_max_commit_count;
90 91
91extern char *cgit_repo_name; 92extern char *cgit_repo_name;
92extern char *cgit_repo_desc; 93extern char *cgit_repo_desc;
93extern char *cgit_repo_owner; 94extern char *cgit_repo_owner;
94 95
95extern int cgit_query_has_symref; 96extern int cgit_query_has_symref;
diff --git a/cgitrc b/cgitrc
index f217b39..019781e 100644
--- a/cgitrc
+++ b/cgitrc
@@ -52,12 +52,16 @@
52 52
53 53
54## Number of chars shown of commit subject message (in log view) 54## Number of chars shown of commit subject message (in log view)
55#max-message-length=60 55#max-message-length=60
56 56
57 57
58## Number of commits per page in log view
59#max-commit-count=50
60
61
58## Root of cached output 62## Root of cached output
59#cache-root=/var/cache/cgit 63#cache-root=/var/cache/cgit
60 64
61 65
62## 66##
63## Time-To-Live settings: specifies how long (in minutes) different pages 67## Time-To-Live settings: specifies how long (in minutes) different pages
diff --git a/shared.c b/shared.c
index 801f68d..ffecac8 100644
--- a/shared.c
+++ b/shared.c
@@ -27,12 +27,13 @@ int cgit_cache_root_ttl = 5;
27int cgit_cache_repo_ttl = 5; 27int cgit_cache_repo_ttl = 5;
28int cgit_cache_dynamic_ttl = 5; 28int cgit_cache_dynamic_ttl = 5;
29int cgit_cache_static_ttl = -1; 29int cgit_cache_static_ttl = -1;
30int cgit_cache_max_create_time = 5; 30int cgit_cache_max_create_time = 5;
31 31
32int cgit_max_msg_len = 60; 32int cgit_max_msg_len = 60;
33int cgit_max_commit_count = 50;
33 34
34char *cgit_repo_name = NULL; 35char *cgit_repo_name = NULL;
35char *cgit_repo_desc = NULL; 36char *cgit_repo_desc = NULL;
36char *cgit_repo_owner = NULL; 37char *cgit_repo_owner = NULL;
37 38
38int cgit_query_has_symref = 0; 39int cgit_query_has_symref = 0;
@@ -117,12 +118,14 @@ void cgit_global_config_cb(const char *name, const char *value)
117 else if (!strcmp(name, "cache-static-ttl")) 118 else if (!strcmp(name, "cache-static-ttl"))
118 cgit_cache_static_ttl = atoi(value); 119 cgit_cache_static_ttl = atoi(value);
119 else if (!strcmp(name, "cache-dynamic-ttl")) 120 else if (!strcmp(name, "cache-dynamic-ttl"))
120 cgit_cache_dynamic_ttl = atoi(value); 121 cgit_cache_dynamic_ttl = atoi(value);
121 else if (!strcmp(name, "max-message-length")) 122 else if (!strcmp(name, "max-message-length"))
122 cgit_max_msg_len = atoi(value); 123 cgit_max_msg_len = atoi(value);
124 else if (!strcmp(name, "max-commit-count"))
125 cgit_max_commit_count = atoi(value);
123 else if (!strcmp(name, "repo.url")) 126 else if (!strcmp(name, "repo.url"))
124 cgit_repo = add_repo(value); 127 cgit_repo = add_repo(value);
125 else if (!strcmp(name, "repo.name")) 128 else if (!strcmp(name, "repo.name"))
126 cgit_repo->name = xstrdup(value); 129 cgit_repo->name = xstrdup(value);
127 else if (cgit_repo && !strcmp(name, "repo.path")) 130 else if (cgit_repo && !strcmp(name, "repo.path"))
128 cgit_repo->path = xstrdup(value); 131 cgit_repo->path = xstrdup(value);