Change the cgit layout

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 1cd60a2d6b00b97f292b6ee306256358287f95ab..e06df91bb8c74a617fa95d67e8b0737b4a1099cb 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -18,6 +18,7 @@ char *cgit_root_title   = "Git repository browser";
 char *cgit_css          = "/cgit.css";
 char *cgit_logo         = "/git-logo.png";
 char *cgit_index_header = NULL;
 char *cgit_css          = "/cgit.css";
 char *cgit_logo         = "/git-logo.png";
 char *cgit_index_header = NULL;

+char *cgit_index_info   = NULL;

 char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
 char *cgit_module_link  = "./?repo=%s&page=commit&id=%s";
 char *cgit_agefile      = "info/web/last-modified";
 char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
 char *cgit_module_link  = "./?repo=%s&page=commit&id=%s";
 char *cgit_agefile      = "info/web/last-modified";


@@ -38,6 +39,9 @@ int cgit_cache_dynamic_ttl     =  5;
 int cgit_cache_static_ttl      = -1;
 int cgit_cache_max_create_time =  5;
 int cgit_summary_log           =  0;
 int cgit_cache_static_ttl      = -1;
 int cgit_cache_max_create_time =  5;
 int cgit_summary_log           =  0;

+int cgit_summary_tags          =  0;
+int cgit_summary_branches      =  0;
+int cgit_renamelimit           = -1;

 
 int cgit_max_msg_len = 60;
 int cgit_max_repodesc_len = 60;
 
 int cgit_max_msg_len = 60;
 int cgit_max_repodesc_len = 60;


@@ -51,6 +55,7 @@ char *cgit_query_repo   = NULL;
 char *cgit_query_page   = NULL;
 char *cgit_query_head   = NULL;
 char *cgit_query_search = NULL;
 char *cgit_query_page   = NULL;
 char *cgit_query_head   = NULL;
 char *cgit_query_search = NULL;

+char *cgit_query_grep   = NULL;

 char *cgit_query_sha1   = NULL;
 char *cgit_query_sha2   = NULL;
 char *cgit_query_path   = NULL;
 char *cgit_query_sha1   = NULL;
 char *cgit_query_sha2   = NULL;
 char *cgit_query_path   = NULL;


@@ -63,7 +68,7 @@ int htmlfd = 0;
 int cgit_get_cmd_index(const char *cmd)
 {
        static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
 int cgit_get_cmd_index(const char *cmd)
 {
        static char *cmds[] = {"log", "commit", "diff", "tree", "blob",

-                              "snapshot", "tag", NULL};
+                              "snapshot", "tag", "refs", NULL};

        int i;
 
        for(i = 0; cmds[i]; i++)
        int i;
 
        for(i = 0; cmds[i]; i++)


@@ -108,7 +113,7 @@ struct repoinfo *add_repo(const char *url)
        }
 
        ret = &cgit_repolist.repos[cgit_repolist.count-1];
        }
 
        ret = &cgit_repolist.repos[cgit_repolist.count-1];

-       ret->url = xstrdup(url);
+       ret->url = trim_end(url, '/');

        ret->name = ret->url;
        ret->path = NULL;
        ret->desc = NULL;
        ret->name = ret->url;
        ret->path = NULL;
        ret->desc = NULL;


@@ -146,12 +151,14 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_logo = xstrdup(value);
        else if (!strcmp(name, "index-header"))
                cgit_index_header = xstrdup(value);
                cgit_logo = xstrdup(value);
        else if (!strcmp(name, "index-header"))
                cgit_index_header = xstrdup(value);

+       else if (!strcmp(name, "index-info"))
+               cgit_index_info = xstrdup(value);

        else if (!strcmp(name, "logo-link"))
                cgit_logo_link = xstrdup(value);
        else if (!strcmp(name, "module-link"))
                cgit_module_link = xstrdup(value);
        else if (!strcmp(name, "virtual-root"))
        else if (!strcmp(name, "logo-link"))
                cgit_logo_link = xstrdup(value);
        else if (!strcmp(name, "module-link"))
                cgit_module_link = xstrdup(value);
        else if (!strcmp(name, "virtual-root"))

-               cgit_virtual_root = xstrdup(value);
+               cgit_virtual_root = trim_end(value, '/');

        else if (!strcmp(name, "nocache"))
                cgit_nocache = atoi(value);
        else if (!strcmp(name, "snapshots"))
        else if (!strcmp(name, "nocache"))
                cgit_nocache = atoi(value);
        else if (!strcmp(name, "snapshots"))


@@ -180,8 +187,14 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_max_commit_count = atoi(value);
        else if (!strcmp(name, "summary-log"))
                cgit_summary_log = atoi(value);
                cgit_max_commit_count = atoi(value);
        else if (!strcmp(name, "summary-log"))
                cgit_summary_log = atoi(value);

+       else if (!strcmp(name, "summary-branches"))
+               cgit_summary_branches = atoi(value);
+       else if (!strcmp(name, "summary-tags"))
+               cgit_summary_tags = atoi(value);

        else if (!strcmp(name, "agefile"))
                cgit_agefile = xstrdup(value);
        else if (!strcmp(name, "agefile"))
                cgit_agefile = xstrdup(value);

+       else if (!strcmp(name, "renamelimit"))
+               cgit_renamelimit = atoi(value);

        else if (!strcmp(name, "repo.group"))
                cgit_repo_group = xstrdup(value);
        else if (!strcmp(name, "repo.url"))
        else if (!strcmp(name, "repo.group"))
                cgit_repo_group = xstrdup(value);
        else if (!strcmp(name, "repo.url"))


@@ -189,7 +202,7 @@ void cgit_global_config_cb(const char *name, const char *value)
        else if (!strcmp(name, "repo.name"))
                cgit_repo->name = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.path"))
        else if (!strcmp(name, "repo.name"))
                cgit_repo->name = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.path"))

-               cgit_repo->path = xstrdup(value);
+               cgit_repo->path = trim_end(value, '/');

        else if (cgit_repo && !strcmp(name, "repo.desc"))
                cgit_repo->desc = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.owner"))
        else if (cgit_repo && !strcmp(name, "repo.desc"))
                cgit_repo->desc = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.owner"))


@@ -223,6 +236,8 @@ void cgit_querystring_cb(const char *name, const char *value)
                cgit_cmd = cgit_get_cmd_index(value);
        } else if (!strcmp(name, "url")) {
                cgit_parse_url(value);
                cgit_cmd = cgit_get_cmd_index(value);
        } else if (!strcmp(name, "url")) {
                cgit_parse_url(value);

+       } else if (!strcmp(name, "qt")) {
+               cgit_query_grep = xstrdup(value);

        } else if (!strcmp(name, "q")) {
                cgit_query_search = xstrdup(value);
        } else if (!strcmp(name, "h")) {
        } else if (!strcmp(name, "q")) {
                cgit_query_search = xstrdup(value);
        } else if (!strcmp(name, "h")) {


@@ -288,6 +303,78 @@ char *trim_end(const char *str, char c)
        return s;
 }
 
        return s;
 }
 

+char *strlpart(char *txt, int maxlen)
+{
+       char *result;
+
+       if (!txt)
+               return txt;
+
+       if (strlen(txt) <= maxlen)
+               return txt;
+       result = xmalloc(maxlen + 1);
+       memcpy(result, txt, maxlen - 3);
+       result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.';
+       result[maxlen] = '\0';
+       return result;
+}
+
+char *strrpart(char *txt, int maxlen)
+{
+       char *result;
+
+       if (!txt)
+               return txt;
+
+       if (strlen(txt) <= maxlen)
+               return txt;
+       result = xmalloc(maxlen + 1);
+       memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3);
+       result[0] = result[1] = result[2] = '.';
+       return result;
+}
+
+void cgit_add_ref(struct reflist *list, struct refinfo *ref)
+{
+       size_t size;
+
+       if (list->count >= list->alloc) {
+               list->alloc += (list->alloc ? list->alloc : 4);
+               size = list->alloc * sizeof(struct refinfo *);
+               list->refs = xrealloc(list->refs, size);
+       }
+       list->refs[list->count++] = ref;
+}
+
+struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
+{
+       struct refinfo *ref;
+
+       ref = xmalloc(sizeof (struct refinfo));
+       ref->refname = xstrdup(refname);
+       ref->object = parse_object(sha1);
+       switch (ref->object->type) {
+       case OBJ_TAG:
+               ref->tag = cgit_parse_tag((struct tag *)ref->object);
+               break;
+       case OBJ_COMMIT:
+               ref->commit = cgit_parse_commit((struct commit *)ref->object);
+               break;
+       }
+       return ref;
+}
+
+int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
+                 void *cb_data)
+{
+       struct reflist *list = (struct reflist *)cb_data;
+       struct refinfo *info = cgit_mk_refinfo(refname, sha1);
+
+       if (info)
+               cgit_add_ref(list, info);
+       return 0;
+}
+

 void cgit_diff_tree_cb(struct diff_queue_struct *q,
                       struct diff_options *options, void *data)
 {
 void cgit_diff_tree_cb(struct diff_queue_struct *q,
                       struct diff_options *options, void *data)
 {


@@ -308,7 +395,8 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
                file->ptr = (char *)"";
                file->size = 0;
        } else {
                file->ptr = (char *)"";
                file->size = 0;
        } else {

-               file->ptr = read_sha1_file(sha1, &type, &file->size);
+               file->ptr = read_sha1_file(sha1, &type, 
+                                          (unsigned long *)&file->size);

        }
        return 1;
 }
        }
        return 1;
 }


@@ -382,17 +470,25 @@ int cgit_diff_files(const unsigned char *old_sha1,
 
 void cgit_diff_tree(const unsigned char *old_sha1,
                    const unsigned char *new_sha1,
 
 void cgit_diff_tree(const unsigned char *old_sha1,
                    const unsigned char *new_sha1,

-                   filepair_fn fn)
+                   filepair_fn fn, const char *prefix)

 {
        struct diff_options opt;
        int ret;
 {
        struct diff_options opt;
        int ret;

+       int prefixlen;

 
        diff_setup(&opt);
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;
 
        diff_setup(&opt);
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;

+       opt.rename_limit = cgit_renamelimit;

        opt.recursive = 1;
        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        opt.recursive = 1;
        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;

+       if (prefix) {
+               opt.nr_paths = 1;
+               opt.paths = &prefix;
+               prefixlen = strlen(prefix);
+               opt.pathlens = &prefixlen;
+       }

        diff_setup_done(&opt);
 
        if (old_sha1 && !is_null_sha1(old_sha1))
        diff_setup_done(&opt);
 
        if (old_sha1 && !is_null_sha1(old_sha1))


@@ -409,5 +505,5 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
 
        if (commit->parents)
                old_sha1 = commit->parents->item->object.sha1;
 
        if (commit->parents)
                old_sha1 = commit->parents->item->object.sha1;

-       cgit_diff_tree(old_sha1, commit->object.sha1, fn);
+       cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);

 }
 }