Use GIT-1.5.4.rc4

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index f5135d9242dd07175909e999e5ec69d648c48907..e8acc032583404dd243d58e09c1c421c2804a3cb 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -8,9 +8,6 @@
 
 #include "cgit.h"
 
-const char cgit_version[] = CGIT_VERSION;
-
-
 static int cgit_prepare_cache(struct cacheitem *item)
 {
        if (!cgit_repo && cgit_query_repo) {
@@ -29,13 +26,15 @@ static int cgit_prepare_cache(struct cacheitem *item)
        }
 
        if (!cgit_cmd) {
-               item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
-                          cache_safe_filename(cgit_repo->url)));
+               item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root,
+                                        cache_safe_filename(cgit_repo->url),
+                                        cache_safe_filename(cgit_querystring)));
                item->ttl = cgit_cache_repo_ttl;
        } else {
                item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
-                          cache_safe_filename(cgit_repo->url), cgit_query_page,
-                          cache_safe_filename(cgit_querystring)));
+                                        cache_safe_filename(cgit_repo->url),
+                                        cgit_query_page,
+                                        cache_safe_filename(cgit_querystring)));
                if (cgit_query_has_symref)
                        item->ttl = cgit_cache_dynamic_ttl;
                else if (cgit_query_has_sha1)
@@ -46,13 +45,44 @@ static int cgit_prepare_cache(struct cacheitem *item)
        return 1;
 }
 
+struct refmatch {
+       char *req_ref;
+       char *first_ref;
+       int match;
+};
+
+int find_current_ref(const char *refname, const unsigned char *sha1,
+                    int flags, void *cb_data)
+{
+       struct refmatch *info;
+
+       info = (struct refmatch *)cb_data;
+       if (!strcmp(refname, info->req_ref))
+               info->match = 1;
+       if (!info->first_ref)
+               info->first_ref = xstrdup(refname);
+       return info->match;
+}
+
+char *find_default_branch(struct repoinfo *repo)
+{
+       struct refmatch info;
+
+       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;
+       else
+               return info.first_ref;
+}
+
 static void cgit_print_repo_page(struct cacheitem *item)
 {
-       char *title;
+       char *title, *tmp;
        int show_search;
-
-       if (!cgit_query_head)
-               cgit_query_head = cgit_repo->defbranch;
+       unsigned char sha1[20];
 
        if (chdir(cgit_repo->path)) {
                title = fmt("%s - %s", cgit_root_title, "Bad request");
@@ -68,9 +98,39 @@ static void cgit_print_repo_page(struct cacheitem *item)
        show_search = 0;
        setenv("GIT_DIR", cgit_repo->path, 1);
 
+       if (!cgit_query_head) {
+               cgit_query_head = xstrdup(find_default_branch(cgit_repo));
+               cgit_repo->defbranch = cgit_query_head;
+       }
+
+       if (!cgit_query_head) {
+               cgit_print_docstart(title, item);
+               cgit_print_pageheader(title, 0);
+               cgit_print_error("Repository seems to be empty");
+               cgit_print_docend();
+               return;
+       }
+
+       if (get_sha1(cgit_query_head, sha1)) {
+               tmp = xstrdup(cgit_query_head);
+               cgit_query_head = cgit_repo->defbranch;
+               cgit_print_docstart(title, item);
+               cgit_print_pageheader(title, 0);
+               cgit_print_error(fmt("Invalid branch: %s", tmp));
+               cgit_print_docend();
+               return;
+       }
+
        if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
-               cgit_print_snapshot(item, cgit_query_sha1, "zip",
-                                   cgit_repo->url, cgit_query_name);
+               cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1,
+                                   cgit_repobasename(cgit_repo->url),
+                                   cgit_query_path,
+                                   cgit_repo->snapshots );
+               return;
+       }
+
+       if (cgit_cmd == CMD_PATCH) {
+               cgit_print_patch(cgit_query_sha1, item);
                return;
        }
 
@@ -92,8 +152,8 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
        switch(cgit_cmd) {
        case CMD_LOG:
-               cgit_print_log(cgit_query_head, cgit_query_ofs,
-                              cgit_max_commit_count, cgit_query_search,
+               cgit_print_log(cgit_query_sha1, cgit_query_ofs,
+                              cgit_max_commit_count, cgit_query_grep, cgit_query_search,
                               cgit_query_path, 1);
                break;
        case CMD_TREE:
@@ -102,9 +162,14 @@ static void cgit_print_repo_page(struct cacheitem *item)
        case CMD_COMMIT:
                cgit_print_commit(cgit_query_sha1);
                break;
+       case CMD_REFS:
+               cgit_print_refs();
+               break;
+       case CMD_TAG:
+               cgit_print_tag(cgit_query_sha1);
+               break;
        case CMD_DIFF:
-               cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2,
-                               cgit_query_path);
+               cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path);
                break;
        default:
                cgit_print_error("Invalid request");
@@ -224,6 +289,7 @@ static void cgit_parse_args(int argc, const char **argv)
 int main(int argc, const char **argv)
 {
        struct cacheitem item;
+       const char *cgit_config_env = getenv("CGIT_CONFIG");
 
        htmlfd = STDOUT_FILENO;
        item.st.st_mtime = time(NULL);
@@ -231,7 +297,8 @@ int main(int argc, const char **argv)
        cgit_repolist.count = 0;
        cgit_repolist.repos = NULL;
 
-       cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
+       cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
+                        cgit_global_config_cb);
        cgit_repo = NULL;
        if (getenv("SCRIPT_NAME"))
                cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));