Merge branch 'lh/clone'

[cgit.git] / cgit.c

diff --git a/cgit.c b/cgit.c
index 4dc8eecc7f71c57cac77ebdb978d63d023bb5949..f49fffadf6191f904b07a3267597a0846f952433 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -19,8 +19,16 @@ void config_cb(const char *name, const char *value)
 {
        if (!strcmp(name, "root-title"))
                ctx.cfg.root_title = xstrdup(value);
+       else if (!strcmp(name, "root-desc"))
+               ctx.cfg.root_desc = xstrdup(value);
+       else if (!strcmp(name, "root-readme"))
+               ctx.cfg.root_readme = xstrdup(value);
        else if (!strcmp(name, "css"))
                ctx.cfg.css = xstrdup(value);
+       else if (!strcmp(name, "favicon"))
+               ctx.cfg.favicon = xstrdup(value);
+       else if (!strcmp(name, "footer"))
+               ctx.cfg.footer = xstrdup(value);
        else if (!strcmp(name, "logo"))
                ctx.cfg.logo = xstrdup(value);
        else if (!strcmp(name, "index-header"))
@@ -61,6 +69,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.max_msg_len = atoi(value);
        else if (!strcmp(name, "max-repodesc-length"))
                ctx.cfg.max_repodesc_len = atoi(value);
+       else if (!strcmp(name, "max-repo-count"))
+               ctx.cfg.max_repo_count = atoi(value);
        else if (!strcmp(name, "max-commit-count"))
                ctx.cfg.max_commit_count = atoi(value);
        else if (!strcmp(name, "summary-log"))
@@ -77,6 +87,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.robots = xstrdup(value);
        else if (!strcmp(name, "clone-prefix"))
                ctx.cfg.clone_prefix = xstrdup(value);
+       else if (!strcmp(name, "local-time"))
+               ctx.cfg.local_time = atoi(value);
        else if (!strcmp(name, "repo.group"))
                ctx.cfg.repo_group = xstrdup(value);
        else if (!strcmp(name, "repo.url"))
@@ -138,6 +150,8 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.path = trim_end(value, '/');
        } else if (!strcmp(name, "name")) {
                ctx.qry.name = xstrdup(value);
+       } else if (!strcmp(name, "mimetype")) {
+               ctx.qry.mimetype = xstrdup(value);
        }
 }
 
@@ -155,15 +169,21 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.cache_static_ttl = -1;
        ctx->cfg.css = "/cgit.css";
        ctx->cfg.logo = "/git-logo.png";
+       ctx->cfg.local_time = 0;
+       ctx->cfg.max_repo_count = 50;
        ctx->cfg.max_commit_count = 50;
        ctx->cfg.max_lock_attempts = 5;
-       ctx->cfg.max_msg_len = 60;
-       ctx->cfg.max_repodesc_len = 60;
+       ctx->cfg.max_msg_len = 80;
+       ctx->cfg.max_repodesc_len = 80;
        ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
        ctx->cfg.renamelimit = -1;
        ctx->cfg.robots = "index, nofollow";
        ctx->cfg.root_title = "Git repository browser";
+       ctx->cfg.root_desc = "a fast webinterface for the git dscm";
        ctx->cfg.script_name = CGIT_SCRIPT_NAME;
+       ctx->cfg.summary_branches = 10;
+       ctx->cfg.summary_log = 10;
+       ctx->cfg.summary_tags = 10;
        ctx->page.mimetype = "text/html";
        ctx->page.charset = PAGE_ENCODING;
        ctx->page.filename = NULL;
@@ -193,15 +213,19 @@ int find_current_ref(const char *refname, const unsigned char *sha1,
 char *find_default_branch(struct cgit_repo *repo)
 {
        struct refmatch info;
+       char *ref;
 
        info.req_ref = repo->defbranch;
        info.first_ref = NULL;
        info.match = 0;
        for_each_branch_ref(find_current_ref, &info);
        if (info.match)
-               return info.req_ref;
+               ref = info.req_ref;
        else
-               return info.first_ref;
+               ref = info.first_ref;
+       if (ref)
+               ref = xstrdup(ref);
+       return ref;
 }
 
 static int prepare_repo_cmd(struct cgit_context *ctx)
@@ -227,7 +251,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
 
        if (!ctx->qry.head) {
-               ctx->qry.head = xstrdup(find_default_branch(ctx->repo));
+               ctx->qry.head = find_default_branch(ctx->repo);
                ctx->repo->defbranch = ctx->qry.head;
        }
 
@@ -270,7 +294,16 @@ static void process_request(void *cbdata)
                return;
        }
 
-       if (cmd->want_repo && prepare_repo_cmd(ctx))
+       if (cmd->want_repo && !ctx->repo) {
+               cgit_print_http_headers(ctx);
+               cgit_print_docstart(ctx);
+               cgit_print_pageheader(ctx);
+               cgit_print_error(fmt("No repository selected"));
+               cgit_print_docend();
+               return;
+       }
+
+       if (ctx->repo && prepare_repo_cmd(ctx))
                return;
 
        if (cmd->want_layout) {
@@ -363,7 +396,7 @@ int main(int argc, const char **argv)
        err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
                            ctx.qry.raw, ttl, process_request, &ctx);
        if (err)
-               cache_log("[cgit] error %d - %s\n",
-                         err, strerror(err));
+               cgit_print_error(fmt("Error processing page: %s (%d)",
+                                    strerror(err), err));
        return err;
 }