Merge branch 'stable'

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index de95053a6a1d415b4245926c22e06e60a634bfc5..02f191ea41065a0af04c2ca7d5154536d7abeba4 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,67 +1,110 @@
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli

+ * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"

+#include "html.h"
+#include "ui-log.h"
+#include "ui-refs.h"
+#include "ui-blob.h"

 
 

-static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
-                               int flags, void *cb_data)
+int urls = 0;
+
+static void print_url(char *base, char *suffix)
+{
+       if (!base || !*base)
+               return;
+       if (urls++ == 0) {
+               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+               html("<tr><th class='left' colspan='4'>Clone</th></tr>\n");
+       }
+       if (suffix && *suffix)
+               base = fmt("%s/%s", base, suffix);
+       html("<tr><td colspan='4'><a href='");
+       html_url_path(base);
+       html("'>");
+       html_txt(base);
+       html("</a></td></tr>\n");
+}
+
+static void print_urls(char *txt, char *suffix)

 {
 {

-       struct commit *commit;
-       struct commitinfo *info;
-       char buf[256], *url;
+       char *h = txt, *t, c;

 
 

-       commit = lookup_commit(sha1);
-       if (commit && !parse_commit(commit)){
-               info = cgit_parse_commit(commit);
-               html("<tr><td>");
-               url = cgit_pageurl(cgit_query_repo, "log", 
-                                  fmt("h=%s", refname));
-               html_link_open(url, NULL, NULL);
-               strncpy(buf, refname, sizeof(buf));
-               html_txt(buf);
-               html_link_close();
-               html("</td><td>");
-               cgit_print_date(commit->date);
-               html("</td><td>");
-               url = cgit_pageurl(cgit_query_repo, "commit", 
-                                  fmt("id=%s", sha1_to_hex(sha1)));
-               html_link_open(url, NULL, NULL);
-               html_ntxt(80, info->subject);
-               html_link_close();
-               html("</td><td>");
-               html_txt(info->author);
-               html("</td></tr>\n");
-               cgit_free_commitinfo(info);
-       } else {
-               html("<tr><td>");
-               html_txt(buf);
-               html("</td><td>");
-               htmlf("*** bad ref %s", sha1_to_hex(sha1));
-               html("</td></tr>\n");
+       while (h && *h) {
+               while (h && *h == ' ')
+                       h++;
+               t = h;
+               while (t && *t && *t != ' ')
+                       t++;
+               c = *t;
+               *t = 0;
+               print_url(h, suffix);
+               *t = c;
+               h = t;

        }
        }

-       return 0;

 }
 
 }
 

-static void cgit_print_branches()
+void cgit_print_summary()

 {
 {

-       html("<table class='list nowrap'>");
-       html("<tr><th class='left'>Branch</th>"
-            "<th class='left'>Updated</th>"
-            "<th class='left'>Commit subject</th>"
-            "<th class='left'>Author</th></tr>\n");
-       for_each_branch_ref(cgit_print_branch_cb, NULL);
+       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>");
+       cgit_print_tags(ctx.cfg.summary_tags);
+       if (ctx.cfg.summary_log > 0) {
+               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+               cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
+                              NULL, NULL, 0);
+       }
+       if (ctx.repo->clone_url)
+               print_urls(ctx.repo->clone_url, NULL);
+       else if (ctx.cfg.clone_prefix)
+               print_urls(ctx.cfg.clone_prefix, ctx.repo->url);

        html("</table>");
 }
 
        html("</table>");
 }
 

-void cgit_print_summary()
+void cgit_print_repo_readme(char *path)

 {
 {

-       html("<h2>");
-       html_txt("Repo summary page");
-       html("</h2>");
-       cgit_print_branches();
+       char *slash, *tmp, *colon, *ref = 0;
+
+       if (!ctx.repo->readme)
+               return;
+
+       if (path) {
+               slash = strrchr(ctx.repo->readme, '/');
+               if (!slash) {
+                       slash = strchr(ctx.repo->readme, ':');
+                       if (!slash)
+                               return;
+               }
+               tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);
+               strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);
+               strcpy(tmp + (slash - ctx.repo->readme + 1), path);
+       } else
+               tmp = ctx.repo->readme;
+       colon = strchr(tmp, ':');
+       if (colon && strlen(colon) > 1) {
+               *colon = '\0';
+               ref = tmp;
+               tmp = colon + 1;
+               while ((*tmp == '/' || *tmp == ':') && *tmp != '\0')
+                       ++tmp;
+               if (!(*tmp))
+                       return;
+       }
+       html("<div id='summary'>");
+       if (ctx.repo->about_filter)
+               cgit_open_filter(ctx.repo->about_filter);
+       if (ref)
+               cgit_print_file(tmp, ref);
+       else
+               html_include(tmp);
+       if (ctx.repo->about_filter)
+               cgit_close_filter(ctx.repo->about_filter);
+       html("</div>");

 }
 }