Merge branch 'filter-refs'

* filter-refs:
  Add links to the new refs page from summary page
  Add support for refs view
  Make cgit_print_branches()/cgit_print_tags() external
  Add descriptions of summary-branches and summary-tags to cgitrc
  Add support for config param summary-branches
  Move logic for age comparision from cmp_tag_age into cmp_age()
  Add support for config param summary-tags
  Sort tags by age
  Use reflist to print tag info
  Use reflist to print branch info
  Add functions and types for ref lists

8 files changed, 229 insertions, 37 deletions

diff --git a/Makefile b/Makefile
index 8e3da72..36b5ff6 100644
--- a/Makefile
+++ b/Makefile
@@ -11,17 +11,17 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 # Let the user override the above settings.
 #
 -include cgit.conf
 
 
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
         ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
-        ui-snapshot.o ui-blob.o ui-tag.o
+        ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o
 
 
 .PHONY: all git install clean distclean force-version get-git
 
 all: cgit git
 
 VERSION: force-version
         @./gen-version.sh "$(CGIT_VERSION)"
diff --git a/cgit.c b/cgit.c
index 1b85b15..cc18ed4 100644
--- a/cgit.c
+++ b/cgit.c
@@ -98,16 +98,19 @@ static void cgit_print_repo_page(struct cacheitem *item)
                                cgit_query_path, 1);
                 break;
         case CMD_TREE:
                 cgit_print_tree(cgit_query_sha1, cgit_query_path);
                 break;
         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_sha1, cgit_query_sha2, cgit_query_path);
                 break;
         default:
                 cgit_print_error("Invalid request");
diff --git a/cgit.h b/cgit.h
index e96311f..f8f0316 100644
--- a/cgit.h
+++ b/cgit.h
@@ -23,16 +23,17 @@
  */
 #define CMD_LOG      1
 #define CMD_COMMIT   2
 #define CMD_DIFF     3
 #define CMD_TREE     4
 #define CMD_BLOB     5
 #define CMD_SNAPSHOT 6
 #define CMD_TAG      7
+#define CMD_REFS     8
 
 /*
  * Dateformats used on misc. pages
  */
 #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S"
 #define FMT_SHORTDATE "%Y-%m-%d"
 
 
@@ -93,16 +94,31 @@ struct commitinfo {
 
 struct taginfo {
         char *tagger;
         char *tagger_email;
         int tagger_date;
         char *msg;
 };
 
+struct refinfo {
+        const char *refname;
+        struct object *object;
+        union {
+                struct taginfo *tag;
+                struct commitinfo *commit;
+        };
+};
+
+struct reflist {
+        struct refinfo **refs;
+        int alloc;
+        int count;
+};
+
 extern const char *cgit_version;
 
 extern struct repolist cgit_repolist;
 extern struct repoinfo *cgit_repo;
 extern int cgit_cmd;
 
 extern char *cgit_root_title;
 extern char *cgit_css;
@@ -123,16 +139,18 @@ extern int cgit_enable_log_filecount;
 extern int cgit_enable_log_linecount;
 extern int cgit_max_lock_attempts;
 extern int cgit_cache_root_ttl;
 extern int cgit_cache_repo_ttl;
 extern int cgit_cache_dynamic_ttl;
 extern int cgit_cache_static_ttl;
 extern int cgit_cache_max_create_time;
 extern int cgit_summary_log;
+extern int cgit_summary_tags;
+extern int cgit_summary_branches;
 
 extern int cgit_max_msg_len;
 extern int cgit_max_repodesc_len;
 extern int cgit_max_commit_count;
 
 extern int cgit_query_has_symref;
 extern int cgit_query_has_sha1;
 
@@ -157,16 +175,20 @@ extern void cgit_querystring_cb(const char *name, const char *value);
 
 extern int chk_zero(int result, char *msg);
 extern int chk_positive(int result, char *msg);
 extern int chk_non_negative(int result, char *msg);
 
 extern int hextoint(char c);
 extern char *trim_end(const char *str, char c);
 
+extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
+extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
+                        int flags, void *cb_data);
+
 extern void *cgit_free_commitinfo(struct commitinfo *info);
 
 extern int cgit_diff_files(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
                            linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
@@ -209,39 +231,44 @@ extern char *cgit_pageurl(const char *reponame, const char *pagename,
 extern const char *cgit_repobasename(const char *reponame);
 
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
                            char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
                           char *rev, char *path, int ofs);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
                              char *rev);
+extern void cgit_refs_link(char *name, char *title, char *class, char *head,
+                           char *rev, char *path);
 extern void cgit_snapshot_link(char *name, char *title, char *class,
                                char *head, char *rev, char *archivename);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
                            char *new_rev, char *old_rev, char *path);
 
 extern void cgit_object_link(struct object *obj);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_date(time_t secs, char *format);
 extern void cgit_print_age(time_t t, time_t max_relative, char *format);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title, int show_search);
 extern void cgit_print_snapshot_start(const char *mimetype,
                                       const char *filename,
                                       struct cacheitem *item);
+extern void cgit_print_branches(int maxcount);
+extern void cgit_print_tags(int maxcount);
 
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager);
 extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
 extern void cgit_print_tree(const char *rev, char *path);
 extern void cgit_print_commit(char *hex);
+extern void cgit_print_refs();
 extern void cgit_print_tag(char *revname);
 extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);
 extern void cgit_print_snapshot(struct cacheitem *item, const char *head,
                                 const char *hex, const char *prefix,
                                 const char *filename, int snapshot);
 extern void cgit_print_snapshot_links(const char *repo, const char *head,
                                       const char *hex, int snapshots);
 extern int cgit_parse_snapshots_mask(const char *str);
diff --git a/cgitrc b/cgitrc
index 796a62c..2b09e01 100644
--- a/cgitrc
+++ b/cgitrc
@@ -25,16 +25,26 @@
 #enable-log-linecount=0
 
 
 ## Enable/disable display of HEAD shortlog in summary view. Set it to maximum
 ## number of commits that should be displayed
 #summary-log=0
 
 
+## Restrict the number of branches printed in summary view. Set to 0 to
+## print all branches.
+#summary-branches=0
+
+
+## Restrict the number of tags printed in summary view. Set to 0 to
+## print all tags.
+#summary-tags=0
+
+
 ## The "Idle" column on the repository index page can read a timestamp
 ## from the specified agefile (if this file cannot be found, the mtime
 ## of HEAD is used).
 ## The cgit repo on hjemli.net uses the the following command in it's
 ## post-receive hook to update the age-file:
 ##   git-for-each-ref --format="%(committerdate)" --sort=-committerdate \
 ##     --count=1 > $GIT_DIR/info/web/last-modifie
 ##
diff --git a/shared.c b/shared.c
index 3d4feea..7eb2b0e 100644
--- a/shared.c
+++ b/shared.c
@@ -33,16 +33,18 @@ int cgit_enable_log_filecount  =  0;
 int cgit_enable_log_linecount  =  0;
 int cgit_max_lock_attempts     =  5;
 int cgit_cache_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;
 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;
 int cgit_max_repodesc_len = 60;
 int cgit_max_commit_count = 50;
 
 int cgit_query_has_symref = 0;
 int cgit_query_has_sha1   = 0;
@@ -59,17 +61,17 @@ char *cgit_query_name   = NULL;
 int   cgit_query_ofs    = 0;
 
 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++)
                 if (!strcmp(cmd, cmds[i]))
                         return i + 1;
         return 0;
 }
 
@@ -176,16 +178,20 @@ void cgit_global_config_cb(const char *name, const char *value)
         else if (!strcmp(name, "max-message-length"))
                 cgit_max_msg_len = atoi(value);
         else if (!strcmp(name, "max-repodesc-length"))
                 cgit_max_repodesc_len = atoi(value);
         else if (!strcmp(name, "max-commit-count"))
                 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"))
                 cgit_renamelimit = atoi(value);
         else if (!strcmp(name, "repo.group"))
                 cgit_repo_group = xstrdup(value);
         else if (!strcmp(name, "repo.url"))
                 cgit_repo = add_repo(value);
@@ -286,16 +292,57 @@ char *trim_end(const char *str, char c)
 
         c = t[len];
         t[len] = '\0';
         s = xstrdup(t);
         t[len] = 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)
 {
         int i;
 
         for (i = 0; i < q->nr; i++) {
                 if (q->queue[i]->status == 'U')
                         continue;
diff --git a/ui-refs.c b/ui-refs.c
new file mode 100644
index 0000000..295f5ba
--- a/dev/null
+++ b/ui-refs.c
@@ -0,0 +1,30 @@
+/* ui-refs.c: browse symbolic refs
+ *
+ * Copyright (C) 2006 Lars Hjemli
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
+#include "cgit.h"
+
+
+
+
+void cgit_print_refs()
+{
+
+        html("<table class='list nowrap'>");
+
+        if (cgit_query_path && !strncmp(cgit_query_path, "heads", 5))
+                cgit_print_branches(0);
+        else if (cgit_query_path && !strncmp(cgit_query_path, "tags", 4))
+                cgit_print_tags(0);
+        else {
+                cgit_print_branches(0);
+                html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+                cgit_print_tags(0);
+        }
+
+        html("</table>");
+}
diff --git a/ui-shared.c b/ui-shared.c
index 5c5bcf3..e4bb98f 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -222,16 +222,22 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
                 name[cgit_max_msg_len] = '\0';
                 name[cgit_max_msg_len - 1] = '.';
                 name[cgit_max_msg_len - 2] = '.';
                 name[cgit_max_msg_len - 3] = '.';
         }
         reporevlink("commit", name, title, class, head, rev, NULL);
 }
 
+void cgit_refs_link(char *name, char *title, char *class, char *head,
+                    char *rev, char *path)
+{
+        reporevlink("refs", name, title, class, head, rev, path);
+}
+
 void cgit_snapshot_link(char *name, char *title, char *class, char *head,
                         char *rev, char *archivename)
 {
         reporevlink("snapshot", name, title, class, head, rev, archivename);
 }
 
 void cgit_diff_link(char *name, char *title, char *class, char *head,
                     char *new_rev, char *old_rev, char *path)
diff --git a/ui-summary.c b/ui-summary.c
index de8a180..016fea2 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -5,102 +5,126 @@
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 static int header;
 
-static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
-                                int flags, void *cb_data)
+static int cmp_age(int age1, int age2)
+{
+        if (age1 != 0 && age2 != 0)
+                return age2 - age1;
+
+        if (age1 == 0 && age2 == 0)
+                return 0;
+
+        if (age1 == 0)
+                return +1;
+
+        return -1;
+}
+
+static int cmp_ref_name(const void *a, const void *b)
+{
+        struct refinfo *r1 = *(struct refinfo **)a;
+        struct refinfo *r2 = *(struct refinfo **)b;
+
+        return strcmp(r1->refname, r2->refname);
+}
+
+static int cmp_branch_age(const void *a, const void *b)
+{
+        struct refinfo *r1 = *(struct refinfo **)a;
+        struct refinfo *r2 = *(struct refinfo **)b;
+
+        return cmp_age(r1->commit->committer_date, r2->commit->committer_date);
+}
+
+static int cmp_tag_age(const void *a, const void *b)
+{
+        struct refinfo *r1 = *(struct refinfo **)a;
+        struct refinfo *r2 = *(struct refinfo **)b;
+
+        return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date);
+}
+
+static void cgit_print_branch(struct refinfo *ref)
 {
         struct commit *commit;
         struct commitinfo *info;
-        char buf[256];
-        char *ref;
+        char *name = (char *)ref->refname;
 
-        ref = xstrdup(refname);
-        strncpy(buf, refname, sizeof(buf));
-        commit = lookup_commit(sha1);
+        commit = lookup_commit(ref->object->sha1);
         // object is not really parsed at this point, because of some fallout
         // from previous calls to git functions in cgit_print_log()
         commit->object.parsed = 0;
         if (commit && !parse_commit(commit)){
                 info = cgit_parse_commit(commit);
                 html("<tr><td>");
-                cgit_log_link(ref, NULL, NULL, ref, NULL, NULL, 0);
+                cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0);
                 html("</td><td>");
                 cgit_print_age(commit->date, -1, NULL);
                 html("</td><td>");
                 html_txt(info->author);
                 html("</td><td>");
-                cgit_commit_link(info->subject, NULL, NULL, ref, NULL);
+                cgit_commit_link(info->subject, NULL, NULL, name, NULL);
                 html("</td></tr>\n");
                 cgit_free_commitinfo(info);
         } else {
                 html("<tr><td>");
-                html_txt(buf);
+                html_txt(name);
                 html("</td><td colspan='3'>");
-                htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
+                htmlf("*** bad ref %s ***", sha1_to_hex(ref->object->sha1));
                 html("</td></tr>\n");
         }
-        free(ref);
-        return 0;
 }
 
 static void print_tag_header()
 {
         html("<tr class='nohover'><th class='left'>Tag</th>"
              "<th class='left'>Age</th>"
              "<th class='left'>Author</th>"
              "<th class='left'>Reference</th></tr>\n");
         header = 1;
 }
 
-static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
-                                int flags, void *cb_data)
+static int print_tag(struct refinfo *ref)
 {
         struct tag *tag;
         struct taginfo *info;
-        struct object *obj;
-        char buf[256], *url;
+        char *url, *name = (char *)ref->refname;
 
-        strncpy(buf, refname, sizeof(buf));
-        obj = parse_object(sha1);
-        if (!obj)
-                return 1;
-        if (obj->type == OBJ_TAG) {
-                tag = lookup_tag(sha1);
+        if (ref->object->type == OBJ_TAG) {
+                tag = lookup_tag(ref->object->sha1);
                 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                         return 2;
-                if (!header)
-                        print_tag_header();
                 html("<tr><td>");
                 url = cgit_pageurl(cgit_query_repo, "tag",
-                                   fmt("id=%s", refname));
+                                   fmt("id=%s", name));
                 html_link_open(url, NULL, NULL);
-                html_txt(buf);
+                html_txt(name);
                 html_link_close();
                 html("</td><td>");
                 if (info->tagger_date > 0)
                         cgit_print_age(info->tagger_date, -1, NULL);
                 html("</td><td>");
                 if (info->tagger)
                         html(info->tagger);
                 html("</td><td>");
                 cgit_object_link(tag->tagged);
                 html("</td></tr>\n");
         } else {
                 if (!header)
                         print_tag_header();
                 html("<tr><td>");
-                html_txt(buf);
+                html_txt(name);
                 html("</td><td colspan='2'/><td>");
-                cgit_object_link(obj);
+                cgit_object_link(ref->object);
                 html("</td></tr>\n");
         }
         return 0;
 }
 
 static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
                                  int flags, void *cb_data)
 {
@@ -137,29 +161,74 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
                                buf));
         html_link_open(url, NULL, NULL);
         html_txt(buf);
         html_link_close();
         html("</td></tr>");
         return 0;
 }
 
-static void cgit_print_branches()
+static void print_refs_link(char *path)
 {
+        html("<tr class='nohover'><td colspan='4'>");
+        cgit_refs_link("[...]", NULL, NULL, cgit_query_head, NULL, path);
+        html("</td></tr>");
+}
+
+void cgit_print_branches(int maxcount)
+{
+        struct reflist list;
+        int i;
+
         html("<tr class='nohover'><th class='left'>Branch</th>"
              "<th class='left'>Idle</th>"
              "<th class='left'>Author</th>"
              "<th class='left'>Head commit</th></tr>\n");
-        for_each_branch_ref(cgit_print_branch_cb, NULL);
+
+        list.refs = NULL;
+        list.alloc = list.count = 0;
+        for_each_branch_ref(cgit_refs_cb, &list);
+
+        if (maxcount == 0 || maxcount > list.count)
+                maxcount = list.count;
+
+        if (maxcount < list.count) {
+                qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
+                qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
+        }
+
+        for(i=0; i<maxcount; i++)
+                cgit_print_branch(list.refs[i]);
+
+        if (maxcount < list.count)
+                print_refs_link("heads");
 }
 
-static void cgit_print_tags()
+void cgit_print_tags(int maxcount)
 {
+        struct reflist list;
+        int i;
+
         header = 0;
-        for_each_tag_ref(cgit_print_tag_cb, NULL);
+        list.refs = NULL;
+        list.alloc = list.count = 0;
+        for_each_tag_ref(cgit_refs_cb, &list);
+        if (list.count == 0)
+                return;
+        qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age);
+        if (!maxcount)
+                maxcount = list.count;
+        else if (maxcount > list.count)
+                maxcount = list.count;
+        print_tag_header();
+        for(i=0; i<maxcount; i++)
+                print_tag(list.refs[i]);
+
+        if (maxcount < list.count)
+                print_refs_link("tags");
 }
 
 static void cgit_print_archives()
 {
         header = 0;
         for_each_ref(cgit_print_archive_cb, NULL);
         if (header)
                 html("</table>");
@@ -177,13 +246,13 @@ void cgit_print_summary()
         if (cgit_repo->readme)
                 html_include(cgit_repo->readme);
         html("</div>");
         if (cgit_summary_log > 0)
                 cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0);
         html("<table class='list nowrap'>");
         if (cgit_summary_log > 0)
                 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
-        cgit_print_branches();
+        cgit_print_branches(cgit_summary_branches);
         html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
-        cgit_print_tags();
+        cgit_print_tags(cgit_summary_tags);
         html("</table>");
 }