author | Lars Hjemli <hjemli@gmail.com> | 2007-10-27 08:36:53 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-10-27 08:53:27 (UTC) |
commit | 7937d06090dd5e19145ec6fa8befc5770954b30c (patch) (unidiff) | |
tree | bb058aa0b5e54aabcad6a2ca6416bcac4b636615 /shared.c | |
parent | 8efb05f98ad389d1b7f5aac17838401908622dad (diff) | |
download | cgit-7937d06090dd5e19145ec6fa8befc5770954b30c.zip cgit-7937d06090dd5e19145ec6fa8befc5770954b30c.tar.gz cgit-7937d06090dd5e19145ec6fa8befc5770954b30c.tar.bz2 |
Add support for refs view
This enables the new urls $repo/refs, $repo/refs/heads and $repo/refs/tags,
which can be used to print _all_ branches and/or tags.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,472 +1,472 @@ | |||
1 | /* shared.c: global vars + some callback functions | 1 | /* shared.c: global vars + some callback functions |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 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 | 10 | ||
11 | struct repolist cgit_repolist; | 11 | struct repolist cgit_repolist; |
12 | struct repoinfo *cgit_repo; | 12 | struct repoinfo *cgit_repo; |
13 | int cgit_cmd; | 13 | int cgit_cmd; |
14 | 14 | ||
15 | const char *cgit_version = CGIT_VERSION; | 15 | const char *cgit_version = CGIT_VERSION; |
16 | 16 | ||
17 | char *cgit_root_title = "Git repository browser"; | 17 | char *cgit_root_title = "Git repository browser"; |
18 | char *cgit_css = "/cgit.css"; | 18 | char *cgit_css = "/cgit.css"; |
19 | char *cgit_logo = "/git-logo.png"; | 19 | char *cgit_logo = "/git-logo.png"; |
20 | char *cgit_index_header = NULL; | 20 | char *cgit_index_header = NULL; |
21 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | 21 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
22 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | 22 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; |
23 | char *cgit_agefile = "info/web/last-modified"; | 23 | char *cgit_agefile = "info/web/last-modified"; |
24 | char *cgit_virtual_root = NULL; | 24 | char *cgit_virtual_root = NULL; |
25 | char *cgit_script_name = CGIT_SCRIPT_NAME; | 25 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
26 | char *cgit_cache_root = CGIT_CACHE_ROOT; | 26 | char *cgit_cache_root = CGIT_CACHE_ROOT; |
27 | char *cgit_repo_group = NULL; | 27 | char *cgit_repo_group = NULL; |
28 | 28 | ||
29 | int cgit_nocache = 0; | 29 | int cgit_nocache = 0; |
30 | int cgit_snapshots = 0; | 30 | int cgit_snapshots = 0; |
31 | int cgit_enable_index_links = 0; | 31 | int cgit_enable_index_links = 0; |
32 | int cgit_enable_log_filecount = 0; | 32 | int cgit_enable_log_filecount = 0; |
33 | int cgit_enable_log_linecount = 0; | 33 | int cgit_enable_log_linecount = 0; |
34 | int cgit_max_lock_attempts = 5; | 34 | int cgit_max_lock_attempts = 5; |
35 | int cgit_cache_root_ttl = 5; | 35 | int cgit_cache_root_ttl = 5; |
36 | int cgit_cache_repo_ttl = 5; | 36 | int cgit_cache_repo_ttl = 5; |
37 | int cgit_cache_dynamic_ttl = 5; | 37 | int cgit_cache_dynamic_ttl = 5; |
38 | int cgit_cache_static_ttl = -1; | 38 | int cgit_cache_static_ttl = -1; |
39 | int cgit_cache_max_create_time = 5; | 39 | int cgit_cache_max_create_time = 5; |
40 | int cgit_summary_log = 0; | 40 | int cgit_summary_log = 0; |
41 | int cgit_summary_tags = 0; | 41 | int cgit_summary_tags = 0; |
42 | int cgit_summary_branches = 0; | 42 | int cgit_summary_branches = 0; |
43 | int cgit_renamelimit = -1; | 43 | int cgit_renamelimit = -1; |
44 | 44 | ||
45 | int cgit_max_msg_len = 60; | 45 | int cgit_max_msg_len = 60; |
46 | int cgit_max_repodesc_len = 60; | 46 | int cgit_max_repodesc_len = 60; |
47 | int cgit_max_commit_count = 50; | 47 | int cgit_max_commit_count = 50; |
48 | 48 | ||
49 | int cgit_query_has_symref = 0; | 49 | int cgit_query_has_symref = 0; |
50 | int cgit_query_has_sha1 = 0; | 50 | int cgit_query_has_sha1 = 0; |
51 | 51 | ||
52 | char *cgit_querystring = NULL; | 52 | char *cgit_querystring = NULL; |
53 | char *cgit_query_repo = NULL; | 53 | char *cgit_query_repo = NULL; |
54 | char *cgit_query_page = NULL; | 54 | char *cgit_query_page = NULL; |
55 | char *cgit_query_head = NULL; | 55 | char *cgit_query_head = NULL; |
56 | char *cgit_query_search = NULL; | 56 | char *cgit_query_search = NULL; |
57 | char *cgit_query_sha1 = NULL; | 57 | char *cgit_query_sha1 = NULL; |
58 | char *cgit_query_sha2 = NULL; | 58 | char *cgit_query_sha2 = NULL; |
59 | char *cgit_query_path = NULL; | 59 | char *cgit_query_path = NULL; |
60 | char *cgit_query_name = NULL; | 60 | char *cgit_query_name = NULL; |
61 | int cgit_query_ofs = 0; | 61 | int cgit_query_ofs = 0; |
62 | 62 | ||
63 | int htmlfd = 0; | 63 | int htmlfd = 0; |
64 | 64 | ||
65 | 65 | ||
66 | int cgit_get_cmd_index(const char *cmd) | 66 | int cgit_get_cmd_index(const char *cmd) |
67 | { | 67 | { |
68 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", | 68 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", |
69 | "snapshot", "tag", NULL}; | 69 | "snapshot", "tag", "refs", NULL}; |
70 | int i; | 70 | int i; |
71 | 71 | ||
72 | for(i = 0; cmds[i]; i++) | 72 | for(i = 0; cmds[i]; i++) |
73 | if (!strcmp(cmd, cmds[i])) | 73 | if (!strcmp(cmd, cmds[i])) |
74 | return i + 1; | 74 | return i + 1; |
75 | return 0; | 75 | return 0; |
76 | } | 76 | } |
77 | 77 | ||
78 | int chk_zero(int result, char *msg) | 78 | int chk_zero(int result, char *msg) |
79 | { | 79 | { |
80 | if (result != 0) | 80 | if (result != 0) |
81 | die("%s: %s", msg, strerror(errno)); | 81 | die("%s: %s", msg, strerror(errno)); |
82 | return result; | 82 | return result; |
83 | } | 83 | } |
84 | 84 | ||
85 | int chk_positive(int result, char *msg) | 85 | int chk_positive(int result, char *msg) |
86 | { | 86 | { |
87 | if (result <= 0) | 87 | if (result <= 0) |
88 | die("%s: %s", msg, strerror(errno)); | 88 | die("%s: %s", msg, strerror(errno)); |
89 | return result; | 89 | return result; |
90 | } | 90 | } |
91 | 91 | ||
92 | int chk_non_negative(int result, char *msg) | 92 | int chk_non_negative(int result, char *msg) |
93 | { | 93 | { |
94 | if (result < 0) | 94 | if (result < 0) |
95 | die("%s: %s",msg, strerror(errno)); | 95 | die("%s: %s",msg, strerror(errno)); |
96 | return result; | 96 | return result; |
97 | } | 97 | } |
98 | 98 | ||
99 | struct repoinfo *add_repo(const char *url) | 99 | struct repoinfo *add_repo(const char *url) |
100 | { | 100 | { |
101 | struct repoinfo *ret; | 101 | struct repoinfo *ret; |
102 | 102 | ||
103 | if (++cgit_repolist.count > cgit_repolist.length) { | 103 | if (++cgit_repolist.count > cgit_repolist.length) { |
104 | if (cgit_repolist.length == 0) | 104 | if (cgit_repolist.length == 0) |
105 | cgit_repolist.length = 8; | 105 | cgit_repolist.length = 8; |
106 | else | 106 | else |
107 | cgit_repolist.length *= 2; | 107 | cgit_repolist.length *= 2; |
108 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 108 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
109 | cgit_repolist.length * | 109 | cgit_repolist.length * |
110 | sizeof(struct repoinfo)); | 110 | sizeof(struct repoinfo)); |
111 | } | 111 | } |
112 | 112 | ||
113 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 113 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
114 | ret->url = trim_end(url, '/'); | 114 | ret->url = trim_end(url, '/'); |
115 | ret->name = ret->url; | 115 | ret->name = ret->url; |
116 | ret->path = NULL; | 116 | ret->path = NULL; |
117 | ret->desc = NULL; | 117 | ret->desc = NULL; |
118 | ret->owner = NULL; | 118 | ret->owner = NULL; |
119 | ret->group = cgit_repo_group; | 119 | ret->group = cgit_repo_group; |
120 | ret->defbranch = "master"; | 120 | ret->defbranch = "master"; |
121 | ret->snapshots = cgit_snapshots; | 121 | ret->snapshots = cgit_snapshots; |
122 | ret->enable_log_filecount = cgit_enable_log_filecount; | 122 | ret->enable_log_filecount = cgit_enable_log_filecount; |
123 | ret->enable_log_linecount = cgit_enable_log_linecount; | 123 | ret->enable_log_linecount = cgit_enable_log_linecount; |
124 | ret->module_link = cgit_module_link; | 124 | ret->module_link = cgit_module_link; |
125 | ret->readme = NULL; | 125 | ret->readme = NULL; |
126 | return ret; | 126 | return ret; |
127 | } | 127 | } |
128 | 128 | ||
129 | struct repoinfo *cgit_get_repoinfo(const char *url) | 129 | struct repoinfo *cgit_get_repoinfo(const char *url) |
130 | { | 130 | { |
131 | int i; | 131 | int i; |
132 | struct repoinfo *repo; | 132 | struct repoinfo *repo; |
133 | 133 | ||
134 | for (i=0; i<cgit_repolist.count; i++) { | 134 | for (i=0; i<cgit_repolist.count; i++) { |
135 | repo = &cgit_repolist.repos[i]; | 135 | repo = &cgit_repolist.repos[i]; |
136 | if (!strcmp(repo->url, url)) | 136 | if (!strcmp(repo->url, url)) |
137 | return repo; | 137 | return repo; |
138 | } | 138 | } |
139 | return NULL; | 139 | return NULL; |
140 | } | 140 | } |
141 | 141 | ||
142 | void cgit_global_config_cb(const char *name, const char *value) | 142 | void cgit_global_config_cb(const char *name, const char *value) |
143 | { | 143 | { |
144 | if (!strcmp(name, "root-title")) | 144 | if (!strcmp(name, "root-title")) |
145 | cgit_root_title = xstrdup(value); | 145 | cgit_root_title = xstrdup(value); |
146 | else if (!strcmp(name, "css")) | 146 | else if (!strcmp(name, "css")) |
147 | cgit_css = xstrdup(value); | 147 | cgit_css = xstrdup(value); |
148 | else if (!strcmp(name, "logo")) | 148 | else if (!strcmp(name, "logo")) |
149 | cgit_logo = xstrdup(value); | 149 | cgit_logo = xstrdup(value); |
150 | else if (!strcmp(name, "index-header")) | 150 | else if (!strcmp(name, "index-header")) |
151 | cgit_index_header = xstrdup(value); | 151 | cgit_index_header = xstrdup(value); |
152 | else if (!strcmp(name, "logo-link")) | 152 | else if (!strcmp(name, "logo-link")) |
153 | cgit_logo_link = xstrdup(value); | 153 | cgit_logo_link = xstrdup(value); |
154 | else if (!strcmp(name, "module-link")) | 154 | else if (!strcmp(name, "module-link")) |
155 | cgit_module_link = xstrdup(value); | 155 | cgit_module_link = xstrdup(value); |
156 | else if (!strcmp(name, "virtual-root")) | 156 | else if (!strcmp(name, "virtual-root")) |
157 | cgit_virtual_root = trim_end(value, '/'); | 157 | cgit_virtual_root = trim_end(value, '/'); |
158 | else if (!strcmp(name, "nocache")) | 158 | else if (!strcmp(name, "nocache")) |
159 | cgit_nocache = atoi(value); | 159 | cgit_nocache = atoi(value); |
160 | else if (!strcmp(name, "snapshots")) | 160 | else if (!strcmp(name, "snapshots")) |
161 | cgit_snapshots = cgit_parse_snapshots_mask(value); | 161 | cgit_snapshots = cgit_parse_snapshots_mask(value); |
162 | else if (!strcmp(name, "enable-index-links")) | 162 | else if (!strcmp(name, "enable-index-links")) |
163 | cgit_enable_index_links = atoi(value); | 163 | cgit_enable_index_links = atoi(value); |
164 | else if (!strcmp(name, "enable-log-filecount")) | 164 | else if (!strcmp(name, "enable-log-filecount")) |
165 | cgit_enable_log_filecount = atoi(value); | 165 | cgit_enable_log_filecount = atoi(value); |
166 | else if (!strcmp(name, "enable-log-linecount")) | 166 | else if (!strcmp(name, "enable-log-linecount")) |
167 | cgit_enable_log_linecount = atoi(value); | 167 | cgit_enable_log_linecount = atoi(value); |
168 | else if (!strcmp(name, "cache-root")) | 168 | else if (!strcmp(name, "cache-root")) |
169 | cgit_cache_root = xstrdup(value); | 169 | cgit_cache_root = xstrdup(value); |
170 | else if (!strcmp(name, "cache-root-ttl")) | 170 | else if (!strcmp(name, "cache-root-ttl")) |
171 | cgit_cache_root_ttl = atoi(value); | 171 | cgit_cache_root_ttl = atoi(value); |
172 | else if (!strcmp(name, "cache-repo-ttl")) | 172 | else if (!strcmp(name, "cache-repo-ttl")) |
173 | cgit_cache_repo_ttl = atoi(value); | 173 | cgit_cache_repo_ttl = atoi(value); |
174 | else if (!strcmp(name, "cache-static-ttl")) | 174 | else if (!strcmp(name, "cache-static-ttl")) |
175 | cgit_cache_static_ttl = atoi(value); | 175 | cgit_cache_static_ttl = atoi(value); |
176 | else if (!strcmp(name, "cache-dynamic-ttl")) | 176 | else if (!strcmp(name, "cache-dynamic-ttl")) |
177 | cgit_cache_dynamic_ttl = atoi(value); | 177 | cgit_cache_dynamic_ttl = atoi(value); |
178 | else if (!strcmp(name, "max-message-length")) | 178 | else if (!strcmp(name, "max-message-length")) |
179 | cgit_max_msg_len = atoi(value); | 179 | cgit_max_msg_len = atoi(value); |
180 | else if (!strcmp(name, "max-repodesc-length")) | 180 | else if (!strcmp(name, "max-repodesc-length")) |
181 | cgit_max_repodesc_len = atoi(value); | 181 | cgit_max_repodesc_len = atoi(value); |
182 | else if (!strcmp(name, "max-commit-count")) | 182 | else if (!strcmp(name, "max-commit-count")) |
183 | cgit_max_commit_count = atoi(value); | 183 | cgit_max_commit_count = atoi(value); |
184 | else if (!strcmp(name, "summary-log")) | 184 | else if (!strcmp(name, "summary-log")) |
185 | cgit_summary_log = atoi(value); | 185 | cgit_summary_log = atoi(value); |
186 | else if (!strcmp(name, "summary-branches")) | 186 | else if (!strcmp(name, "summary-branches")) |
187 | cgit_summary_branches = atoi(value); | 187 | cgit_summary_branches = atoi(value); |
188 | else if (!strcmp(name, "summary-tags")) | 188 | else if (!strcmp(name, "summary-tags")) |
189 | cgit_summary_tags = atoi(value); | 189 | cgit_summary_tags = atoi(value); |
190 | else if (!strcmp(name, "agefile")) | 190 | else if (!strcmp(name, "agefile")) |
191 | cgit_agefile = xstrdup(value); | 191 | cgit_agefile = xstrdup(value); |
192 | else if (!strcmp(name, "renamelimit")) | 192 | else if (!strcmp(name, "renamelimit")) |
193 | cgit_renamelimit = atoi(value); | 193 | cgit_renamelimit = atoi(value); |
194 | else if (!strcmp(name, "repo.group")) | 194 | else if (!strcmp(name, "repo.group")) |
195 | cgit_repo_group = xstrdup(value); | 195 | cgit_repo_group = xstrdup(value); |
196 | else if (!strcmp(name, "repo.url")) | 196 | else if (!strcmp(name, "repo.url")) |
197 | cgit_repo = add_repo(value); | 197 | cgit_repo = add_repo(value); |
198 | else if (!strcmp(name, "repo.name")) | 198 | else if (!strcmp(name, "repo.name")) |
199 | cgit_repo->name = xstrdup(value); | 199 | cgit_repo->name = xstrdup(value); |
200 | else if (cgit_repo && !strcmp(name, "repo.path")) | 200 | else if (cgit_repo && !strcmp(name, "repo.path")) |
201 | cgit_repo->path = trim_end(value, '/'); | 201 | cgit_repo->path = trim_end(value, '/'); |
202 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 202 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
203 | cgit_repo->desc = xstrdup(value); | 203 | cgit_repo->desc = xstrdup(value); |
204 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 204 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
205 | cgit_repo->owner = xstrdup(value); | 205 | cgit_repo->owner = xstrdup(value); |
206 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) | 206 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
207 | cgit_repo->defbranch = xstrdup(value); | 207 | cgit_repo->defbranch = xstrdup(value); |
208 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) | 208 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
209 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 209 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
210 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) | 210 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) |
211 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); | 211 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); |
212 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) | 212 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) |
213 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); | 213 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); |
214 | else if (cgit_repo && !strcmp(name, "repo.module-link")) | 214 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
215 | cgit_repo->module_link= xstrdup(value); | 215 | cgit_repo->module_link= xstrdup(value); |
216 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { | 216 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { |
217 | if (*value == '/') | 217 | if (*value == '/') |
218 | cgit_repo->readme = xstrdup(value); | 218 | cgit_repo->readme = xstrdup(value); |
219 | else | 219 | else |
220 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); | 220 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); |
221 | } else if (!strcmp(name, "include")) | 221 | } else if (!strcmp(name, "include")) |
222 | cgit_read_config(value, cgit_global_config_cb); | 222 | cgit_read_config(value, cgit_global_config_cb); |
223 | } | 223 | } |
224 | 224 | ||
225 | void cgit_querystring_cb(const char *name, const char *value) | 225 | void cgit_querystring_cb(const char *name, const char *value) |
226 | { | 226 | { |
227 | if (!strcmp(name,"r")) { | 227 | if (!strcmp(name,"r")) { |
228 | cgit_query_repo = xstrdup(value); | 228 | cgit_query_repo = xstrdup(value); |
229 | cgit_repo = cgit_get_repoinfo(value); | 229 | cgit_repo = cgit_get_repoinfo(value); |
230 | } else if (!strcmp(name, "p")) { | 230 | } else if (!strcmp(name, "p")) { |
231 | cgit_query_page = xstrdup(value); | 231 | cgit_query_page = xstrdup(value); |
232 | cgit_cmd = cgit_get_cmd_index(value); | 232 | cgit_cmd = cgit_get_cmd_index(value); |
233 | } else if (!strcmp(name, "url")) { | 233 | } else if (!strcmp(name, "url")) { |
234 | cgit_parse_url(value); | 234 | cgit_parse_url(value); |
235 | } else if (!strcmp(name, "q")) { | 235 | } else if (!strcmp(name, "q")) { |
236 | cgit_query_search = xstrdup(value); | 236 | cgit_query_search = xstrdup(value); |
237 | } else if (!strcmp(name, "h")) { | 237 | } else if (!strcmp(name, "h")) { |
238 | cgit_query_head = xstrdup(value); | 238 | cgit_query_head = xstrdup(value); |
239 | cgit_query_has_symref = 1; | 239 | cgit_query_has_symref = 1; |
240 | } else if (!strcmp(name, "id")) { | 240 | } else if (!strcmp(name, "id")) { |
241 | cgit_query_sha1 = xstrdup(value); | 241 | cgit_query_sha1 = xstrdup(value); |
242 | cgit_query_has_sha1 = 1; | 242 | cgit_query_has_sha1 = 1; |
243 | } else if (!strcmp(name, "id2")) { | 243 | } else if (!strcmp(name, "id2")) { |
244 | cgit_query_sha2 = xstrdup(value); | 244 | cgit_query_sha2 = xstrdup(value); |
245 | cgit_query_has_sha1 = 1; | 245 | cgit_query_has_sha1 = 1; |
246 | } else if (!strcmp(name, "ofs")) { | 246 | } else if (!strcmp(name, "ofs")) { |
247 | cgit_query_ofs = atoi(value); | 247 | cgit_query_ofs = atoi(value); |
248 | } else if (!strcmp(name, "path")) { | 248 | } else if (!strcmp(name, "path")) { |
249 | cgit_query_path = trim_end(value, '/'); | 249 | cgit_query_path = trim_end(value, '/'); |
250 | } else if (!strcmp(name, "name")) { | 250 | } else if (!strcmp(name, "name")) { |
251 | cgit_query_name = xstrdup(value); | 251 | cgit_query_name = xstrdup(value); |
252 | } | 252 | } |
253 | } | 253 | } |
254 | 254 | ||
255 | void *cgit_free_commitinfo(struct commitinfo *info) | 255 | void *cgit_free_commitinfo(struct commitinfo *info) |
256 | { | 256 | { |
257 | free(info->author); | 257 | free(info->author); |
258 | free(info->author_email); | 258 | free(info->author_email); |
259 | free(info->committer); | 259 | free(info->committer); |
260 | free(info->committer_email); | 260 | free(info->committer_email); |
261 | free(info->subject); | 261 | free(info->subject); |
262 | free(info); | 262 | free(info); |
263 | return NULL; | 263 | return NULL; |
264 | } | 264 | } |
265 | 265 | ||
266 | int hextoint(char c) | 266 | int hextoint(char c) |
267 | { | 267 | { |
268 | if (c >= 'a' && c <= 'f') | 268 | if (c >= 'a' && c <= 'f') |
269 | return 10 + c - 'a'; | 269 | return 10 + c - 'a'; |
270 | else if (c >= 'A' && c <= 'F') | 270 | else if (c >= 'A' && c <= 'F') |
271 | return 10 + c - 'A'; | 271 | return 10 + c - 'A'; |
272 | else if (c >= '0' && c <= '9') | 272 | else if (c >= '0' && c <= '9') |
273 | return c - '0'; | 273 | return c - '0'; |
274 | else | 274 | else |
275 | return -1; | 275 | return -1; |
276 | } | 276 | } |
277 | 277 | ||
278 | char *trim_end(const char *str, char c) | 278 | char *trim_end(const char *str, char c) |
279 | { | 279 | { |
280 | int len; | 280 | int len; |
281 | char *s, *t; | 281 | char *s, *t; |
282 | 282 | ||
283 | if (str == NULL) | 283 | if (str == NULL) |
284 | return NULL; | 284 | return NULL; |
285 | t = (char *)str; | 285 | t = (char *)str; |
286 | len = strlen(t); | 286 | len = strlen(t); |
287 | while(len > 0 && t[len - 1] == c) | 287 | while(len > 0 && t[len - 1] == c) |
288 | len--; | 288 | len--; |
289 | 289 | ||
290 | if (len == 0) | 290 | if (len == 0) |
291 | return NULL; | 291 | return NULL; |
292 | 292 | ||
293 | c = t[len]; | 293 | c = t[len]; |
294 | t[len] = '\0'; | 294 | t[len] = '\0'; |
295 | s = xstrdup(t); | 295 | s = xstrdup(t); |
296 | t[len] = c; | 296 | t[len] = c; |
297 | return s; | 297 | return s; |
298 | } | 298 | } |
299 | 299 | ||
300 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) | 300 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
301 | { | 301 | { |
302 | size_t size; | 302 | size_t size; |
303 | 303 | ||
304 | if (list->count >= list->alloc) { | 304 | if (list->count >= list->alloc) { |
305 | list->alloc += (list->alloc ? list->alloc : 4); | 305 | list->alloc += (list->alloc ? list->alloc : 4); |
306 | size = list->alloc * sizeof(struct refinfo *); | 306 | size = list->alloc * sizeof(struct refinfo *); |
307 | list->refs = xrealloc(list->refs, size); | 307 | list->refs = xrealloc(list->refs, size); |
308 | } | 308 | } |
309 | list->refs[list->count++] = ref; | 309 | list->refs[list->count++] = ref; |
310 | } | 310 | } |
311 | 311 | ||
312 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) | 312 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
313 | { | 313 | { |
314 | struct refinfo *ref; | 314 | struct refinfo *ref; |
315 | 315 | ||
316 | ref = xmalloc(sizeof (struct refinfo)); | 316 | ref = xmalloc(sizeof (struct refinfo)); |
317 | ref->refname = xstrdup(refname); | 317 | ref->refname = xstrdup(refname); |
318 | ref->object = parse_object(sha1); | 318 | ref->object = parse_object(sha1); |
319 | switch (ref->object->type) { | 319 | switch (ref->object->type) { |
320 | case OBJ_TAG: | 320 | case OBJ_TAG: |
321 | ref->tag = cgit_parse_tag((struct tag *)ref->object); | 321 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
322 | break; | 322 | break; |
323 | case OBJ_COMMIT: | 323 | case OBJ_COMMIT: |
324 | ref->commit = cgit_parse_commit((struct commit *)ref->object); | 324 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
325 | break; | 325 | break; |
326 | } | 326 | } |
327 | return ref; | 327 | return ref; |
328 | } | 328 | } |
329 | 329 | ||
330 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, | 330 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
331 | void *cb_data) | 331 | void *cb_data) |
332 | { | 332 | { |
333 | struct reflist *list = (struct reflist *)cb_data; | 333 | struct reflist *list = (struct reflist *)cb_data; |
334 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); | 334 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
335 | 335 | ||
336 | if (info) | 336 | if (info) |
337 | cgit_add_ref(list, info); | 337 | cgit_add_ref(list, info); |
338 | return 0; | 338 | return 0; |
339 | } | 339 | } |
340 | 340 | ||
341 | void cgit_diff_tree_cb(struct diff_queue_struct *q, | 341 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
342 | struct diff_options *options, void *data) | 342 | struct diff_options *options, void *data) |
343 | { | 343 | { |
344 | int i; | 344 | int i; |
345 | 345 | ||
346 | for (i = 0; i < q->nr; i++) { | 346 | for (i = 0; i < q->nr; i++) { |
347 | if (q->queue[i]->status == 'U') | 347 | if (q->queue[i]->status == 'U') |
348 | continue; | 348 | continue; |
349 | ((filepair_fn)data)(q->queue[i]); | 349 | ((filepair_fn)data)(q->queue[i]); |
350 | } | 350 | } |
351 | } | 351 | } |
352 | 352 | ||
353 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) | 353 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
354 | { | 354 | { |
355 | enum object_type type; | 355 | enum object_type type; |
356 | 356 | ||
357 | if (is_null_sha1(sha1)) { | 357 | if (is_null_sha1(sha1)) { |
358 | file->ptr = (char *)""; | 358 | file->ptr = (char *)""; |
359 | file->size = 0; | 359 | file->size = 0; |
360 | } else { | 360 | } else { |
361 | file->ptr = read_sha1_file(sha1, &type, | 361 | file->ptr = read_sha1_file(sha1, &type, |
362 | (unsigned long *)&file->size); | 362 | (unsigned long *)&file->size); |
363 | } | 363 | } |
364 | return 1; | 364 | return 1; |
365 | } | 365 | } |
366 | 366 | ||
367 | /* | 367 | /* |
368 | * Receive diff-buffers from xdiff and concatenate them as | 368 | * Receive diff-buffers from xdiff and concatenate them as |
369 | * needed across multiple callbacks. | 369 | * needed across multiple callbacks. |
370 | * | 370 | * |
371 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), | 371 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
372 | * ripped from git and modified to use globals instead of | 372 | * ripped from git and modified to use globals instead of |
373 | * a special callback-struct. | 373 | * a special callback-struct. |
374 | */ | 374 | */ |
375 | char *diffbuf = NULL; | 375 | char *diffbuf = NULL; |
376 | int buflen = 0; | 376 | int buflen = 0; |
377 | 377 | ||
378 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | 378 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
379 | { | 379 | { |
380 | int i; | 380 | int i; |
381 | 381 | ||
382 | for (i = 0; i < nbuf; i++) { | 382 | for (i = 0; i < nbuf; i++) { |
383 | if (mb[i].ptr[mb[i].size-1] != '\n') { | 383 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
384 | /* Incomplete line */ | 384 | /* Incomplete line */ |
385 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 385 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
386 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 386 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
387 | buflen += mb[i].size; | 387 | buflen += mb[i].size; |
388 | continue; | 388 | continue; |
389 | } | 389 | } |
390 | 390 | ||
391 | /* we have a complete line */ | 391 | /* we have a complete line */ |
392 | if (!diffbuf) { | 392 | if (!diffbuf) { |
393 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); | 393 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
394 | continue; | 394 | continue; |
395 | } | 395 | } |
396 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 396 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
397 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 397 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
398 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); | 398 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
399 | free(diffbuf); | 399 | free(diffbuf); |
400 | diffbuf = NULL; | 400 | diffbuf = NULL; |
401 | buflen = 0; | 401 | buflen = 0; |
402 | } | 402 | } |
403 | if (diffbuf) { | 403 | if (diffbuf) { |
404 | ((linediff_fn)priv)(diffbuf, buflen); | 404 | ((linediff_fn)priv)(diffbuf, buflen); |
405 | free(diffbuf); | 405 | free(diffbuf); |
406 | diffbuf = NULL; | 406 | diffbuf = NULL; |
407 | buflen = 0; | 407 | buflen = 0; |
408 | } | 408 | } |
409 | return 0; | 409 | return 0; |
410 | } | 410 | } |
411 | 411 | ||
412 | int cgit_diff_files(const unsigned char *old_sha1, | 412 | int cgit_diff_files(const unsigned char *old_sha1, |
413 | const unsigned char *new_sha1, | 413 | const unsigned char *new_sha1, |
414 | linediff_fn fn) | 414 | linediff_fn fn) |
415 | { | 415 | { |
416 | mmfile_t file1, file2; | 416 | mmfile_t file1, file2; |
417 | xpparam_t diff_params; | 417 | xpparam_t diff_params; |
418 | xdemitconf_t emit_params; | 418 | xdemitconf_t emit_params; |
419 | xdemitcb_t emit_cb; | 419 | xdemitcb_t emit_cb; |
420 | 420 | ||
421 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) | 421 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
422 | return 1; | 422 | return 1; |
423 | 423 | ||
424 | diff_params.flags = XDF_NEED_MINIMAL; | 424 | diff_params.flags = XDF_NEED_MINIMAL; |
425 | emit_params.ctxlen = 3; | 425 | emit_params.ctxlen = 3; |
426 | emit_params.flags = XDL_EMIT_FUNCNAMES; | 426 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
427 | emit_params.find_func = NULL; | 427 | emit_params.find_func = NULL; |
428 | emit_cb.outf = filediff_cb; | 428 | emit_cb.outf = filediff_cb; |
429 | emit_cb.priv = fn; | 429 | emit_cb.priv = fn; |
430 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 430 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
431 | return 0; | 431 | return 0; |
432 | } | 432 | } |
433 | 433 | ||
434 | void cgit_diff_tree(const unsigned char *old_sha1, | 434 | void cgit_diff_tree(const unsigned char *old_sha1, |
435 | const unsigned char *new_sha1, | 435 | const unsigned char *new_sha1, |
436 | filepair_fn fn, const char *prefix) | 436 | filepair_fn fn, const char *prefix) |
437 | { | 437 | { |
438 | struct diff_options opt; | 438 | struct diff_options opt; |
439 | int ret; | 439 | int ret; |
440 | int prefixlen; | 440 | int prefixlen; |
441 | 441 | ||
442 | diff_setup(&opt); | 442 | diff_setup(&opt); |
443 | opt.output_format = DIFF_FORMAT_CALLBACK; | 443 | opt.output_format = DIFF_FORMAT_CALLBACK; |
444 | opt.detect_rename = 1; | 444 | opt.detect_rename = 1; |
445 | opt.rename_limit = cgit_renamelimit; | 445 | opt.rename_limit = cgit_renamelimit; |
446 | opt.recursive = 1; | 446 | opt.recursive = 1; |
447 | opt.format_callback = cgit_diff_tree_cb; | 447 | opt.format_callback = cgit_diff_tree_cb; |
448 | opt.format_callback_data = fn; | 448 | opt.format_callback_data = fn; |
449 | if (prefix) { | 449 | if (prefix) { |
450 | opt.nr_paths = 1; | 450 | opt.nr_paths = 1; |
451 | opt.paths = &prefix; | 451 | opt.paths = &prefix; |
452 | prefixlen = strlen(prefix); | 452 | prefixlen = strlen(prefix); |
453 | opt.pathlens = &prefixlen; | 453 | opt.pathlens = &prefixlen; |
454 | } | 454 | } |
455 | diff_setup_done(&opt); | 455 | diff_setup_done(&opt); |
456 | 456 | ||
457 | if (old_sha1 && !is_null_sha1(old_sha1)) | 457 | if (old_sha1 && !is_null_sha1(old_sha1)) |
458 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | 458 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
459 | else | 459 | else |
460 | ret = diff_root_tree_sha1(new_sha1, "", &opt); | 460 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
461 | diffcore_std(&opt); | 461 | diffcore_std(&opt); |
462 | diff_flush(&opt); | 462 | diff_flush(&opt); |
463 | } | 463 | } |
464 | 464 | ||
465 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) | 465 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
466 | { | 466 | { |
467 | unsigned char *old_sha1 = NULL; | 467 | unsigned char *old_sha1 = NULL; |
468 | 468 | ||
469 | if (commit->parents) | 469 | if (commit->parents) |
470 | old_sha1 = commit->parents->item->object.sha1; | 470 | old_sha1 = commit->parents->item->object.sha1; |
471 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); | 471 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
472 | } | 472 | } |