diff options
-rw-r--r-- | cgit.c | 5 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | cgitrc.5.txt | 4 | ||||
-rw-r--r-- | cmd.c | 2 | ||||
-rw-r--r-- | ui-atom.c | 4 |
5 files changed, 15 insertions, 2 deletions
diff --git a/cgit.c b/cgit.c index 6ccf4aa..38bc136 100644 --- a/cgit.c +++ b/cgit.c | |||
@@ -169,6 +169,8 @@ void config_cb(const char *name, const char *value) | |||
169 | ctx.cfg.commit_filter = new_filter(value, 0); | 169 | ctx.cfg.commit_filter = new_filter(value, 0); |
170 | else if (!strcmp(name, "embedded")) | 170 | else if (!strcmp(name, "embedded")) |
171 | ctx.cfg.embedded = atoi(value); | 171 | ctx.cfg.embedded = atoi(value); |
172 | else if (!strcmp(name, "max-atom-items")) | ||
173 | ctx.cfg.max_atom_items = atoi(value); | ||
172 | else if (!strcmp(name, "max-message-length")) | 174 | else if (!strcmp(name, "max-message-length")) |
173 | ctx.cfg.max_msg_len = atoi(value); | 175 | ctx.cfg.max_msg_len = atoi(value); |
174 | else if (!strcmp(name, "max-repodesc-length")) | 176 | else if (!strcmp(name, "max-repodesc-length")) |
@@ -254,6 +256,8 @@ static void querystring_cb(const char *name, const char *value) | |||
254 | ctx.qry.period = xstrdup(value); | 256 | ctx.qry.period = xstrdup(value); |
255 | } else if (!strcmp(name, "ss")) { | 257 | } else if (!strcmp(name, "ss")) { |
256 | ctx.qry.ssdiff = atoi(value); | 258 | ctx.qry.ssdiff = atoi(value); |
259 | } else if (!strcmp(name, "all")) { | ||
260 | ctx.qry.show_all = atoi(value); | ||
257 | } | 261 | } |
258 | } | 262 | } |
259 | 263 | ||
@@ -296,6 +300,7 @@ static void prepare_context(struct cgit_context *ctx) | |||
296 | ctx->cfg.summary_branches = 10; | 300 | ctx->cfg.summary_branches = 10; |
297 | ctx->cfg.summary_log = 10; | 301 | ctx->cfg.summary_log = 10; |
298 | ctx->cfg.summary_tags = 10; | 302 | ctx->cfg.summary_tags = 10; |
303 | ctx->cfg.max_atom_items = 10; | ||
299 | ctx->cfg.ssdiff = 0; | 304 | ctx->cfg.ssdiff = 0; |
300 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 305 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
301 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 306 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
diff --git a/cgit.h b/cgit.h index 9b1e3f8..8884f9e 100644 --- a/cgit.h +++ b/cgit.h | |||
@@ -146,6 +146,7 @@ struct cgit_query { | |||
146 | char *sort; | 146 | char *sort; |
147 | int showmsg; | 147 | int showmsg; |
148 | int ssdiff; | 148 | int ssdiff; |
149 | int show_all; | ||
149 | }; | 150 | }; |
150 | 151 | ||
151 | struct cgit_config { | 152 | struct cgit_config { |
@@ -185,6 +186,7 @@ struct cgit_config { | |||
185 | int enable_subject_links; | 186 | int enable_subject_links; |
186 | int enable_tree_linenumbers; | 187 | int enable_tree_linenumbers; |
187 | int local_time; | 188 | int local_time; |
189 | int max_atom_items; | ||
188 | int max_repo_count; | 190 | int max_repo_count; |
189 | int max_commit_count; | 191 | int max_commit_count; |
190 | int max_lock_attempts; | 192 | int max_lock_attempts; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index fcd4308..5c24381 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -172,6 +172,10 @@ logo-link:: | |||
172 | calculated url of the repository index page will be used. Default | 172 | calculated url of the repository index page will be used. Default |
173 | value: none. | 173 | value: none. |
174 | 174 | ||
175 | max-atom-items:: | ||
176 | Specifies the number of items to display in atom feeds view. Default | ||
177 | value: "10". | ||
178 | |||
175 | max-commit-count:: | 179 | max-commit-count:: |
176 | Specifies the number of entries to list per page in "log" view. Default | 180 | Specifies the number of entries to list per page in "log" view. Default |
177 | value: "50". | 181 | value: "50". |
diff --git a/cmd.c b/cmd.c index 766f903..ad784fc 100644 --- a/cmd.c +++ b/cmd.c | |||
@@ -33,7 +33,7 @@ static void HEAD_fn(struct cgit_context *ctx) | |||
33 | 33 | ||
34 | static void atom_fn(struct cgit_context *ctx) | 34 | static void atom_fn(struct cgit_context *ctx) |
35 | { | 35 | { |
36 | cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); | 36 | cgit_print_atom(ctx->qry.head, ctx->qry.path, ctx->cfg.max_atom_items); |
37 | } | 37 | } |
38 | 38 | ||
39 | static void about_fn(struct cgit_context *ctx) | 39 | static void about_fn(struct cgit_context *ctx) |
diff --git a/ui-atom.c b/ui-atom.c index 808b2d0..9f049ae 100644 --- a/ui-atom.c +++ b/ui-atom.c | |||
@@ -85,7 +85,9 @@ void cgit_print_atom(char *tip, char *path, int max_count) | |||
85 | struct rev_info rev; | 85 | struct rev_info rev; |
86 | int argc = 2; | 86 | int argc = 2; |
87 | 87 | ||
88 | if (!tip) | 88 | if (ctx.qry.show_all) |
89 | argv[1] = "--all"; | ||
90 | else if (!tip) | ||
89 | argv[1] = ctx.qry.head; | 91 | argv[1] = ctx.qry.head; |
90 | 92 | ||
91 | if (path) { | 93 | if (path) { |