author | Lars Hjemli <hjemli@gmail.com> | 2008-08-05 23:20:24 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-08-06 09:21:09 (UTC) |
commit | 02a545e63454530c1639014d3239c14ced2022c6 (patch) (unidiff) | |
tree | da4c89a94b117d936f2eeb486c9dedf192e6746e | |
parent | 0f0ab148c6d444316af10e6b4c7a60630fed45d3 (diff) | |
download | cgit-02a545e63454530c1639014d3239c14ced2022c6.zip cgit-02a545e63454530c1639014d3239c14ced2022c6.tar.gz cgit-02a545e63454530c1639014d3239c14ced2022c6.tar.bz2 |
Add support for cloning over http
This patch implements basic support for cloning over http, based on the
work on git-http-backend by Shawn O. Pearce.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | cmd.c | 19 | ||||
-rw-r--r-- | html.c | 7 | ||||
-rw-r--r-- | html.h | 1 | ||||
-rw-r--r-- | ui-clone.c | 104 | ||||
-rw-r--r-- | ui-clone.h | 8 |
6 files changed, 140 insertions, 0 deletions
@@ -51,16 +51,17 @@ OBJECTS = | |||
51 | OBJECTS += cache.o | 51 | OBJECTS += cache.o |
52 | OBJECTS += cgit.o | 52 | OBJECTS += cgit.o |
53 | OBJECTS += cmd.o | 53 | OBJECTS += cmd.o |
54 | OBJECTS += configfile.o | 54 | OBJECTS += configfile.o |
55 | OBJECTS += html.o | 55 | OBJECTS += html.o |
56 | OBJECTS += parsing.o | 56 | OBJECTS += parsing.o |
57 | OBJECTS += shared.o | 57 | OBJECTS += shared.o |
58 | OBJECTS += ui-blob.o | 58 | OBJECTS += ui-blob.o |
59 | OBJECTS += ui-clone.o | ||
59 | OBJECTS += ui-commit.o | 60 | OBJECTS += ui-commit.o |
60 | OBJECTS += ui-diff.o | 61 | OBJECTS += ui-diff.o |
61 | OBJECTS += ui-log.o | 62 | OBJECTS += ui-log.o |
62 | OBJECTS += ui-patch.o | 63 | OBJECTS += ui-patch.o |
63 | OBJECTS += ui-refs.o | 64 | OBJECTS += ui-refs.o |
64 | OBJECTS += ui-repolist.o | 65 | OBJECTS += ui-repolist.o |
65 | OBJECTS += ui-shared.o | 66 | OBJECTS += ui-shared.o |
66 | OBJECTS += ui-snapshot.o | 67 | OBJECTS += ui-snapshot.o |
@@ -6,27 +6,33 @@ | |||
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "cmd.h" | 10 | #include "cmd.h" |
11 | #include "cache.h" | 11 | #include "cache.h" |
12 | #include "ui-shared.h" | 12 | #include "ui-shared.h" |
13 | #include "ui-blob.h" | 13 | #include "ui-blob.h" |
14 | #include "ui-clone.h" | ||
14 | #include "ui-commit.h" | 15 | #include "ui-commit.h" |
15 | #include "ui-diff.h" | 16 | #include "ui-diff.h" |
16 | #include "ui-log.h" | 17 | #include "ui-log.h" |
17 | #include "ui-patch.h" | 18 | #include "ui-patch.h" |
18 | #include "ui-refs.h" | 19 | #include "ui-refs.h" |
19 | #include "ui-repolist.h" | 20 | #include "ui-repolist.h" |
20 | #include "ui-snapshot.h" | 21 | #include "ui-snapshot.h" |
21 | #include "ui-summary.h" | 22 | #include "ui-summary.h" |
22 | #include "ui-tag.h" | 23 | #include "ui-tag.h" |
23 | #include "ui-tree.h" | 24 | #include "ui-tree.h" |
24 | 25 | ||
26 | static void HEAD_fn(struct cgit_context *ctx) | ||
27 | { | ||
28 | cgit_clone_head(ctx); | ||
29 | } | ||
30 | |||
25 | static void about_fn(struct cgit_context *ctx) | 31 | static void about_fn(struct cgit_context *ctx) |
26 | { | 32 | { |
27 | if (ctx->repo) | 33 | if (ctx->repo) |
28 | cgit_print_repo_readme(); | 34 | cgit_print_repo_readme(); |
29 | else | 35 | else |
30 | cgit_print_site_readme(); | 36 | cgit_print_site_readme(); |
31 | } | 37 | } |
32 | 38 | ||
@@ -40,30 +46,40 @@ static void commit_fn(struct cgit_context *ctx) | |||
40 | cgit_print_commit(ctx->qry.sha1); | 46 | cgit_print_commit(ctx->qry.sha1); |
41 | } | 47 | } |
42 | 48 | ||
43 | static void diff_fn(struct cgit_context *ctx) | 49 | static void diff_fn(struct cgit_context *ctx) |
44 | { | 50 | { |
45 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); | 51 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); |
46 | } | 52 | } |
47 | 53 | ||
54 | static void info_fn(struct cgit_context *ctx) | ||
55 | { | ||
56 | cgit_clone_info(ctx); | ||
57 | } | ||
58 | |||
48 | static void log_fn(struct cgit_context *ctx) | 59 | static void log_fn(struct cgit_context *ctx) |
49 | { | 60 | { |
50 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, | 61 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, |
51 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); | 62 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); |
52 | } | 63 | } |
53 | 64 | ||
54 | static void ls_cache_fn(struct cgit_context *ctx) | 65 | static void ls_cache_fn(struct cgit_context *ctx) |
55 | { | 66 | { |
56 | ctx->page.mimetype = "text/plain"; | 67 | ctx->page.mimetype = "text/plain"; |
57 | ctx->page.filename = "ls-cache.txt"; | 68 | ctx->page.filename = "ls-cache.txt"; |
58 | cgit_print_http_headers(ctx); | 69 | cgit_print_http_headers(ctx); |
59 | cache_ls(ctx->cfg.cache_root); | 70 | cache_ls(ctx->cfg.cache_root); |
60 | } | 71 | } |
61 | 72 | ||
73 | static void objects_fn(struct cgit_context *ctx) | ||
74 | { | ||
75 | cgit_clone_objects(ctx); | ||
76 | } | ||
77 | |||
62 | static void repolist_fn(struct cgit_context *ctx) | 78 | static void repolist_fn(struct cgit_context *ctx) |
63 | { | 79 | { |
64 | cgit_print_repolist(); | 80 | cgit_print_repolist(); |
65 | } | 81 | } |
66 | 82 | ||
67 | static void patch_fn(struct cgit_context *ctx) | 83 | static void patch_fn(struct cgit_context *ctx) |
68 | { | 84 | { |
69 | cgit_print_patch(ctx->qry.sha1); | 85 | cgit_print_patch(ctx->qry.sha1); |
@@ -97,22 +113,25 @@ static void tree_fn(struct cgit_context *ctx) | |||
97 | } | 113 | } |
98 | 114 | ||
99 | #define def_cmd(name, want_repo, want_layout) \ | 115 | #define def_cmd(name, want_repo, want_layout) \ |
100 | {#name, name##_fn, want_repo, want_layout} | 116 | {#name, name##_fn, want_repo, want_layout} |
101 | 117 | ||
102 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) | 118 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) |
103 | { | 119 | { |
104 | static struct cgit_cmd cmds[] = { | 120 | static struct cgit_cmd cmds[] = { |
121 | def_cmd(HEAD, 1, 0), | ||
105 | def_cmd(about, 0, 1), | 122 | def_cmd(about, 0, 1), |
106 | def_cmd(blob, 1, 0), | 123 | def_cmd(blob, 1, 0), |
107 | def_cmd(commit, 1, 1), | 124 | def_cmd(commit, 1, 1), |
108 | def_cmd(diff, 1, 1), | 125 | def_cmd(diff, 1, 1), |
126 | def_cmd(info, 1, 0), | ||
109 | def_cmd(log, 1, 1), | 127 | def_cmd(log, 1, 1), |
110 | def_cmd(ls_cache, 0, 0), | 128 | def_cmd(ls_cache, 0, 0), |
129 | def_cmd(objects, 1, 0), | ||
111 | def_cmd(patch, 1, 0), | 130 | def_cmd(patch, 1, 0), |
112 | def_cmd(refs, 1, 1), | 131 | def_cmd(refs, 1, 1), |
113 | def_cmd(repolist, 0, 0), | 132 | def_cmd(repolist, 0, 0), |
114 | def_cmd(snapshot, 1, 0), | 133 | def_cmd(snapshot, 1, 0), |
115 | def_cmd(summary, 1, 1), | 134 | def_cmd(summary, 1, 1), |
116 | def_cmd(tag, 1, 1), | 135 | def_cmd(tag, 1, 1), |
117 | def_cmd(tree, 1, 1), | 136 | def_cmd(tree, 1, 1), |
118 | }; | 137 | }; |
@@ -46,16 +46,23 @@ void htmlf(const char *format, ...) | |||
46 | va_list args; | 46 | va_list args; |
47 | 47 | ||
48 | va_start(args, format); | 48 | va_start(args, format); |
49 | vsnprintf(buf, sizeof(buf), format, args); | 49 | vsnprintf(buf, sizeof(buf), format, args); |
50 | va_end(args); | 50 | va_end(args); |
51 | html(buf); | 51 | html(buf); |
52 | } | 52 | } |
53 | 53 | ||
54 | void html_status(int code, int more_headers) | ||
55 | { | ||
56 | htmlf("Status: %d\n", code); | ||
57 | if (!more_headers) | ||
58 | html("\n"); | ||
59 | } | ||
60 | |||
54 | void html_txt(char *txt) | 61 | void html_txt(char *txt) |
55 | { | 62 | { |
56 | char *t = txt; | 63 | char *t = txt; |
57 | while(t && *t){ | 64 | while(t && *t){ |
58 | int c = *t; | 65 | int c = *t; |
59 | if (c=='<' || c=='>' || c=='&') { | 66 | if (c=='<' || c=='>' || c=='&') { |
60 | write(htmlfd, txt, t - txt); | 67 | write(htmlfd, txt, t - txt); |
61 | if (c=='>') | 68 | if (c=='>') |
@@ -1,15 +1,16 @@ | |||
1 | #ifndef HTML_H | 1 | #ifndef HTML_H |
2 | #define HTML_H | 2 | #define HTML_H |
3 | 3 | ||
4 | extern int htmlfd; | 4 | extern int htmlfd; |
5 | 5 | ||
6 | extern void html(const char *txt); | 6 | extern void html(const char *txt); |
7 | extern void htmlf(const char *format,...); | 7 | extern void htmlf(const char *format,...); |
8 | extern void html_status(int code, int more_headers); | ||
8 | extern void html_txt(char *txt); | 9 | extern void html_txt(char *txt); |
9 | extern void html_ntxt(int len, char *txt); | 10 | extern void html_ntxt(int len, char *txt); |
10 | extern void html_attr(char *txt); | 11 | extern void html_attr(char *txt); |
11 | extern void html_hidden(char *name, char *value); | 12 | extern void html_hidden(char *name, char *value); |
12 | extern void html_option(char *value, char *text, char *selected_value); | 13 | extern void html_option(char *value, char *text, char *selected_value); |
13 | extern void html_link_open(char *url, char *title, char *class); | 14 | extern void html_link_open(char *url, char *title, char *class); |
14 | extern void html_link_close(void); | 15 | extern void html_link_close(void); |
15 | extern void html_fileperm(unsigned short mode); | 16 | extern void html_fileperm(unsigned short mode); |
diff --git a/ui-clone.c b/ui-clone.c new file mode 100644 index 0000000..3a037ad --- a/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 | |||
14 | static 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 | |||
33 | static 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 | |||
48 | static 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 | |||
75 | void 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 | |||
86 | void 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 | |||
101 | void 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 --- a/dev/null +++ b/ui-clone.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef UI_CLONE_H | ||
2 | #define UI_CLONE_H | ||
3 | |||
4 | void cgit_clone_info(struct cgit_context *ctx); | ||
5 | void cgit_clone_objects(struct cgit_context *ctx); | ||
6 | void cgit_clone_head(struct cgit_context *ctx); | ||
7 | |||
8 | #endif /* UI_CLONE_H */ | ||