12 files changed, 257 insertions, 165 deletions

@@ -19,6 +19,10 @@ void config_cb(const char *name, const char *value)
 {
         if (!strcmp(name, "root-title"))
                 ctx.cfg.root_title = xstrdup(value);
+        else if (!strcmp(name, "root-desc"))
+                ctx.cfg.root_desc = xstrdup(value);
+        else if (!strcmp(name, "root-readme"))
+                ctx.cfg.root_readme = xstrdup(value);
         else if (!strcmp(name, "css"))
                 ctx.cfg.css = xstrdup(value);
         else if (!strcmp(name, "logo"))
@@ -163,6 +167,7 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.renamelimit = -1;
         ctx->cfg.robots = "index, nofollow";
         ctx->cfg.root_title = "Git repository browser";
+        ctx->cfg.root_desc = "a fast webinterface for the git dscm";
         ctx->cfg.script_name = CGIT_SCRIPT_NAME;
         ctx->page.mimetype = "text/html";
         ctx->page.charset = PAGE_ENCODING;
@@ -270,7 +275,16 @@ static void process_request(void *cbdata)
                 return;
         }
 
-        if (cmd->want_repo && prepare_repo_cmd(ctx))
+        if (cmd->want_repo && !ctx->repo) {
+                cgit_print_http_headers(ctx);
+                cgit_print_docstart(ctx);
+                cgit_print_pageheader(ctx);
+                cgit_print_error(fmt("No repository selected"));
+                cgit_print_docend();
+                return;
+        }
+
+        if (ctx->repo && prepare_repo_cmd(ctx))
                 return;
 
         if (cmd->want_layout) {
@@ -132,6 +132,8 @@ struct cgit_config {
         char *repo_group;
         char *robots;
         char *root_title;
+        char *root_desc;
+        char *root_readme;
         char *script_name;
         char *virtual_root;
         int cache_size;
@@ -22,6 +22,14 @@
 #include "ui-tag.h"
 #include "ui-tree.h"
 
+static void about_fn(struct cgit_context *ctx)
+{
+        if (ctx->repo)
+                cgit_print_repo_readme();
+        else
+                cgit_print_site_readme();
+}
+
 static void blob_fn(struct cgit_context *ctx)
 {
         cgit_print_blob(ctx->qry.sha1, ctx->qry.path);
@@ -94,6 +102,7 @@ static void tree_fn(struct cgit_context *ctx)
 struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
 {
         static struct cgit_cmd cmds[] = {
+                def_cmd(about, 0, 1),
                 def_cmd(blob, 1, 0),
                 def_cmd(commit, 1, 1),
                 def_cmd(diff, 1, 1),
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
+#include <errno.h>
 
 int htmlfd = STDOUT_FILENO;
 
@@ -168,8 +169,11 @@ int html_include(const char *filename)
         char buf[4096];
         size_t len;
 
-        if (!(f = fopen(filename, "r")))
+        if (!(f = fopen(filename, "r"))) {
+                fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n",
+                        filename, strerror(errno), errno);
                 return -1;
+        }
         while((len = fread(buf, 1, 4096, f)) > 0)
                 write(htmlfd, buf, len);
         fclose(f);
@@ -11,131 +11,6 @@
 #include "ui-shared.h"
 #include "ui-diff.h"
 
-static int files, slots;
-static int total_adds, total_rems, max_changes;
-static int lines_added, lines_removed;
-static char *curr_rev;
-
-static struct fileinfo {
-        char status;
-        unsigned char old_sha1[20];
-        unsigned char new_sha1[20];
-        unsigned short old_mode;
-        unsigned short new_mode;
-        char *old_path;
-        char *new_path;
-        unsigned int added;
-        unsigned int removed;
-} *items;
-
-
-void print_fileinfo(struct fileinfo *info)
-{
-        char *class;
-
-        switch (info->status) {
-        case DIFF_STATUS_ADDED:
-                class = "add";
-                break;
-        case DIFF_STATUS_COPIED:
-                class = "cpy";
-                break;
-        case DIFF_STATUS_DELETED:
-                class = "del";
-                break;
-        case DIFF_STATUS_MODIFIED:
-                class = "upd";
-                break;
-        case DIFF_STATUS_RENAMED:
-                class = "mov";
-                break;
-        case DIFF_STATUS_TYPE_CHANGED:
-                class = "typ";
-                break;
-        case DIFF_STATUS_UNKNOWN:
-                class = "unk";
-                break;
-        case DIFF_STATUS_UNMERGED:
-                class = "stg";
-                break;
-        default:
-                die("bug: unhandled diff status %c", info->status);
-        }
-
-        html("<tr>");
-        htmlf("<td class='mode'>");
-        if (is_null_sha1(info->new_sha1)) {
-                cgit_print_filemode(info->old_mode);
-        } else {
-                cgit_print_filemode(info->new_mode);
-        }
-
-        if (info->old_mode != info->new_mode &&
-            !is_null_sha1(info->old_sha1) &&
-            !is_null_sha1(info->new_sha1)) {
-                html("<span class='modechange'>[");
-                cgit_print_filemode(info->old_mode);
-                html("]</span>");
-        }
-        htmlf("</td><td class='%s'>", class);
-        cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.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",
-                      info->old_path);
-        html("</td><td class='right'>");
-        htmlf("%d", info->added + info->removed);
-        html("</td><td class='graph'>");
-        htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
-        htmlf("<td class='add' style='width: %.1f%%;'/>",
-              info->added * 100.0 / max_changes);
-        htmlf("<td class='rem' style='width: %.1f%%;'/>",
-              info->removed * 100.0 / max_changes);
-        htmlf("<td class='none' style='width: %.1f%%;'/>",
-              (max_changes - info->removed - info->added) * 100.0 / max_changes);
-        html("</tr></table></td></tr>\n");
-}
-
-void cgit_count_diff_lines(char *line, int len)
-{
-        if (line && (len > 0)) {
-                if (line[0] == '+')
-                        lines_added++;
-                else if (line[0] == '-')
-                        lines_removed++;
-        }
-}
-
-void inspect_filepair(struct diff_filepair *pair)
-{
-        files++;
-        lines_added = 0;
-        lines_removed = 0;
-        cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines);
-        if (files >= slots) {
-                if (slots == 0)
-                        slots = 4;
-                else
-                        slots = slots * 2;
-                items = xrealloc(items, slots * sizeof(struct fileinfo));
-        }
-        items[files-1].status = pair->status;
-        hashcpy(items[files-1].old_sha1, pair->one->sha1);
-        hashcpy(items[files-1].new_sha1, pair->two->sha1);
-        items[files-1].old_mode = pair->one->mode;
-        items[files-1].new_mode = pair->two->mode;
-        items[files-1].old_path = xstrdup(pair->one->path);
-        items[files-1].new_path = xstrdup(pair->two->path);
-        items[files-1].added = lines_added;
-        items[files-1].removed = lines_removed;
-        if (lines_added + lines_removed > max_changes)
-                max_changes = lines_added + lines_removed;
-        total_adds += lines_added;
-        total_rems += lines_removed;
-}
-
-
 void cgit_print_commit(char *hex)
 {
         struct commit *commit, *parent;
@@ -143,11 +18,9 @@ void cgit_print_commit(char *hex)
         struct commit_list *p;
         unsigned char sha1[20];
         char *tmp;
-        int i;
 
         if (!hex)
                 hex = ctx.qry.head;
-        curr_rev = hex;
 
         if (get_sha1(hex, sha1)) {
                 cgit_print_error(fmt("Bad object id: %s", hex));
@@ -216,21 +89,10 @@ void cgit_print_commit(char *hex)
         html("<div class='commit-msg'>");
         html_txt(info->msg);
         html("</div>");
-        if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
-                html("<div class='diffstat-header'>Diffstat</div>");
-                html("<table summary='diffstat' class='diffstat'>");
-                max_changes = 0;
-                cgit_diff_commit(commit, inspect_filepair);
-                for(i = 0; i<files; i++)
-                        print_fileinfo(&items[i]);
-                html("</table>");
-                html("<div class='diffstat-summary'>");
-                htmlf("%d files changed, %d insertions, %d deletions",
-                      files, total_adds, total_rems);
-                html("</div>");
-                cgit_print_diff(ctx.qry.sha1,
-                                sha1_to_hex(commit->parents->item->object.sha1),
-                                NULL);
+        if (!(commit->parents && commit->parents->next &&
+              commit->parents->next->next)) {
+                tmp = sha1_to_hex(commit->parents->item->object.sha1);
+                cgit_print_diff(ctx.qry.sha1, tmp, NULL);
         }
         cgit_free_commitinfo(info);
 }
@@ -13,6 +13,149 @@
 unsigned char old_rev_sha1[20];
 unsigned char new_rev_sha1[20];
 
+static int files, slots;
+static int total_adds, total_rems, max_changes;
+static int lines_added, lines_removed;
+static char *curr_rev;
+
+static struct fileinfo {
+        char status;
+        unsigned char old_sha1[20];
+        unsigned char new_sha1[20];
+        unsigned short old_mode;
+        unsigned short new_mode;
+        char *old_path;
+        char *new_path;
+        unsigned int added;
+        unsigned int removed;
+} *items;
+
+
+static void print_fileinfo(struct fileinfo *info)
+{
+        char *class;
+
+        switch (info->status) {
+        case DIFF_STATUS_ADDED:
+                class = "add";
+                break;
+        case DIFF_STATUS_COPIED:
+                class = "cpy";
+                break;
+        case DIFF_STATUS_DELETED:
+                class = "del";
+                break;
+        case DIFF_STATUS_MODIFIED:
+                class = "upd";
+                break;
+        case DIFF_STATUS_RENAMED:
+                class = "mov";
+                break;
+        case DIFF_STATUS_TYPE_CHANGED:
+                class = "typ";
+                break;
+        case DIFF_STATUS_UNKNOWN:
+                class = "unk";
+                break;
+        case DIFF_STATUS_UNMERGED:
+                class = "stg";
+                break;
+        default:
+                die("bug: unhandled diff status %c", info->status);
+        }
+
+        html("<tr>");
+        htmlf("<td class='mode'>");
+        if (is_null_sha1(info->new_sha1)) {
+                cgit_print_filemode(info->old_mode);
+        } else {
+                cgit_print_filemode(info->new_mode);
+        }
+
+        if (info->old_mode != info->new_mode &&
+            !is_null_sha1(info->old_sha1) &&
+            !is_null_sha1(info->new_sha1)) {
+                html("<span class='modechange'>[");
+                cgit_print_filemode(info->old_mode);
+                html("]</span>");
+        }
+        htmlf("</td><td class='%s'>", class);
+        cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.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",
+                      info->old_path);
+        html("</td><td class='right'>");
+        htmlf("%d", info->added + info->removed);
+        html("</td><td class='graph'>");
+        htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
+        htmlf("<td class='add' style='width: %.1f%%;'/>",
+              info->added * 100.0 / max_changes);
+        htmlf("<td class='rem' style='width: %.1f%%;'/>",
+              info->removed * 100.0 / max_changes);
+        htmlf("<td class='none' style='width: %.1f%%;'/>",
+              (max_changes - info->removed - info->added) * 100.0 / max_changes);
+        html("</tr></table></td></tr>\n");
+}
+
+static void count_diff_lines(char *line, int len)
+{
+        if (line && (len > 0)) {
+                if (line[0] == '+')
+                        lines_added++;
+                else if (line[0] == '-')
+                        lines_removed++;
+        }
+}
+
+static void inspect_filepair(struct diff_filepair *pair)
+{
+        files++;
+        lines_added = 0;
+        lines_removed = 0;
+        cgit_diff_files(pair->one->sha1, pair->two->sha1, count_diff_lines);
+        if (files >= slots) {
+                if (slots == 0)
+                        slots = 4;
+                else
+                        slots = slots * 2;
+                items = xrealloc(items, slots * sizeof(struct fileinfo));
+        }
+        items[files-1].status = pair->status;
+        hashcpy(items[files-1].old_sha1, pair->one->sha1);
+        hashcpy(items[files-1].new_sha1, pair->two->sha1);
+        items[files-1].old_mode = pair->one->mode;
+        items[files-1].new_mode = pair->two->mode;
+        items[files-1].old_path = xstrdup(pair->one->path);
+        items[files-1].new_path = xstrdup(pair->two->path);
+        items[files-1].added = lines_added;
+        items[files-1].removed = lines_removed;
+        if (lines_added + lines_removed > max_changes)
+                max_changes = lines_added + lines_removed;
+        total_adds += lines_added;
+        total_rems += lines_removed;
+}
+
+void cgit_print_diffstat(const unsigned char *old_sha1,
+                         const unsigned char *new_sha1)
+{
+        int i;
+
+        html("<div class='diffstat-header'>Diffstat</div>");
+        html("<table summary='diffstat' class='diffstat'>");
+        max_changes = 0;
+        cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
+        for(i = 0; i<files; i++)
+                print_fileinfo(&items[i]);
+        html("</table>");
+        html("<div class='diffstat-summary'>");
+        htmlf("%d files changed, %d insertions, %d deletions",
+              files, total_adds, total_rems);
+        html("</div>");
+}
+
+
 /*
  * print a single line returned from xdiff
  */
@@ -115,12 +258,6 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
                 cgit_print_error(fmt("Bad object name: %s", new_rev));
                 return;
         }
-        if (type != OBJ_COMMIT) {
-                cgit_print_error(fmt("Unhandled object type: %s",
-                                     typename(type)));
-                return;
-        }
-
         commit = lookup_commit_reference(new_rev_sha1);
         if (!commit || parse_commit(commit))
                 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
@@ -142,6 +279,8 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
                 if (!commit2 || parse_commit(commit2))
                         cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
         }
+        cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
+
         html("<table summary='diff' class='diff'>");
         html("<tr><td>");
         cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
@@ -1,6 +1,9 @@
 #ifndef UI_DIFF_H
 #define UI_DIFF_H
 
+extern void cgit_print_diffstat(const unsigned char *old_sha1,
+                                const unsigned char *new_sha1);
+
 extern void cgit_print_diff(const char *new_hex, const char *old_hex,
                             const char *prefix);
 
@@ -61,12 +61,6 @@ int is_match(struct cgit_repo *repo)
 
 void print_header(int columns)
 {
-        if (ctx.cfg.index_header) {
-                htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
-                      columns);
-                html_include(ctx.cfg.index_header);
-                html("</td></tr>");
-        }
         html("<tr class='nohover'>"
              "<th class='left'>Name</th>"
              "<th class='left'>Description</th>"
@@ -90,6 +84,9 @@ void cgit_print_repolist()
         cgit_print_docstart(&ctx);
         cgit_print_pageheader(&ctx);
 
+        if (ctx.cfg.index_header)
+                html_include(ctx.cfg.index_header);
+
         html("<table summary='repository list' class='list nowrap'>");
         for (i=0; i<cgit_repolist.count; i++) {
                 ctx.repo = &cgit_repolist.repos[i];
@@ -139,3 +136,9 @@ void cgit_print_repolist()
                 cgit_print_error("No repositories found");
         cgit_print_docend();
 }
+
+void cgit_print_site_readme()
+{
+        if (ctx.cfg.root_readme)
+                html_include(ctx.cfg.root_readme);
+}
@@ -2,5 +2,6 @@
 #define UI_REPOLIST_H
 
 extern void cgit_print_repolist();
+extern void cgit_print_site_readme();
 
 #endif /* UI_REPOLIST_H */
@@ -114,6 +114,49 @@ char *cgit_currurl()
                 return fmt("%s/", ctx.cfg.virtual_root);
 }
 
+static void site_url(char *page, char *search)
+{
+        char *delim = "?";
+
+        if (ctx.cfg.virtual_root) {
+                html_attr(ctx.cfg.virtual_root);
+                if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
+                        html("/");
+        } else
+                html(ctx.cfg.script_name);
+
+        if (page) {
+                htmlf("?p=%s", page);
+                delim = "&";
+        }
+        if (search) {
+                html(delim);
+                html("q=");
+                html_attr(search);
+        }
+}
+
+static void site_link(char *page, char *name, char *title, char *class,
+                       char *search)
+{
+        html("<a");
+        if (title) {
+                html(" title='");
+                html_attr(title);
+                html("'");
+        }
+        if (class) {
+                html(" class='");
+                html_attr(class);
+                html("'");
+        }
+        html(" href='");
+        site_url(page, search);
+        html("'>");
+        html_txt(name);
+        html("</a>");
+}
+
 static char *repolink(char *title, char *class, char *page, char *head,
                       char *path)
 {
@@ -510,7 +553,10 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                 html_txt(ctx->repo->desc);
         } else {
                 html(">");
-                html_txt("a fast webinterface for the git dscm");
+                if (ctx->cfg.root_desc)
+                        html_txt(ctx->cfg.root_desc);
+                else if (ctx->cfg.index_info)
+                        html_include(ctx->cfg.index_info);
         }
         html("</td></tr></table>\n");
 
@@ -528,6 +574,10 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                                  ctx->qry.head, ctx->qry.sha1);
                 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
                                ctx->qry.sha1, ctx->qry.sha2, NULL);
+                if (ctx->repo->readme)
+                        reporevlink("about", "about", NULL,
+                                    hc(cmd, "about"), ctx->qry.head, NULL,
+                                    NULL);
                 html("</td><td class='form'>");
                 html("<form class='right' method='get' action='");
                 if (ctx->cfg.virtual_root)
@@ -546,9 +596,9 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                 html("<input type='submit' value='search'/>\n");
                 html("</form>\n");
         } else {
-                html("<a class='active' href='");
-                html_attr(cgit_rooturl());
-                html("'>index</a>\n");
+                site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL);
+                if (ctx->cfg.root_readme)
+                        site_link("about", "about", NULL, hc(cmd, "about"), NULL);
                 html("</td><td class='form'>");
                 html("<form method='get' action='");
                 html_attr(cgit_rooturl());
@@ -13,11 +13,6 @@
 
 void cgit_print_summary()
 {
-        if (ctx.repo->readme) {
-                html("<div id='summary'>");
-                html_include(ctx.repo->readme);
-                html("</div>");
-        }
         html("<table summary='repository info' class='list nowrap'>");
         cgit_print_branches(ctx.cfg.summary_branches);
         html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
@@ -29,3 +24,12 @@ void cgit_print_summary()
         }
         html("</table>");
 }
+
+void cgit_print_repo_readme()
+{
+        if (ctx.repo->readme) {
+                html("<div id='summary'>");
+                html_include(ctx.repo->readme);
+                html("</div>");
+        }
+}
@@ -2,5 +2,6 @@
 #define UI_SUMMARY_H
 
 extern void cgit_print_summary();
+extern void cgit_print_repo_readme();
 
 #endif /* UI_SUMMARY_H */