aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2008-09-02 05:40:24 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2008-09-02 05:40:24 (JST)
commit288d502b3d8e7fa916104b486bbb146521e5c716 (patch)
treeafa132f6c973ab30e0b8ed1201fb691fe91103c0
parent2cecf839a06ce951db0d5d95abf79004eff33ca7 (diff)
parent02a545e63454530c1639014d3239c14ced2022c6 (diff)
downloadcgit-288d502b3d8e7fa916104b486bbb146521e5c716.zip
cgit-288d502b3d8e7fa916104b486bbb146521e5c716.tar.gz
Merge branch 'lh/clone'
* lh/clone: Add support for cloning over http Conflicts: cmd.c
-rw-r--r--Makefile1
-rw-r--r--cmd.c19
-rw-r--r--html.c7
-rw-r--r--html.h1
-rw-r--r--ui-clone.c104
-rw-r--r--ui-clone.h8
6 files changed, 140 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1163b02..b002d44 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,7 @@ OBJECTS += parsing.o
57OBJECTS += shared.o 57OBJECTS += shared.o
58OBJECTS += ui-atom.o 58OBJECTS += ui-atom.o
59OBJECTS += ui-blob.o 59OBJECTS += ui-blob.o
60OBJECTS += ui-clone.o
60OBJECTS += ui-commit.o 61OBJECTS += ui-commit.o
61OBJECTS += ui-diff.o 62OBJECTS += ui-diff.o
62OBJECTS += ui-log.o 63OBJECTS += ui-log.o
diff --git a/cmd.c b/cmd.c
index c0e4db3..40ac53e 100644
--- a/cmd.c
+++ b/cmd.c
@@ -12,6 +12,7 @@
12#include "ui-shared.h" 12#include "ui-shared.h"
13#include "ui-atom.h" 13#include "ui-atom.h"
14#include "ui-blob.h" 14#include "ui-blob.h"
15#include "ui-clone.h"
15#include "ui-commit.h" 16#include "ui-commit.h"
16#include "ui-diff.h" 17#include "ui-diff.h"
17#include "ui-log.h" 18#include "ui-log.h"
@@ -23,6 +24,11 @@
23#include "ui-tag.h" 24#include "ui-tag.h"
24#include "ui-tree.h" 25#include "ui-tree.h"
25 26
27static void HEAD_fn(struct cgit_context *ctx)
28{
29 cgit_clone_head(ctx);
30}
31
26static void atom_fn(struct cgit_context *ctx) 32static void atom_fn(struct cgit_context *ctx)
27{ 33{
28 cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); 34 cgit_print_atom(ctx->qry.head, ctx->qry.path, 10);
@@ -51,6 +57,11 @@ static void diff_fn(struct cgit_context *ctx)
51 cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); 57 cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path);
52} 58}
53 59
60static void info_fn(struct cgit_context *ctx)
61{
62 cgit_clone_info(ctx);
63}
64
54static void log_fn(struct cgit_context *ctx) 65static void log_fn(struct cgit_context *ctx)
55{ 66{
56 cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, 67 cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count,
@@ -65,6 +76,11 @@ static void ls_cache_fn(struct cgit_context *ctx)
65 cache_ls(ctx->cfg.cache_root); 76 cache_ls(ctx->cfg.cache_root);
66} 77}
67 78
79static void objects_fn(struct cgit_context *ctx)
80{
81 cgit_clone_objects(ctx);
82}
83
68static void repolist_fn(struct cgit_context *ctx) 84static void repolist_fn(struct cgit_context *ctx)
69{ 85{
70 cgit_print_repolist(); 86 cgit_print_repolist();
@@ -108,13 +124,16 @@ static void tree_fn(struct cgit_context *ctx)
108struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) 124struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
109{ 125{
110 static struct cgit_cmd cmds[] = { 126 static struct cgit_cmd cmds[] = {
127 def_cmd(HEAD, 1, 0),
111 def_cmd(atom, 1, 0), 128 def_cmd(atom, 1, 0),
112 def_cmd(about, 0, 1), 129 def_cmd(about, 0, 1),
113 def_cmd(blob, 1, 0), 130 def_cmd(blob, 1, 0),
114 def_cmd(commit, 1, 1), 131 def_cmd(commit, 1, 1),
115 def_cmd(diff, 1, 1), 132 def_cmd(diff, 1, 1),
133 def_cmd(info, 1, 0),
116 def_cmd(log, 1, 1), 134 def_cmd(log, 1, 1),
117 def_cmd(ls_cache, 0, 0), 135 def_cmd(ls_cache, 0, 0),
136 def_cmd(objects, 1, 0),
118 def_cmd(patch, 1, 0), 137 def_cmd(patch, 1, 0),
119 def_cmd(refs, 1, 1), 138 def_cmd(refs, 1, 1),
120 def_cmd(repolist, 0, 0), 139 def_cmd(repolist, 0, 0),
diff --git a/html.c b/html.c
index bddb04d..1237076 100644
--- a/html.c
+++ b/html.c
@@ -51,6 +51,13 @@ void htmlf(const char *format, ...)
51 html(buf); 51 html(buf);
52} 52}
53 53
54void html_status(int code, int more_headers)
55{
56 htmlf("Status: %d\n", code);
57 if (!more_headers)
58 html("\n");
59}
60
54void html_txt(char *txt) 61void html_txt(char *txt)
55{ 62{
56 char *t = txt; 63 char *t = txt;
diff --git a/html.h b/html.h
index e6fdc54..2bde28d 100644
--- a/html.h
+++ b/html.h
@@ -5,6 +5,7 @@ extern int htmlfd;
5 5
6extern void html(const char *txt); 6extern void html(const char *txt);
7extern void htmlf(const char *format,...); 7extern void htmlf(const char *format,...);
8extern void html_status(int code, int more_headers);
8extern void html_txt(char *txt); 9extern void html_txt(char *txt);
9extern void html_ntxt(int len, char *txt); 10extern void html_ntxt(int len, char *txt);
10extern void html_attr(char *txt); 11extern void html_attr(char *txt);
diff --git a/ui-clone.c b/ui-clone.c
new file mode 100644
index 0000000..3a037ad
--- /dev/null
+++ b/ui-clone.c
@@ -0,0 +1,104 @@
1/* ui-clone.c: functions for http cloning, based on
2 * git's http-backend.c by Shawn O. Pearce
3 *
4 * Copyright (C) 2008 Lars Hjemli
5 *
6 * Licensed under GNU General Public License v2
7 * (see COPYING for full license text)
8 */
9
10#include "cgit.h"
11#include "html.h"
12#include "ui-shared.h"
13
14static int print_ref_info(const char *refname, const unsigned char *sha1,
15 int flags, void *cb_data)
16{
17 struct object *obj;
18
19 if (!(obj = parse_object(sha1)))
20 return 0;
21
22 if (!strcmp(refname, "HEAD") || !prefixcmp(refname, "refs/heads/"))
23 htmlf("%s\t%s\n", sha1_to_hex(sha1), refname);
24 else if (!prefixcmp(refname, "refs/tags") && obj->type == OBJ_TAG) {
25 if (!(obj = deref_tag(obj, refname, 0)))
26 return 0;
27 htmlf("%s\t%s\n", sha1_to_hex(sha1), refname);
28 htmlf("%s\t%s^{}\n", sha1_to_hex(obj->sha1), refname);
29 }
30 return 0;
31}
32
33static void print_pack_info(struct cgit_context *ctx)
34{
35 struct packed_git *pack;
36 int ofs;
37
38 ctx->page.mimetype = "text/plain";
39 ctx->page.filename = "objects/info/packs";
40 cgit_print_http_headers(ctx);
41 ofs = strlen(ctx->repo->path) + strlen("/objects/pack/");
42 prepare_packed_git();
43 for (pack = packed_git; pack; pack = pack->next)
44 if (pack->pack_local)
45 htmlf("P %s\n", pack->pack_name + ofs);
46}
47
48static void send_file(struct cgit_context *ctx, char *path)
49{
50 struct stat st;
51 int err;
52
53 if (stat(path, &st)) {
54 switch (errno) {
55 case ENOENT:
56 err = 404;
57 break;
58 case EACCES:
59 err = 403;
60 break;
61 default:
62 err = 400;
63 }
64 html_status(err, 0);
65 return;
66 }
67 ctx->page.mimetype = "application/octet-stream";
68 ctx->page.filename = path;
69 if (prefixcmp(ctx->repo->path, path))
70 ctx->page.filename += strlen(ctx->repo->path) + 1;
71 cgit_print_http_headers(ctx);
72 html_include(path);
73}
74
75void cgit_clone_info(struct cgit_context *ctx)
76{
77 if (!ctx->qry.path || strcmp(ctx->qry.path, "refs"))
78 return;
79
80 ctx->page.mimetype = "text/plain";
81 ctx->page.filename = "info/refs";
82 cgit_print_http_headers(ctx);
83 for_each_ref(print_ref_info, ctx);
84}
85
86void cgit_clone_objects(struct cgit_context *ctx)
87{
88 if (!ctx->qry.path) {
89 html_status(400, 0);
90 return;
91 }
92
93 if (!strcmp(ctx->qry.path, "info/packs")) {
94 print_pack_info(ctx);
95 return;
96 }
97
98 send_file(ctx, git_path("objects/%s", ctx->qry.path));
99}
100
101void cgit_clone_head(struct cgit_context *ctx)
102{
103 send_file(ctx, git_path("%s", "HEAD"));
104}
diff --git a/ui-clone.h b/ui-clone.h
new file mode 100644
index 0000000..89cd4f1
--- /dev/null
+++ b/ui-clone.h
@@ -0,0 +1,8 @@
1#ifndef UI_CLONE_H
2#define UI_CLONE_H
3
4void cgit_clone_info(struct cgit_context *ctx);
5void cgit_clone_objects(struct cgit_context *ctx);
6void cgit_clone_head(struct cgit_context *ctx);
7
8#endif /* UI_CLONE_H */