Merge branch 'stable'

[cgit.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index 6cc91e62b4ec557ff9e2e877442fd637a1557a78..8914fa50132b7e87ffc6caa9bfd58a93eedff02c 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -8,11 +8,16 @@
 
 #include "cgit.h"
 #include "cmd.h"
 
 #include "cgit.h"
 #include "cmd.h"

+#include "cache.h"
+#include "ui-shared.h"
+#include "ui-atom.h"

 #include "ui-blob.h"
 #include "ui-blob.h"

+#include "ui-clone.h"

 #include "ui-commit.h"
 #include "ui-diff.h"
 #include "ui-log.h"
 #include "ui-patch.h"
 #include "ui-commit.h"
 #include "ui-diff.h"
 #include "ui-log.h"
 #include "ui-patch.h"

+#include "ui-plain.h"

 #include "ui-refs.h"
 #include "ui-repolist.h"
 #include "ui-snapshot.h"
 #include "ui-refs.h"
 #include "ui-repolist.h"
 #include "ui-snapshot.h"


@@ -20,6 +25,16 @@
 #include "ui-tag.h"
 #include "ui-tree.h"
 
 #include "ui-tag.h"
 #include "ui-tree.h"
 

+static void HEAD_fn(struct cgit_context *ctx)
+{
+       cgit_clone_head(ctx);
+}
+
+static void atom_fn(struct cgit_context *ctx)
+{
+       cgit_print_atom(ctx->qry.head, ctx->qry.path, 10);
+}
+

 static void about_fn(struct cgit_context *ctx)
 {
        if (ctx->repo)
 static void about_fn(struct cgit_context *ctx)
 {
        if (ctx->repo)


@@ -30,7 +45,7 @@ static void about_fn(struct cgit_context *ctx)
 
 static void blob_fn(struct cgit_context *ctx)
 {
 
 static void blob_fn(struct cgit_context *ctx)
 {

-       cgit_print_blob(ctx->qry.sha1, ctx->qry.path);
+       cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head);

 }
 
 static void commit_fn(struct cgit_context *ctx)
 }
 
 static void commit_fn(struct cgit_context *ctx)


@@ -43,9 +58,9 @@ 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);
 }
 

-static void repolist_fn(struct cgit_context *ctx)
+static void info_fn(struct cgit_context *ctx)

 {
 {

-       cgit_print_repolist();
+       cgit_clone_info(ctx);

 }
 
 static void log_fn(struct cgit_context *ctx)
 }
 
 static void log_fn(struct cgit_context *ctx)


@@ -54,11 +69,34 @@ static void log_fn(struct cgit_context *ctx)
                       ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1);
 }
 
                       ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1);
 }
 

+static void ls_cache_fn(struct cgit_context *ctx)
+{
+       ctx->page.mimetype = "text/plain";
+       ctx->page.filename = "ls-cache.txt";
+       cgit_print_http_headers(ctx);
+       cache_ls(ctx->cfg.cache_root);
+}
+
+static void objects_fn(struct cgit_context *ctx)
+{
+       cgit_clone_objects(ctx);
+}
+
+static void repolist_fn(struct cgit_context *ctx)
+{
+       cgit_print_repolist();
+}
+

 static void patch_fn(struct cgit_context *ctx)
 {
        cgit_print_patch(ctx->qry.sha1);
 }
 
 static void patch_fn(struct cgit_context *ctx)
 {
        cgit_print_patch(ctx->qry.sha1);
 }
 

+static void plain_fn(struct cgit_context *ctx)
+{
+       cgit_print_plain(ctx);
+}
+

 static void refs_fn(struct cgit_context *ctx)
 {
        cgit_print_refs();
 static void refs_fn(struct cgit_context *ctx)
 {
        cgit_print_refs();


@@ -66,9 +104,8 @@ static void refs_fn(struct cgit_context *ctx)
 
 static void snapshot_fn(struct cgit_context *ctx)
 {
 
 static void snapshot_fn(struct cgit_context *ctx)
 {

-       cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1,
-                           cgit_repobasename(ctx->repo->url), ctx->qry.path,
-                           ctx->repo->snapshots);
+       cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, ctx->qry.path,
+                           ctx->repo->snapshots, ctx->qry.nohead);

 }
 
 static void summary_fn(struct cgit_context *ctx)
 }
 
 static void summary_fn(struct cgit_context *ctx)


@@ -92,12 +129,18 @@ static void tree_fn(struct cgit_context *ctx)
 struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
 {
        static struct cgit_cmd cmds[] = {
 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(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(log, 1, 1),

+               def_cmd(ls_cache, 0, 0),
+               def_cmd(objects, 1, 0),

                def_cmd(patch, 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(refs, 1, 1),
                def_cmd(repolist, 0, 0),
                def_cmd(snapshot, 1, 0),