Merge branch 'ag/atom-fixes'
Αυτή η υποβολή περιλαμβάνεται σε:
υποβολή
c2766deb67
5
cgit.c
5
cgit.c
@ -169,6 +169,8 @@ void config_cb(const char *name, const char *value)
|
|||||||
ctx.cfg.commit_filter = new_filter(value, 0);
|
ctx.cfg.commit_filter = new_filter(value, 0);
|
||||||
else if (!strcmp(name, "embedded"))
|
else if (!strcmp(name, "embedded"))
|
||||||
ctx.cfg.embedded = atoi(value);
|
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"))
|
else if (!strcmp(name, "max-message-length"))
|
||||||
ctx.cfg.max_msg_len = atoi(value);
|
ctx.cfg.max_msg_len = atoi(value);
|
||||||
else if (!strcmp(name, "max-repodesc-length"))
|
else if (!strcmp(name, "max-repodesc-length"))
|
||||||
@ -254,6 +256,8 @@ static void querystring_cb(const char *name, const char *value)
|
|||||||
ctx.qry.period = xstrdup(value);
|
ctx.qry.period = xstrdup(value);
|
||||||
} else if (!strcmp(name, "ss")) {
|
} else if (!strcmp(name, "ss")) {
|
||||||
ctx.qry.ssdiff = atoi(value);
|
ctx.qry.ssdiff = atoi(value);
|
||||||
|
} else if (!strcmp(name, "all")) {
|
||||||
|
ctx.qry.show_all = atoi(value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -296,6 +300,7 @@ static void prepare_context(struct cgit_context *ctx)
|
|||||||
ctx->cfg.summary_branches = 10;
|
ctx->cfg.summary_branches = 10;
|
||||||
ctx->cfg.summary_log = 10;
|
ctx->cfg.summary_log = 10;
|
||||||
ctx->cfg.summary_tags = 10;
|
ctx->cfg.summary_tags = 10;
|
||||||
|
ctx->cfg.max_atom_items = 10;
|
||||||
ctx->cfg.ssdiff = 0;
|
ctx->cfg.ssdiff = 0;
|
||||||
ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
|
ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
|
||||||
ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
|
ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
|
||||||
|
2
cgit.h
2
cgit.h
@ -146,6 +146,7 @@ struct cgit_query {
|
|||||||
char *sort;
|
char *sort;
|
||||||
int showmsg;
|
int showmsg;
|
||||||
int ssdiff;
|
int ssdiff;
|
||||||
|
int show_all;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct cgit_config {
|
struct cgit_config {
|
||||||
@ -185,6 +186,7 @@ struct cgit_config {
|
|||||||
int enable_subject_links;
|
int enable_subject_links;
|
||||||
int enable_tree_linenumbers;
|
int enable_tree_linenumbers;
|
||||||
int local_time;
|
int local_time;
|
||||||
|
int max_atom_items;
|
||||||
int max_repo_count;
|
int max_repo_count;
|
||||||
int max_commit_count;
|
int max_commit_count;
|
||||||
int max_lock_attempts;
|
int max_lock_attempts;
|
||||||
|
@ -172,6 +172,10 @@ logo-link::
|
|||||||
calculated url of the repository index page will be used. Default
|
calculated url of the repository index page will be used. Default
|
||||||
value: none.
|
value: none.
|
||||||
|
|
||||||
|
max-atom-items::
|
||||||
|
Specifies the number of items to display in atom feeds view. Default
|
||||||
|
value: "10".
|
||||||
|
|
||||||
max-commit-count::
|
max-commit-count::
|
||||||
Specifies the number of entries to list per page in "log" view. Default
|
Specifies the number of entries to list per page in "log" view. Default
|
||||||
value: "50".
|
value: "50".
|
||||||
|
2
cmd.c
2
cmd.c
@ -33,7 +33,7 @@ static void HEAD_fn(struct cgit_context *ctx)
|
|||||||
|
|
||||||
static void atom_fn(struct cgit_context *ctx)
|
static void atom_fn(struct cgit_context *ctx)
|
||||||
{
|
{
|
||||||
cgit_print_atom(ctx->qry.head, ctx->qry.path, 10);
|
cgit_print_atom(ctx->qry.head, ctx->qry.path, ctx->cfg.max_atom_items);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void about_fn(struct cgit_context *ctx)
|
static void about_fn(struct cgit_context *ctx)
|
||||||
|
@ -85,7 +85,9 @@ void cgit_print_atom(char *tip, char *path, int max_count)
|
|||||||
struct rev_info rev;
|
struct rev_info rev;
|
||||||
int argc = 2;
|
int argc = 2;
|
||||||
|
|
||||||
if (!tip)
|
if (ctx.qry.show_all)
|
||||||
|
argv[1] = "--all";
|
||||||
|
else if (!tip)
|
||||||
argv[1] = ctx.qry.head;
|
argv[1] = ctx.qry.head;
|
||||||
|
|
||||||
if (path) {
|
if (path) {
|
||||||
|
Φόρτωση…
Αναφορά σε νέο ζήτημα
Block a user