author | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 09:42:12 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 09:42:12 (UTC) |
commit | c2766deb67acb1eae2b36dc0f5811a9cabb6db20 (patch) (unidiff) | |
tree | 463ea4a4388f2c449dec9eb49b33f9c0942030d1 | |
parent | caf0825d97582d137387b8879867247e92cca022 (diff) | |
parent | 80476b0d2873eb212fad38487fd6189bd6629cbe (diff) | |
download | cgit-c2766deb67acb1eae2b36dc0f5811a9cabb6db20.zip cgit-c2766deb67acb1eae2b36dc0f5811a9cabb6db20.tar.gz cgit-c2766deb67acb1eae2b36dc0f5811a9cabb6db20.tar.bz2 |
Merge branch 'ag/atom-fixes'
-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
@@ -170,4 +170,6 @@ void config_cb(const char *name, const char *value) | |||
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); |
@@ -255,4 +257,6 @@ static void querystring_cb(const char *name, const char *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 | } |
@@ -297,4 +301,5 @@ static void prepare_context(struct cgit_context *ctx) | |||
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")); |
@@ -147,4 +147,5 @@ struct cgit_query { | |||
147 | int showmsg; | 147 | int showmsg; |
148 | int ssdiff; | 148 | int ssdiff; |
149 | int show_all; | ||
149 | }; | 150 | }; |
150 | 151 | ||
@@ -186,4 +187,5 @@ struct cgit_config { | |||
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; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index fcd4308..5c24381 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -173,4 +173,8 @@ logo-link:: | |||
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 |
@@ -34,5 +34,5 @@ static void HEAD_fn(struct cgit_context *ctx) | |||
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 | ||
@@ -86,5 +86,7 @@ void cgit_print_atom(char *tip, char *path, int max_count) | |||
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 | ||