Merge branch 'ag/atom-fixes'

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
@@ -171,2 +171,4 @@ void config_cb(const char *name, const char *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"))
@@ -256,2 +258,4 @@ static void querystring_cb(const char *name, const char *value)
                 ctx.qry.ssdiff = atoi(value);
+        } else if (!strcmp(name, "all")) {
+                ctx.qry.show_all = atoi(value);
         }
@@ -298,2 +302,3 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.summary_tags = 10;
+        ctx->cfg.max_atom_items = 10;
         ctx->cfg.ssdiff = 0;
diff --git a/cgit.h b/cgit.h
index 9b1e3f8..8884f9e 100644
--- a/cgit.h
+++ b/cgit.h
@@ -148,2 +148,3 @@ struct cgit_query {
         int ssdiff;
+        int show_all;
 };
@@ -187,2 +188,3 @@ struct cgit_config {
         int local_time;
+        int max_atom_items;
         int max_repo_count;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index fcd4308..5c24381 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -174,2 +174,6 @@ logo-link::
 
+max-atom-items::
+        Specifies the number of items to display in atom feeds view. Default
+        value: "10".
+
 max-commit-count::
diff --git a/cmd.c b/cmd.c
index 766f903..ad784fc 100644
--- a/cmd.c
+++ b/cmd.c
@@ -35,3 +35,3 @@ 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);
 }
diff --git a/ui-atom.c b/ui-atom.c
index 808b2d0..9f049ae 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -87,3 +87,5 @@ void cgit_print_atom(char *tip, char *path, int max_count)
 
-        if (!tip)
+        if (ctx.qry.show_all)
+                argv[1] = "--all";
+        else if (!tip)
                 argv[1] = ctx.qry.head;