author | Lars Hjemli <hjemli@gmail.com> | 2008-06-26 10:54:44 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-06-26 10:54:44 (UTC) |
commit | 29b37e9781ce1bb04e558c7490d2c29eb1a477e5 (patch) (unidiff) | |
tree | 5a9a7b0b976b442cc8dda6195b804993c603d28d | |
parent | 833b0d2732f808281496df16eb917d6fdb0a274f (diff) | |
parent | 42effc939090b2fbf1b2b76cd1d9c30fabcd230e (diff) | |
download | cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.zip cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.tar.gz cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.tar.bz2 |
Merge branch 'master' of git://git.klever.net/patchwork/cgit
* 'master' of git://git.klever.net/patchwork/cgit:
allow specification of directly linked blobs mimetypes
allow blob extract blobs by head/path combination
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cmd.c | 2 | ||||
-rw-r--r-- | ui-blob.c | 39 | ||||
-rw-r--r-- | ui-blob.h | 2 |
5 files changed, 39 insertions, 7 deletions
@@ -115,64 +115,66 @@ void config_cb(const char *name, const char *value) | |||
115 | } else if (!strcmp(name, "include")) | 115 | } else if (!strcmp(name, "include")) |
116 | parse_configfile(value, config_cb); | 116 | parse_configfile(value, config_cb); |
117 | } | 117 | } |
118 | 118 | ||
119 | static void querystring_cb(const char *name, const char *value) | 119 | static void querystring_cb(const char *name, const char *value) |
120 | { | 120 | { |
121 | if (!strcmp(name,"r")) { | 121 | if (!strcmp(name,"r")) { |
122 | ctx.qry.repo = xstrdup(value); | 122 | ctx.qry.repo = xstrdup(value); |
123 | ctx.repo = cgit_get_repoinfo(value); | 123 | ctx.repo = cgit_get_repoinfo(value); |
124 | } else if (!strcmp(name, "p")) { | 124 | } else if (!strcmp(name, "p")) { |
125 | ctx.qry.page = xstrdup(value); | 125 | ctx.qry.page = xstrdup(value); |
126 | } else if (!strcmp(name, "url")) { | 126 | } else if (!strcmp(name, "url")) { |
127 | cgit_parse_url(value); | 127 | cgit_parse_url(value); |
128 | } else if (!strcmp(name, "qt")) { | 128 | } else if (!strcmp(name, "qt")) { |
129 | ctx.qry.grep = xstrdup(value); | 129 | ctx.qry.grep = xstrdup(value); |
130 | } else if (!strcmp(name, "q")) { | 130 | } else if (!strcmp(name, "q")) { |
131 | ctx.qry.search = xstrdup(value); | 131 | ctx.qry.search = xstrdup(value); |
132 | } else if (!strcmp(name, "h")) { | 132 | } else if (!strcmp(name, "h")) { |
133 | ctx.qry.head = xstrdup(value); | 133 | ctx.qry.head = xstrdup(value); |
134 | ctx.qry.has_symref = 1; | 134 | ctx.qry.has_symref = 1; |
135 | } else if (!strcmp(name, "id")) { | 135 | } else if (!strcmp(name, "id")) { |
136 | ctx.qry.sha1 = xstrdup(value); | 136 | ctx.qry.sha1 = xstrdup(value); |
137 | ctx.qry.has_sha1 = 1; | 137 | ctx.qry.has_sha1 = 1; |
138 | } else if (!strcmp(name, "id2")) { | 138 | } else if (!strcmp(name, "id2")) { |
139 | ctx.qry.sha2 = xstrdup(value); | 139 | ctx.qry.sha2 = xstrdup(value); |
140 | ctx.qry.has_sha1 = 1; | 140 | ctx.qry.has_sha1 = 1; |
141 | } else if (!strcmp(name, "ofs")) { | 141 | } else if (!strcmp(name, "ofs")) { |
142 | ctx.qry.ofs = atoi(value); | 142 | ctx.qry.ofs = atoi(value); |
143 | } else if (!strcmp(name, "path")) { | 143 | } else if (!strcmp(name, "path")) { |
144 | ctx.qry.path = trim_end(value, '/'); | 144 | ctx.qry.path = trim_end(value, '/'); |
145 | } else if (!strcmp(name, "name")) { | 145 | } else if (!strcmp(name, "name")) { |
146 | ctx.qry.name = xstrdup(value); | 146 | ctx.qry.name = xstrdup(value); |
147 | } else if (!strcmp(name, "mimetype")) { | ||
148 | ctx.qry.mimetype = xstrdup(value); | ||
147 | } | 149 | } |
148 | } | 150 | } |
149 | 151 | ||
150 | static void prepare_context(struct cgit_context *ctx) | 152 | static void prepare_context(struct cgit_context *ctx) |
151 | { | 153 | { |
152 | memset(ctx, 0, sizeof(ctx)); | 154 | memset(ctx, 0, sizeof(ctx)); |
153 | ctx->cfg.agefile = "info/web/last-modified"; | 155 | ctx->cfg.agefile = "info/web/last-modified"; |
154 | ctx->cfg.nocache = 0; | 156 | ctx->cfg.nocache = 0; |
155 | ctx->cfg.cache_size = 0; | 157 | ctx->cfg.cache_size = 0; |
156 | ctx->cfg.cache_dynamic_ttl = 5; | 158 | ctx->cfg.cache_dynamic_ttl = 5; |
157 | ctx->cfg.cache_max_create_time = 5; | 159 | ctx->cfg.cache_max_create_time = 5; |
158 | ctx->cfg.cache_repo_ttl = 5; | 160 | ctx->cfg.cache_repo_ttl = 5; |
159 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 161 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
160 | ctx->cfg.cache_root_ttl = 5; | 162 | ctx->cfg.cache_root_ttl = 5; |
161 | ctx->cfg.cache_static_ttl = -1; | 163 | ctx->cfg.cache_static_ttl = -1; |
162 | ctx->cfg.css = "/cgit.css"; | 164 | ctx->cfg.css = "/cgit.css"; |
163 | ctx->cfg.logo = "/git-logo.png"; | 165 | ctx->cfg.logo = "/git-logo.png"; |
164 | ctx->cfg.max_repo_count = 50; | 166 | ctx->cfg.max_repo_count = 50; |
165 | ctx->cfg.max_commit_count = 50; | 167 | ctx->cfg.max_commit_count = 50; |
166 | ctx->cfg.max_lock_attempts = 5; | 168 | ctx->cfg.max_lock_attempts = 5; |
167 | ctx->cfg.max_msg_len = 60; | 169 | ctx->cfg.max_msg_len = 60; |
168 | ctx->cfg.max_repodesc_len = 60; | 170 | ctx->cfg.max_repodesc_len = 60; |
169 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 171 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
170 | ctx->cfg.renamelimit = -1; | 172 | ctx->cfg.renamelimit = -1; |
171 | ctx->cfg.robots = "index, nofollow"; | 173 | ctx->cfg.robots = "index, nofollow"; |
172 | ctx->cfg.root_title = "Git repository browser"; | 174 | ctx->cfg.root_title = "Git repository browser"; |
173 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 175 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
174 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 176 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
175 | ctx->page.mimetype = "text/html"; | 177 | ctx->page.mimetype = "text/html"; |
176 | ctx->page.charset = PAGE_ENCODING; | 178 | ctx->page.charset = PAGE_ENCODING; |
177 | ctx->page.filename = NULL; | 179 | ctx->page.filename = NULL; |
178 | ctx->page.modified = time(NULL); | 180 | ctx->page.modified = time(NULL); |
@@ -87,64 +87,65 @@ struct taginfo { | |||
87 | int tagger_date; | 87 | int tagger_date; |
88 | char *msg; | 88 | char *msg; |
89 | }; | 89 | }; |
90 | 90 | ||
91 | struct refinfo { | 91 | struct refinfo { |
92 | const char *refname; | 92 | const char *refname; |
93 | struct object *object; | 93 | struct object *object; |
94 | union { | 94 | union { |
95 | struct taginfo *tag; | 95 | struct taginfo *tag; |
96 | struct commitinfo *commit; | 96 | struct commitinfo *commit; |
97 | }; | 97 | }; |
98 | }; | 98 | }; |
99 | 99 | ||
100 | struct reflist { | 100 | struct reflist { |
101 | struct refinfo **refs; | 101 | struct refinfo **refs; |
102 | int alloc; | 102 | int alloc; |
103 | int count; | 103 | int count; |
104 | }; | 104 | }; |
105 | 105 | ||
106 | struct cgit_query { | 106 | struct cgit_query { |
107 | int has_symref; | 107 | int has_symref; |
108 | int has_sha1; | 108 | int has_sha1; |
109 | char *raw; | 109 | char *raw; |
110 | char *repo; | 110 | char *repo; |
111 | char *page; | 111 | char *page; |
112 | char *search; | 112 | char *search; |
113 | char *grep; | 113 | char *grep; |
114 | char *head; | 114 | char *head; |
115 | char *sha1; | 115 | char *sha1; |
116 | char *sha2; | 116 | char *sha2; |
117 | char *path; | 117 | char *path; |
118 | char *name; | 118 | char *name; |
119 | char *mimetype; | ||
119 | int ofs; | 120 | int ofs; |
120 | }; | 121 | }; |
121 | 122 | ||
122 | struct cgit_config { | 123 | struct cgit_config { |
123 | char *agefile; | 124 | char *agefile; |
124 | char *cache_root; | 125 | char *cache_root; |
125 | char *clone_prefix; | 126 | char *clone_prefix; |
126 | char *css; | 127 | char *css; |
127 | char *index_header; | 128 | char *index_header; |
128 | char *index_info; | 129 | char *index_info; |
129 | char *logo; | 130 | char *logo; |
130 | char *logo_link; | 131 | char *logo_link; |
131 | char *module_link; | 132 | char *module_link; |
132 | char *repo_group; | 133 | char *repo_group; |
133 | char *robots; | 134 | char *robots; |
134 | char *root_title; | 135 | char *root_title; |
135 | char *root_desc; | 136 | char *root_desc; |
136 | char *root_readme; | 137 | char *root_readme; |
137 | char *script_name; | 138 | char *script_name; |
138 | char *virtual_root; | 139 | char *virtual_root; |
139 | int cache_size; | 140 | int cache_size; |
140 | int cache_dynamic_ttl; | 141 | int cache_dynamic_ttl; |
141 | int cache_max_create_time; | 142 | int cache_max_create_time; |
142 | int cache_repo_ttl; | 143 | int cache_repo_ttl; |
143 | int cache_root_ttl; | 144 | int cache_root_ttl; |
144 | int cache_static_ttl; | 145 | int cache_static_ttl; |
145 | int enable_index_links; | 146 | int enable_index_links; |
146 | int enable_log_filecount; | 147 | int enable_log_filecount; |
147 | int enable_log_linecount; | 148 | int enable_log_linecount; |
148 | int max_repo_count; | 149 | int max_repo_count; |
149 | int max_commit_count; | 150 | int max_commit_count; |
150 | int max_lock_attempts; | 151 | int max_lock_attempts; |
@@ -3,65 +3,65 @@ | |||
3 | * Copyright (C) 2008 Lars Hjemli | 3 | * Copyright (C) 2008 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
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-commit.h" | 14 | #include "ui-commit.h" |
15 | #include "ui-diff.h" | 15 | #include "ui-diff.h" |
16 | #include "ui-log.h" | 16 | #include "ui-log.h" |
17 | #include "ui-patch.h" | 17 | #include "ui-patch.h" |
18 | #include "ui-refs.h" | 18 | #include "ui-refs.h" |
19 | #include "ui-repolist.h" | 19 | #include "ui-repolist.h" |
20 | #include "ui-snapshot.h" | 20 | #include "ui-snapshot.h" |
21 | #include "ui-summary.h" | 21 | #include "ui-summary.h" |
22 | #include "ui-tag.h" | 22 | #include "ui-tag.h" |
23 | #include "ui-tree.h" | 23 | #include "ui-tree.h" |
24 | 24 | ||
25 | static void about_fn(struct cgit_context *ctx) | 25 | static void about_fn(struct cgit_context *ctx) |
26 | { | 26 | { |
27 | if (ctx->repo) | 27 | if (ctx->repo) |
28 | cgit_print_repo_readme(); | 28 | cgit_print_repo_readme(); |
29 | else | 29 | else |
30 | cgit_print_site_readme(); | 30 | cgit_print_site_readme(); |
31 | } | 31 | } |
32 | 32 | ||
33 | static void blob_fn(struct cgit_context *ctx) | 33 | static void blob_fn(struct cgit_context *ctx) |
34 | { | 34 | { |
35 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path); | 35 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head); |
36 | } | 36 | } |
37 | 37 | ||
38 | static void commit_fn(struct cgit_context *ctx) | 38 | static void commit_fn(struct cgit_context *ctx) |
39 | { | 39 | { |
40 | cgit_print_commit(ctx->qry.sha1); | 40 | cgit_print_commit(ctx->qry.sha1); |
41 | } | 41 | } |
42 | 42 | ||
43 | static void diff_fn(struct cgit_context *ctx) | 43 | static void diff_fn(struct cgit_context *ctx) |
44 | { | 44 | { |
45 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); | 45 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); |
46 | } | 46 | } |
47 | 47 | ||
48 | static void log_fn(struct cgit_context *ctx) | 48 | static void log_fn(struct cgit_context *ctx) |
49 | { | 49 | { |
50 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, | 50 | 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); | 51 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); |
52 | } | 52 | } |
53 | 53 | ||
54 | static void ls_cache_fn(struct cgit_context *ctx) | 54 | static void ls_cache_fn(struct cgit_context *ctx) |
55 | { | 55 | { |
56 | ctx->page.mimetype = "text/plain"; | 56 | ctx->page.mimetype = "text/plain"; |
57 | ctx->page.filename = "ls-cache.txt"; | 57 | ctx->page.filename = "ls-cache.txt"; |
58 | cgit_print_http_headers(ctx); | 58 | cgit_print_http_headers(ctx); |
59 | cache_ls(ctx->cfg.cache_root); | 59 | cache_ls(ctx->cfg.cache_root); |
60 | } | 60 | } |
61 | 61 | ||
62 | static void repolist_fn(struct cgit_context *ctx) | 62 | static void repolist_fn(struct cgit_context *ctx) |
63 | { | 63 | { |
64 | cgit_print_repolist(); | 64 | cgit_print_repolist(); |
65 | } | 65 | } |
66 | 66 | ||
67 | static void patch_fn(struct cgit_context *ctx) | 67 | static void patch_fn(struct cgit_context *ctx) |
@@ -1,43 +1,72 @@ | |||
1 | /* ui-blob.c: show blob content | 1 | /* ui-blob.c: show blob content |
2 | * | 2 | * |
3 | * Copyright (C) 2008 Lars Hjemli | 3 | * Copyright (C) 2008 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
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 "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | 12 | ||
13 | void cgit_print_blob(const char *hex, char *path) | 13 | static char *match_path; |
14 | static unsigned char *matched_sha1; | ||
15 | |||
16 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, const char *pathname, unsigned mode, int stage) { | ||
17 | if(strncmp(base,match_path,baselen) | ||
18 | || strcmp(match_path+baselen,pathname) ) | ||
19 | return READ_TREE_RECURSIVE; | ||
20 | memmove(matched_sha1,sha1,20); | ||
21 | return 0; | ||
22 | } | ||
23 | |||
24 | void cgit_print_blob(const char *hex, char *path, const char *head) | ||
14 | { | 25 | { |
15 | 26 | ||
16 | unsigned char sha1[20]; | 27 | unsigned char sha1[20]; |
17 | enum object_type type; | 28 | enum object_type type; |
18 | unsigned char *buf; | 29 | unsigned char *buf; |
19 | unsigned long size; | 30 | unsigned long size; |
31 | struct commit *commit; | ||
32 | const char *paths[] = {path, NULL}; | ||
20 | 33 | ||
21 | if (get_sha1_hex(hex, sha1)){ | 34 | if (hex) { |
22 | cgit_print_error(fmt("Bad hex value: %s", hex)); | 35 | if (get_sha1_hex(hex, sha1)){ |
23 | return; | 36 | cgit_print_error(fmt("Bad hex value: %s", hex)); |
37 | return; | ||
38 | } | ||
39 | } else { | ||
40 | if (get_sha1(head,sha1)) { | ||
41 | cgit_print_error(fmt("Bad ref: %s", head)); | ||
42 | return; | ||
43 | } | ||
24 | } | 44 | } |
25 | 45 | ||
26 | type = sha1_object_info(sha1, &size); | 46 | type = sha1_object_info(sha1, &size); |
47 | |||
48 | if((!hex) && type == OBJ_COMMIT && path) { | ||
49 | commit = lookup_commit_reference(sha1); | ||
50 | match_path = path; | ||
51 | matched_sha1 = sha1; | ||
52 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree); | ||
53 | type = sha1_object_info(sha1,&size); | ||
54 | } | ||
55 | |||
27 | if (type == OBJ_BAD) { | 56 | if (type == OBJ_BAD) { |
28 | cgit_print_error(fmt("Bad object name: %s", hex)); | 57 | cgit_print_error(fmt("Bad object name: %s", hex)); |
29 | return; | 58 | return; |
30 | } | 59 | } |
31 | 60 | ||
32 | buf = read_sha1_file(sha1, &type, &size); | 61 | buf = read_sha1_file(sha1, &type, &size); |
33 | if (!buf) { | 62 | if (!buf) { |
34 | cgit_print_error(fmt("Error reading object %s", hex)); | 63 | cgit_print_error(fmt("Error reading object %s", hex)); |
35 | return; | 64 | return; |
36 | } | 65 | } |
37 | 66 | ||
38 | buf[size] = '\0'; | 67 | buf[size] = '\0'; |
39 | ctx.page.mimetype = NULL; | 68 | ctx.page.mimetype = ctx.qry.mimetype; |
40 | ctx.page.filename = path; | 69 | ctx.page.filename = path; |
41 | cgit_print_http_headers(&ctx); | 70 | cgit_print_http_headers(&ctx); |
42 | write(htmlfd, buf, size); | 71 | write(htmlfd, buf, size); |
43 | } | 72 | } |
@@ -1,6 +1,6 @@ | |||
1 | #ifndef UI_BLOB_H | 1 | #ifndef UI_BLOB_H |
2 | #define UI_BLOB_H | 2 | #define UI_BLOB_H |
3 | 3 | ||
4 | extern void cgit_print_blob(const char *hex, char *path); | 4 | extern void cgit_print_blob(const char *hex, char *path, const char *head); |
5 | 5 | ||
6 | #endif /* UI_BLOB_H */ | 6 | #endif /* UI_BLOB_H */ |