Merge branch 'ag/atom-fixes'
Lars Hjemli hjemli@gmail.com
Sat, 19 Jun 2010 11:42:12 +0200
5 files changed,
15 insertions(+),
2 deletions(-)
M
cgit.c
→
cgit.c
@@ -169,6 +169,8 @@ else if (!strcmp(name, "commit-filter"))
ctx.cfg.commit_filter = new_filter(value, 0); else if (!strcmp(name, "embedded")) ctx.cfg.embedded = atoi(value); + else if (!strcmp(name, "max-atom-items")) + ctx.cfg.max_atom_items = atoi(value); else if (!strcmp(name, "max-message-length")) ctx.cfg.max_msg_len = atoi(value); else if (!strcmp(name, "max-repodesc-length"))@@ -254,6 +256,8 @@ } else if (!strcmp(name, "period")) {
ctx.qry.period = xstrdup(value); } else if (!strcmp(name, "ss")) { ctx.qry.ssdiff = atoi(value); + } else if (!strcmp(name, "all")) { + ctx.qry.show_all = atoi(value); } }@@ -296,6 +300,7 @@ ctx->cfg.section = "";
ctx->cfg.summary_branches = 10; ctx->cfg.summary_log = 10; ctx->cfg.summary_tags = 10; + ctx->cfg.max_atom_items = 10; ctx->cfg.ssdiff = 0; ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
M
cgit.h
→
cgit.h
@@ -146,6 +146,7 @@ int nohead;
char *sort; int showmsg; int ssdiff; + int show_all; }; struct cgit_config {@@ -185,6 +186,7 @@ int enable_remote_branches;
int enable_subject_links; int enable_tree_linenumbers; int local_time; + int max_atom_items; int max_repo_count; int max_commit_count; int max_lock_attempts;
M
cgitrc.5.txt
→
cgitrc.5.txt
@@ -172,6 +172,10 @@ Url loaded when clicking on the cgit logo image. If unspecified the
calculated url of the repository index page will be used. Default value: none. +max-atom-items:: + Specifies the number of items to display in atom feeds view. Default + value: "10". + max-commit-count:: Specifies the number of entries to list per page in "log" view. Default value: "50".