git: update to v2.31.1

[cgit.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index 188cd5681b16bfe728c6e71fedb90438782d218b..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"
@@ -38,30 +39,57 @@ static void atom_fn(void)
 
 static void about_fn(void)
 {
-       if (ctx.repo)
-               cgit_print_repo_readme(ctx.qry.path);
-       else
+       if (ctx.repo) {
+               size_t path_info_len = ctx.env.path_info ? strlen(ctx.env.path_info) : 0;
+               if (!ctx.qry.path &&
+                   ctx.qry.url[strlen(ctx.qry.url) - 1] != '/' &&
+                   (!path_info_len || ctx.env.path_info[path_info_len - 1] != '/')) {
+                       char *currenturl = cgit_currenturl();
+                       char *redirect = fmtalloc("%s/", currenturl);
+                       cgit_redirect(redirect, true);
+                       free(currenturl);
+                       free(redirect);
+               } else if (ctx.repo->readme.nr)
+                       cgit_print_repo_readme(ctx.qry.path);
+               else if (ctx.repo->homepage)
+                       cgit_redirect(ctx.repo->homepage, false);
+               else {
+                       char *currenturl = cgit_currenturl();
+                       char *redirect = fmtalloc("%s../", currenturl);
+                       cgit_redirect(redirect, false);
+                       free(currenturl);
+                       free(redirect);
+               }
+       } else
                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)
@@ -71,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);
@@ -97,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)
@@ -112,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);
 }
 
@@ -128,40 +156,41 @@ 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_layout, want_vpath, is_clone) \
-       {#name, name##_fn, want_repo, want_layout, want_vpath, is_clone}
+#define def_cmd(name, want_repo, want_vpath, is_clone) \
+       {#name, name##_fn, want_repo, want_vpath, is_clone}
 
 struct cgit_cmd *cgit_get_cmd(void)
 {
        static struct cgit_cmd cmds[] = {
-               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(rawdiff, 1, 0, 1, 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),
+               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),
+               def_cmd(info, 1, 0, 1),
+               def_cmd(log, 1, 1, 0),
+               def_cmd(ls_cache, 0, 0, 0),
+               def_cmd(objects, 1, 0, 1),
+               def_cmd(patch, 1, 1, 0),
+               def_cmd(plain, 1, 0, 0),
+               def_cmd(rawdiff, 1, 1, 0),
+               def_cmd(refs, 1, 0, 0),
+               def_cmd(repolist, 0, 0, 0),
+               def_cmd(snapshot, 1, 0, 0),
+               def_cmd(stats, 1, 1, 0),
+               def_cmd(summary, 1, 0, 0),
+               def_cmd(tag, 1, 0, 0),
+               def_cmd(tree, 1, 1, 0),
        };
        int i;