author | Lars Hjemli <hjemli@gmail.com> | 2008-10-11 17:05:50 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-10-11 17:05:50 (UTC) |
commit | 5632ba35d133ee29d46c031cdd4b4a37097b8ca1 (patch) (unidiff) | |
tree | 6e95881e8ec6bb812a82668fd45e4ca28b8d0f97 /cgit.c | |
parent | cb1cc0d82d764051d8376281fcb556153f074c1a (diff) | |
download | cgit-5632ba35d133ee29d46c031cdd4b4a37097b8ca1.zip cgit-5632ba35d133ee29d46c031cdd4b4a37097b8ca1.tar.gz cgit-5632ba35d133ee29d46c031cdd4b4a37097b8ca1.tar.bz2 |
Add cgit_query.nohead flag
This flag is set when no HEAD is specified in the querystring. Currently
it has no users, but it will be used by ui-snapshot to invoke a DWIM-mode
where the revision is extracted from the snapshot name.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -161,192 +161,193 @@ static void prepare_context(struct cgit_context *ctx) | |||
161 | { | 161 | { |
162 | memset(ctx, 0, sizeof(ctx)); | 162 | memset(ctx, 0, sizeof(ctx)); |
163 | ctx->cfg.agefile = "info/web/last-modified"; | 163 | ctx->cfg.agefile = "info/web/last-modified"; |
164 | ctx->cfg.nocache = 0; | 164 | ctx->cfg.nocache = 0; |
165 | ctx->cfg.cache_size = 0; | 165 | ctx->cfg.cache_size = 0; |
166 | ctx->cfg.cache_dynamic_ttl = 5; | 166 | ctx->cfg.cache_dynamic_ttl = 5; |
167 | ctx->cfg.cache_max_create_time = 5; | 167 | ctx->cfg.cache_max_create_time = 5; |
168 | ctx->cfg.cache_repo_ttl = 5; | 168 | ctx->cfg.cache_repo_ttl = 5; |
169 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 169 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
170 | ctx->cfg.cache_root_ttl = 5; | 170 | ctx->cfg.cache_root_ttl = 5; |
171 | ctx->cfg.cache_static_ttl = -1; | 171 | ctx->cfg.cache_static_ttl = -1; |
172 | ctx->cfg.css = "/cgit.css"; | 172 | ctx->cfg.css = "/cgit.css"; |
173 | ctx->cfg.logo = "/git-logo.png"; | 173 | ctx->cfg.logo = "/git-logo.png"; |
174 | ctx->cfg.local_time = 0; | 174 | ctx->cfg.local_time = 0; |
175 | ctx->cfg.max_repo_count = 50; | 175 | ctx->cfg.max_repo_count = 50; |
176 | ctx->cfg.max_commit_count = 50; | 176 | ctx->cfg.max_commit_count = 50; |
177 | ctx->cfg.max_lock_attempts = 5; | 177 | ctx->cfg.max_lock_attempts = 5; |
178 | ctx->cfg.max_msg_len = 80; | 178 | ctx->cfg.max_msg_len = 80; |
179 | ctx->cfg.max_repodesc_len = 80; | 179 | ctx->cfg.max_repodesc_len = 80; |
180 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 180 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
181 | ctx->cfg.renamelimit = -1; | 181 | ctx->cfg.renamelimit = -1; |
182 | ctx->cfg.robots = "index, nofollow"; | 182 | ctx->cfg.robots = "index, nofollow"; |
183 | ctx->cfg.root_title = "Git repository browser"; | 183 | ctx->cfg.root_title = "Git repository browser"; |
184 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 184 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
185 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 185 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
186 | ctx->cfg.summary_branches = 10; | 186 | ctx->cfg.summary_branches = 10; |
187 | ctx->cfg.summary_log = 10; | 187 | ctx->cfg.summary_log = 10; |
188 | ctx->cfg.summary_tags = 10; | 188 | ctx->cfg.summary_tags = 10; |
189 | ctx->page.mimetype = "text/html"; | 189 | ctx->page.mimetype = "text/html"; |
190 | ctx->page.charset = PAGE_ENCODING; | 190 | ctx->page.charset = PAGE_ENCODING; |
191 | ctx->page.filename = NULL; | 191 | ctx->page.filename = NULL; |
192 | ctx->page.size = 0; | 192 | ctx->page.size = 0; |
193 | ctx->page.modified = time(NULL); | 193 | ctx->page.modified = time(NULL); |
194 | ctx->page.expires = ctx->page.modified; | 194 | ctx->page.expires = ctx->page.modified; |
195 | } | 195 | } |
196 | 196 | ||
197 | struct refmatch { | 197 | struct refmatch { |
198 | char *req_ref; | 198 | char *req_ref; |
199 | char *first_ref; | 199 | char *first_ref; |
200 | int match; | 200 | int match; |
201 | }; | 201 | }; |
202 | 202 | ||
203 | int find_current_ref(const char *refname, const unsigned char *sha1, | 203 | int find_current_ref(const char *refname, const unsigned char *sha1, |
204 | int flags, void *cb_data) | 204 | int flags, void *cb_data) |
205 | { | 205 | { |
206 | struct refmatch *info; | 206 | struct refmatch *info; |
207 | 207 | ||
208 | info = (struct refmatch *)cb_data; | 208 | info = (struct refmatch *)cb_data; |
209 | if (!strcmp(refname, info->req_ref)) | 209 | if (!strcmp(refname, info->req_ref)) |
210 | info->match = 1; | 210 | info->match = 1; |
211 | if (!info->first_ref) | 211 | if (!info->first_ref) |
212 | info->first_ref = xstrdup(refname); | 212 | info->first_ref = xstrdup(refname); |
213 | return info->match; | 213 | return info->match; |
214 | } | 214 | } |
215 | 215 | ||
216 | char *find_default_branch(struct cgit_repo *repo) | 216 | char *find_default_branch(struct cgit_repo *repo) |
217 | { | 217 | { |
218 | struct refmatch info; | 218 | struct refmatch info; |
219 | char *ref; | 219 | char *ref; |
220 | 220 | ||
221 | info.req_ref = repo->defbranch; | 221 | info.req_ref = repo->defbranch; |
222 | info.first_ref = NULL; | 222 | info.first_ref = NULL; |
223 | info.match = 0; | 223 | info.match = 0; |
224 | for_each_branch_ref(find_current_ref, &info); | 224 | for_each_branch_ref(find_current_ref, &info); |
225 | if (info.match) | 225 | if (info.match) |
226 | ref = info.req_ref; | 226 | ref = info.req_ref; |
227 | else | 227 | else |
228 | ref = info.first_ref; | 228 | ref = info.first_ref; |
229 | if (ref) | 229 | if (ref) |
230 | ref = xstrdup(ref); | 230 | ref = xstrdup(ref); |
231 | return ref; | 231 | return ref; |
232 | } | 232 | } |
233 | 233 | ||
234 | static int prepare_repo_cmd(struct cgit_context *ctx) | 234 | static int prepare_repo_cmd(struct cgit_context *ctx) |
235 | { | 235 | { |
236 | char *tmp; | 236 | char *tmp; |
237 | unsigned char sha1[20]; | 237 | unsigned char sha1[20]; |
238 | int nongit = 0; | 238 | int nongit = 0; |
239 | 239 | ||
240 | setenv("GIT_DIR", ctx->repo->path, 1); | 240 | setenv("GIT_DIR", ctx->repo->path, 1); |
241 | setup_git_directory_gently(&nongit); | 241 | setup_git_directory_gently(&nongit); |
242 | if (nongit) { | 242 | if (nongit) { |
243 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, | 243 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
244 | "config error"); | 244 | "config error"); |
245 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); | 245 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
246 | ctx->repo = NULL; | 246 | ctx->repo = NULL; |
247 | cgit_print_http_headers(ctx); | 247 | cgit_print_http_headers(ctx); |
248 | cgit_print_docstart(ctx); | 248 | cgit_print_docstart(ctx); |
249 | cgit_print_pageheader(ctx); | 249 | cgit_print_pageheader(ctx); |
250 | cgit_print_error(tmp); | 250 | cgit_print_error(tmp); |
251 | cgit_print_docend(); | 251 | cgit_print_docend(); |
252 | return 1; | 252 | return 1; |
253 | } | 253 | } |
254 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); | 254 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
255 | 255 | ||
256 | if (!ctx->qry.head) { | 256 | if (!ctx->qry.head) { |
257 | ctx->qry.nohead = 1; | ||
257 | ctx->qry.head = find_default_branch(ctx->repo); | 258 | ctx->qry.head = find_default_branch(ctx->repo); |
258 | ctx->repo->defbranch = ctx->qry.head; | 259 | ctx->repo->defbranch = ctx->qry.head; |
259 | } | 260 | } |
260 | 261 | ||
261 | if (!ctx->qry.head) { | 262 | if (!ctx->qry.head) { |
262 | cgit_print_http_headers(ctx); | 263 | cgit_print_http_headers(ctx); |
263 | cgit_print_docstart(ctx); | 264 | cgit_print_docstart(ctx); |
264 | cgit_print_pageheader(ctx); | 265 | cgit_print_pageheader(ctx); |
265 | cgit_print_error("Repository seems to be empty"); | 266 | cgit_print_error("Repository seems to be empty"); |
266 | cgit_print_docend(); | 267 | cgit_print_docend(); |
267 | return 1; | 268 | return 1; |
268 | } | 269 | } |
269 | 270 | ||
270 | if (get_sha1(ctx->qry.head, sha1)) { | 271 | if (get_sha1(ctx->qry.head, sha1)) { |
271 | tmp = xstrdup(ctx->qry.head); | 272 | tmp = xstrdup(ctx->qry.head); |
272 | ctx->qry.head = ctx->repo->defbranch; | 273 | ctx->qry.head = ctx->repo->defbranch; |
273 | cgit_print_http_headers(ctx); | 274 | cgit_print_http_headers(ctx); |
274 | cgit_print_docstart(ctx); | 275 | cgit_print_docstart(ctx); |
275 | cgit_print_pageheader(ctx); | 276 | cgit_print_pageheader(ctx); |
276 | cgit_print_error(fmt("Invalid branch: %s", tmp)); | 277 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
277 | cgit_print_docend(); | 278 | cgit_print_docend(); |
278 | return 1; | 279 | return 1; |
279 | } | 280 | } |
280 | return 0; | 281 | return 0; |
281 | } | 282 | } |
282 | 283 | ||
283 | static void process_request(void *cbdata) | 284 | static void process_request(void *cbdata) |
284 | { | 285 | { |
285 | struct cgit_context *ctx = cbdata; | 286 | struct cgit_context *ctx = cbdata; |
286 | struct cgit_cmd *cmd; | 287 | struct cgit_cmd *cmd; |
287 | 288 | ||
288 | cmd = cgit_get_cmd(ctx); | 289 | cmd = cgit_get_cmd(ctx); |
289 | if (!cmd) { | 290 | if (!cmd) { |
290 | ctx->page.title = "cgit error"; | 291 | ctx->page.title = "cgit error"; |
291 | ctx->repo = NULL; | 292 | ctx->repo = NULL; |
292 | cgit_print_http_headers(ctx); | 293 | cgit_print_http_headers(ctx); |
293 | cgit_print_docstart(ctx); | 294 | cgit_print_docstart(ctx); |
294 | cgit_print_pageheader(ctx); | 295 | cgit_print_pageheader(ctx); |
295 | cgit_print_error("Invalid request"); | 296 | cgit_print_error("Invalid request"); |
296 | cgit_print_docend(); | 297 | cgit_print_docend(); |
297 | return; | 298 | return; |
298 | } | 299 | } |
299 | 300 | ||
300 | if (cmd->want_repo && !ctx->repo) { | 301 | if (cmd->want_repo && !ctx->repo) { |
301 | cgit_print_http_headers(ctx); | 302 | cgit_print_http_headers(ctx); |
302 | cgit_print_docstart(ctx); | 303 | cgit_print_docstart(ctx); |
303 | cgit_print_pageheader(ctx); | 304 | cgit_print_pageheader(ctx); |
304 | cgit_print_error(fmt("No repository selected")); | 305 | cgit_print_error(fmt("No repository selected")); |
305 | cgit_print_docend(); | 306 | cgit_print_docend(); |
306 | return; | 307 | return; |
307 | } | 308 | } |
308 | 309 | ||
309 | if (ctx->repo && prepare_repo_cmd(ctx)) | 310 | if (ctx->repo && prepare_repo_cmd(ctx)) |
310 | return; | 311 | return; |
311 | 312 | ||
312 | if (cmd->want_layout) { | 313 | if (cmd->want_layout) { |
313 | cgit_print_http_headers(ctx); | 314 | cgit_print_http_headers(ctx); |
314 | cgit_print_docstart(ctx); | 315 | cgit_print_docstart(ctx); |
315 | cgit_print_pageheader(ctx); | 316 | cgit_print_pageheader(ctx); |
316 | } | 317 | } |
317 | 318 | ||
318 | cmd->fn(ctx); | 319 | cmd->fn(ctx); |
319 | 320 | ||
320 | if (cmd->want_layout) | 321 | if (cmd->want_layout) |
321 | cgit_print_docend(); | 322 | cgit_print_docend(); |
322 | } | 323 | } |
323 | 324 | ||
324 | int cmp_repos(const void *a, const void *b) | 325 | int cmp_repos(const void *a, const void *b) |
325 | { | 326 | { |
326 | const struct cgit_repo *ra = a, *rb = b; | 327 | const struct cgit_repo *ra = a, *rb = b; |
327 | return strcmp(ra->url, rb->url); | 328 | return strcmp(ra->url, rb->url); |
328 | } | 329 | } |
329 | 330 | ||
330 | void print_repo(struct cgit_repo *repo) | 331 | void print_repo(struct cgit_repo *repo) |
331 | { | 332 | { |
332 | printf("repo.url=%s\n", repo->url); | 333 | printf("repo.url=%s\n", repo->url); |
333 | printf("repo.name=%s\n", repo->name); | 334 | printf("repo.name=%s\n", repo->name); |
334 | printf("repo.path=%s\n", repo->path); | 335 | printf("repo.path=%s\n", repo->path); |
335 | if (repo->owner) | 336 | if (repo->owner) |
336 | printf("repo.owner=%s\n", repo->owner); | 337 | printf("repo.owner=%s\n", repo->owner); |
337 | if (repo->desc) | 338 | if (repo->desc) |
338 | printf("repo.desc=%s\n", repo->desc); | 339 | printf("repo.desc=%s\n", repo->desc); |
339 | if (repo->readme) | 340 | if (repo->readme) |
340 | printf("repo.readme=%s\n", repo->readme); | 341 | printf("repo.readme=%s\n", repo->readme); |
341 | printf("\n"); | 342 | printf("\n"); |
342 | } | 343 | } |
343 | 344 | ||
344 | void print_repolist(struct cgit_repolist *list) | 345 | void print_repolist(struct cgit_repolist *list) |
345 | { | 346 | { |
346 | int i; | 347 | int i; |
347 | 348 | ||
348 | for(i = 0; i < list->count; i++) | 349 | for(i = 0; i < list->count; i++) |
349 | print_repo(&list->repos[i]); | 350 | print_repo(&list->repos[i]); |
350 | } | 351 | } |
351 | 352 | ||
352 | 353 | ||