Make print_branch() handle refs not pointing at commits

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 0a6a5eda80884e5912a2b1fb463f50617ad006d0..4fab1c93bef64a847c98b42951ebc8a25b1cf1a2 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -38,6 +38,8 @@ 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_summary_tags          =  0;
+int cgit_summary_branches      =  0;
 int cgit_renamelimit           = -1;
 
 int cgit_max_msg_len = 60;
@@ -52,6 +54,7 @@ char *cgit_query_repo   = 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;
@@ -64,7 +67,7 @@ int htmlfd = 0;
 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++)
@@ -181,6 +184,10 @@ 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);
+       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, "renamelimit"))
@@ -226,6 +233,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);
+       } 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")) {
@@ -291,6 +300,47 @@ char *trim_end(const char *str, char c)
        return s;
 }
 
+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)
 {
@@ -386,10 +436,11 @@ int cgit_diff_files(const unsigned char *old_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;
+       int prefixlen;
 
        diff_setup(&opt);
        opt.output_format = DIFF_FORMAT_CALLBACK;
@@ -398,6 +449,12 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        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))
@@ -414,5 +471,5 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
 
        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);
 }