12 files changed, 299 insertions, 90 deletions

@@ -16,7 +16,7 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 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
@@ -103,11 +103,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_sha1, cgit_query_sha2);
+                cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path);
                 break;
         default:
                 cgit_print_error("Invalid request");
@@ -272,10 +272,6 @@ table.diffstat {
         background-color: #eee;
 }
 
-table.diffstat tr:hover {
-        background-color: #ccc;
-}
-
 table.diffstat th {
         font-weight: normal;
         text-align: left;
@@ -339,6 +335,10 @@ div.diffstat-summary {
         padding-top: 0.5em;
 }
 
+table.diff {
+        width: 100%;
+}
+
 table.diff td {
         font-family: monospace;
         white-space: pre;
@@ -346,7 +346,8 @@ table.diff td {
 
 table.diff td div.head {
         font-weight: bold;
-        padding-top: 1em;
+        margin-top: 1em;
+        background-color: #eee;
 }
 
 table.diff td div.hunk {
@@ -28,6 +28,7 @@
 #define CMD_BLOB     5
 #define CMD_SNAPSHOT 6
 #define CMD_TAG      7
+#define CMD_REFS     8
 
 /*
  * Dateformats used on misc. pages
@@ -98,6 +99,21 @@ struct taginfo {
         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;
@@ -128,6 +144,8 @@ 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;
@@ -162,6 +180,10 @@ 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,
@@ -170,7 +192,7 @@ extern int cgit_diff_files(const unsigned char *old_sha1,
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
-                           filepair_fn fn);
+                           filepair_fn fn, const char *prefix);
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
@@ -214,6 +236,8 @@ 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,
@@ -230,6 +254,8 @@ 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();
@@ -237,8 +263,9 @@ extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *
 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);
+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);
@@ -30,6 +30,16 @@
 #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).
@@ -41,6 +51,13 @@
 #agefile=info/web/last-modified
 
 
+## Git detects renames, but with a limit on the number of files to
+## consider. This option can be used to specify another limit (or -1 to
+## use the default limit).
+##
+#renamelimit=-1
+
+
 ## Specify a root for virtual urls. This makes cgit generate urls like
 ##
 ##    http://localhost/git/repo/log/?h=branch
@@ -6,7 +6,7 @@ V=$1
 # Use `git describe` to get current version if we're inside a git repo
 if test -d .git
 then
-        V=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g')
+        V=$(git describe --abbrev=4 HEAD 2>/dev/null)
 fi
 
 new="CGIT_VERSION = $V"
@@ -38,6 +38,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_summary_tags          =  0;
+int cgit_summary_branches      =  0;
+int cgit_renamelimit           = -1;
 
 int cgit_max_msg_len = 60;
 int cgit_max_repodesc_len = 60;
@@ -63,7 +66,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++)
@@ -180,8 +183,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);
+        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"))
@@ -288,6 +297,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)
 {
@@ -383,17 +433,25 @@ 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;
         opt.detect_rename = 1;
+        opt.rename_limit = cgit_renamelimit;
         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))
@@ -410,5 +468,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);
 }
@@ -75,8 +75,8 @@ void print_fileinfo(struct fileinfo *info)
                 html("]</span>");
         }
         htmlf("</td><td class='%s'>", class);
-        cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
-                       info->new_path);
+        cgit_diff_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
+                       NULL, info->new_path);
         if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
                 htmlf(" (%s from %s)",
                       info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
@@ -9,6 +9,9 @@
 #include "cgit.h"
 
 
+unsigned char old_rev_sha1[20];
+unsigned char new_rev_sha1[20];
+
 /*
  * print a single line returned from xdiff
  */
@@ -67,9 +70,17 @@ static void header(unsigned char *sha1, char *path1, int mode1,
                                 htmlf("..%.6o", mode2);
                 }
                 html("<br/>--- a/");
-                html_txt(path1);
+                if (mode1 != 0)
+                        cgit_tree_link(path1, NULL, NULL, cgit_query_head,
+                                       sha1_to_hex(old_rev_sha1), path1);
+                else
+                        html_txt(path1);
                 html("<br/>+++ b/");
-                html_txt(path2);
+                if (mode2 != 0)
+                        cgit_tree_link(path2, NULL, NULL, cgit_query_head,
+                                       sha1_to_hex(new_rev_sha1), path2);
+                else
+                        html_txt(path2);
         }
         html("</div>");
 }
@@ -89,17 +100,16 @@ static void filepair_cb(struct diff_filepair *pair)
                 cgit_print_error("Error running diff");
 }
 
-void cgit_print_diff(const char *new_rev, const char *old_rev)
+void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
 {
-        unsigned char sha1[20], sha2[20];
         enum object_type type;
         unsigned long size;
         struct commit *commit, *commit2;
 
         if (!new_rev)
                 new_rev = cgit_query_head;
-        get_sha1(new_rev, sha1);
-        type = sha1_object_info(sha1, &size);
+        get_sha1(new_rev, new_rev_sha1);
+        type = sha1_object_info(new_rev_sha1, &size);
         if (type == OBJ_BAD) {
                 cgit_print_error(fmt("Bad object name: %s", new_rev));
                 return;
@@ -110,31 +120,30 @@ void cgit_print_diff(const char *new_rev, const char *old_rev)
                 return;
         }
 
-        commit = lookup_commit_reference(sha1);
+        commit = lookup_commit_reference(new_rev_sha1);
         if (!commit || parse_commit(commit))
-                cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1)));
+                cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
 
         if (old_rev)
-                get_sha1(old_rev, sha2);
+                get_sha1(old_rev, old_rev_sha1);
         else if (commit->parents && commit->parents->item)
-                hashcpy(sha2, commit->parents->item->object.sha1);
+                hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
         else
-                hashclr(sha2);
+                hashclr(old_rev_sha1);
 
-        if (!is_null_sha1(sha2)) {
-                type = sha1_object_info(sha2, &size);
+        if (!is_null_sha1(old_rev_sha1)) {
+                type = sha1_object_info(old_rev_sha1, &size);
                 if (type == OBJ_BAD) {
-                        cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2)));
+                        cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
                         return;
                 }
-                commit2 = lookup_commit_reference(sha2);
+                commit2 = lookup_commit_reference(old_rev_sha1);
                 if (!commit2 || parse_commit(commit2))
-                        cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2)));
+                        cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
         }
-
         html("<table class='diff'>");
         html("<tr><td>");
-        cgit_diff_tree(sha2, sha1, filepair_cb);
+        cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
         html("</td></tr>");
         html("</table>");
 }
@@ -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>");
+}
@@ -227,6 +227,12 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
         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)
 {
@@ -10,40 +10,60 @@
 
 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)
 {
-        struct commit *commit;
-        struct commitinfo *info;
-        char buf[256];
-        char *ref;
-
-        ref = xstrdup(refname);
-        strncpy(buf, refname, sizeof(buf));
-        commit = lookup_commit(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);
-                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);
-                html("</td></tr>\n");
-                cgit_free_commitinfo(info);
-        } else {
-                html("<tr><td>");
-                html_txt(buf);
-                html("</td><td colspan='3'>");
-                htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
-                html("</td></tr>\n");
-        }
-        free(ref);
+        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 int print_branch(struct refinfo *ref)
+{
+        struct commitinfo *info = ref->commit;
+        char *name = (char *)ref->refname;
+
+        if (!info)
+                return 1;
+        html("<tr><td>");
+        cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0);
+        html("</td><td>");
+        cgit_print_age(info->commit->date, -1, NULL);
+        html("</td><td>");
+        html_txt(info->author);
+        html("</td><td>");
+        cgit_commit_link(info->subject, NULL, NULL, name, NULL);
+        html("</td></tr>\n");
         return 0;
 }
 
@@ -56,29 +76,22 @@ static void print_tag_header()
         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 (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
-                        return 2;
-                if (!header)
-                        print_tag_header();
+        if (ref->object->type == OBJ_TAG) {
+                tag = (struct tag *)ref->object;
+                info = ref->tag;
+                if (!tag || !info)
+                        return 1;
                 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)
@@ -93,9 +106,9 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
                 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;
@@ -142,19 +155,64 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
         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++)
+                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()
@@ -182,8 +240,8 @@ void cgit_print_summary()
         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>");
 }