Merge branch 'stable'

[cgit.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index 766f90397b89d2407574f3e2bf7056df68b43add..5a3d1574556e5a09510b891482ef38b22b0ca8a6 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -33,7 +33,7 @@ static void HEAD_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)
@@ -51,12 +51,12 @@ static void blob_fn(struct cgit_context *ctx)
 
 static void commit_fn(struct cgit_context *ctx)
 {
-       cgit_print_commit(ctx->qry.sha1);
+       cgit_print_commit(ctx->qry.sha1, ctx->qry.path);
 }
 
 static void diff_fn(struct cgit_context *ctx)
 {
-       cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path);
+       cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path, 1);
 }
 
 static void info_fn(struct cgit_context *ctx)
@@ -67,7 +67,8 @@ static void info_fn(struct cgit_context *ctx)
 static void log_fn(struct cgit_context *ctx)
 {
        cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count,
-                      ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1);
+                      ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1,
+                      ctx->repo->enable_commit_graph);
 }
 
 static void ls_cache_fn(struct cgit_context *ctx)
@@ -90,7 +91,7 @@ static void repolist_fn(struct cgit_context *ctx)
 
 static void patch_fn(struct cgit_context *ctx)
 {
-       cgit_print_patch(ctx->qry.sha1);
+       cgit_print_patch(ctx->qry.sha1, ctx->qry.path);
 }
 
 static void plain_fn(struct cgit_context *ctx)
@@ -129,31 +130,31 @@ static void tree_fn(struct cgit_context *ctx)
        cgit_print_tree(ctx->qry.sha1, ctx->qry.path);
 }
 
-#define def_cmd(name, want_repo, want_layout) \
-       {#name, name##_fn, want_repo, want_layout}
+#define def_cmd(name, want_repo, want_layout, want_vpath, is_clone) \
+       {#name, name##_fn, want_repo, want_layout, want_vpath, is_clone}
 
 struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
 {
        static struct cgit_cmd cmds[] = {
-               def_cmd(HEAD, 1, 0),
-               def_cmd(atom, 1, 0),
-               def_cmd(about, 0, 1),
-               def_cmd(blob, 1, 0),
-               def_cmd(commit, 1, 1),
-               def_cmd(diff, 1, 1),
-               def_cmd(info, 1, 0),
-               def_cmd(log, 1, 1),
-               def_cmd(ls_cache, 0, 0),
-               def_cmd(objects, 1, 0),
-               def_cmd(patch, 1, 0),
-               def_cmd(plain, 1, 0),
-               def_cmd(refs, 1, 1),
-               def_cmd(repolist, 0, 0),
-               def_cmd(snapshot, 1, 0),
-               def_cmd(stats, 1, 1),
-               def_cmd(summary, 1, 1),
-               def_cmd(tag, 1, 1),
-               def_cmd(tree, 1, 1),
+               def_cmd(HEAD, 1, 0, 0, 1),
+               def_cmd(atom, 1, 0, 0, 0),
+               def_cmd(about, 0, 1, 0, 0),
+               def_cmd(blob, 1, 0, 0, 0),
+               def_cmd(commit, 1, 1, 1, 0),
+               def_cmd(diff, 1, 1, 1, 0),
+               def_cmd(info, 1, 0, 0, 1),
+               def_cmd(log, 1, 1, 1, 0),
+               def_cmd(ls_cache, 0, 0, 0, 0),
+               def_cmd(objects, 1, 0, 0, 1),
+               def_cmd(patch, 1, 0, 1, 0),
+               def_cmd(plain, 1, 0, 0, 0),
+               def_cmd(refs, 1, 1, 0, 0),
+               def_cmd(repolist, 0, 0, 0, 0),
+               def_cmd(snapshot, 1, 0, 0, 0),
+               def_cmd(stats, 1, 1, 1, 0),
+               def_cmd(summary, 1, 1, 0, 0),
+               def_cmd(tag, 1, 1, 0, 0),
+               def_cmd(tree, 1, 1, 1, 0),
        };
        int i;