git: update to v2.32.0

[cgit.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index d280e95fb0928b853fdf33ad68edcd56273d9018..0eb75b1da87761ab935e14a40d301d1a30244eb9 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -1,6 +1,6 @@
 /* cmd.c: the cgit command dispatcher
  *
- * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
+ * Copyright (C) 2006-2017 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -11,6 +11,7 @@
 #include "cache.h"
 #include "ui-shared.h"
 #include "ui-atom.h"
+#include "ui-blame.h"
 #include "ui-blob.h"
 #include "ui-clone.h"
 #include "ui-commit.h"
@@ -63,24 +64,32 @@ static void about_fn(void)
                cgit_print_site_readme();
 }
 
+static void blame_fn(void)
+{
+       if (ctx.repo->enable_blame)
+               cgit_print_blame();
+       else
+               cgit_print_error_page(403, "Forbidden", "Blame is disabled");
+}
+
 static void blob_fn(void)
 {
-       cgit_print_blob(ctx.qry.sha1, ctx.qry.path, ctx.qry.head, 0);
+       cgit_print_blob(ctx.qry.oid, ctx.qry.path, ctx.qry.head, 0);
 }
 
 static void commit_fn(void)
 {
-       cgit_print_commit(ctx.qry.sha1, ctx.qry.path);
+       cgit_print_commit(ctx.qry.oid, ctx.qry.path);
 }
 
 static void diff_fn(void)
 {
-       cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1, 0);
+       cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 1, 0);
 }
 
 static void rawdiff_fn(void)
 {
-       cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1, 1);
+       cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 1, 1);
 }
 
 static void info_fn(void)
@@ -90,7 +99,7 @@ static void info_fn(void)
 
 static void log_fn(void)
 {
-       cgit_print_log(ctx.qry.sha1, ctx.qry.ofs, ctx.cfg.max_commit_count,
+       cgit_print_log(ctx.qry.oid, ctx.qry.ofs, ctx.cfg.max_commit_count,
                       ctx.qry.grep, ctx.qry.search, ctx.qry.path, 1,
                       ctx.repo->enable_commit_graph,
                       ctx.repo->commit_sort);
@@ -116,7 +125,7 @@ static void repolist_fn(void)
 
 static void patch_fn(void)
 {
-       cgit_print_patch(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path);
+       cgit_print_patch(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path);
 }
 
 static void plain_fn(void)
@@ -131,7 +140,7 @@ static void refs_fn(void)
 
 static void snapshot_fn(void)
 {
-       cgit_print_snapshot(ctx.qry.head, ctx.qry.sha1, ctx.qry.path,
+       cgit_print_snapshot(ctx.qry.head, ctx.qry.oid, ctx.qry.path,
                            ctx.qry.nohead);
 }
 
@@ -147,12 +156,12 @@ static void summary_fn(void)
 
 static void tag_fn(void)
 {
-       cgit_print_tag(ctx.qry.sha1);
+       cgit_print_tag(ctx.qry.oid);
 }
 
 static void tree_fn(void)
 {
-       cgit_print_tree(ctx.qry.sha1, ctx.qry.path);
+       cgit_print_tree(ctx.qry.oid, ctx.qry.path);
 }
 
 #define def_cmd(name, want_repo, want_vpath, is_clone) \
@@ -164,6 +173,7 @@ struct cgit_cmd *cgit_get_cmd(void)
                def_cmd(HEAD, 1, 0, 1),
                def_cmd(atom, 1, 0, 0),
                def_cmd(about, 0, 0, 0),
+               def_cmd(blame, 1, 1, 0),
                def_cmd(blob, 1, 0, 0),
                def_cmd(commit, 1, 1, 0),
                def_cmd(diff, 1, 1, 0),