author | Lars Hjemli <hjemli@gmail.com> | 2008-04-28 23:01:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-28 23:01:30 (UTC) |
commit | 651ef79768dde30aabc61189974c9047ee43752f (patch) (unidiff) | |
tree | c01edea9d585784a50c2335c1ddfb36944cba889 /cgit.c | |
parent | 4c9916043d6aabb8278e0d78f5fa71a59f82889d (diff) | |
download | cgit-651ef79768dde30aabc61189974c9047ee43752f.zip cgit-651ef79768dde30aabc61189974c9047ee43752f.tar.gz cgit-651ef79768dde30aabc61189974c9047ee43752f.tar.bz2 |
Make it possible for a single cmd to work both with and without a repo
When cgit_cmd.want_repo was 0, we used to assume that the cmd would never
be invoked for a repo. But soon this will become untrue (the 'about' cmd
is rapidly approching), so from now on we will initialize any requested
repo even if want_repo==0 (and return an error if want_repo==1 but no repo
is specified).
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -302,17 +302,26 @@ static void process_request(struct cgit_context *ctx) | |||
302 | cgit_print_http_headers(ctx); | 302 | cgit_print_http_headers(ctx); |
303 | cgit_print_docstart(ctx); | 303 | cgit_print_docstart(ctx); |
304 | cgit_print_pageheader(ctx); | 304 | cgit_print_pageheader(ctx); |
305 | cgit_print_error("Invalid request"); | 305 | cgit_print_error("Invalid request"); |
306 | cgit_print_docend(); | 306 | cgit_print_docend(); |
307 | return; | 307 | return; |
308 | } | 308 | } |
309 | 309 | ||
310 | if (cmd->want_repo && prepare_repo_cmd(ctx)) | 310 | if (cmd->want_repo && !ctx->repo) { |
311 | cgit_print_http_headers(ctx); | ||
312 | cgit_print_docstart(ctx); | ||
313 | cgit_print_pageheader(ctx); | ||
314 | cgit_print_error(fmt("No repository selected")); | ||
315 | cgit_print_docend(); | ||
316 | return; | ||
317 | } | ||
318 | |||
319 | if (ctx->repo && prepare_repo_cmd(ctx)) | ||
311 | return; | 320 | return; |
312 | 321 | ||
313 | if (cmd->want_layout) { | 322 | if (cmd->want_layout) { |
314 | cgit_print_http_headers(ctx); | 323 | cgit_print_http_headers(ctx); |
315 | cgit_print_docstart(ctx); | 324 | cgit_print_docstart(ctx); |
316 | cgit_print_pageheader(ctx); | 325 | cgit_print_pageheader(ctx); |
317 | } | 326 | } |
318 | 327 | ||