ui-summary: Use default branch for readme if : prefix

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 5be2545c398ca7f7ac715991e58b90b52f32e636..abf914ea7b9bef132613045e925f6528b75fea2d 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -8,42 +8,62 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "ui-summary.h"

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

-int urls = 0;
-

 static void print_url(char *base, char *suffix)
 {
 static void print_url(char *base, char *suffix)
 {

+       int columns = 3;
+       struct strbuf basebuf = STRBUF_INIT;
+
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;
+

        if (!base || !*base)
                return;
        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) {
+               strbuf_addf(&basebuf, "%s/%s", base, suffix);
+               base = basebuf.buf;

        }
        }

-       if (suffix && *suffix)
-               base = fmt("%s/%s", base, suffix);
-       html("<tr><td colspan='4'><a href='");
+       htmlf("<tr><td colspan='%d'><a href='", columns);

        html_url_path(base);
        html("'>");
        html_txt(base);
        html("</a></td></tr>\n");
        html_url_path(base);
        html("'>");
        html_txt(base);
        html("</a></td></tr>\n");

+       strbuf_release(&basebuf);

 }
 
 static void print_urls(char *txt, char *suffix)
 {
        char *h = txt, *t, c;
 }
 
 static void print_urls(char *txt, char *suffix)
 {
        char *h = txt, *t, c;

+       int urls = 0;
+       int columns = 3;
+
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;
+

 
        while (h && *h) {
                while (h && *h == ' ')
                        h++;
 
        while (h && *h) {
                while (h && *h == ' ')
                        h++;

+               if (!*h)
+                       break;

                t = h;
                while (t && *t && *t != ' ')
                        t++;
                c = *t;
                *t = 0;
                t = h;
                while (t && *t && *t != ' ')
                        t++;
                c = *t;
                *t = 0;

+               if (urls++ == 0) {
+                       htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
+                       htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
+               }

                print_url(h, suffix);
                *t = c;
                h = t;
                print_url(h, suffix);
                *t = c;
                h = t;


@@ -52,17 +72,24 @@ static void print_urls(char *txt, char *suffix)
 
 void cgit_print_summary()
 {
 
 void cgit_print_summary()
 {

+       int columns = 3;
+
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;
+

        html("<table summary='repository info' class='list nowrap'>");
        cgit_print_branches(ctx.cfg.summary_branches);
        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>");
+       htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);

        cgit_print_tags(ctx.cfg.summary_tags);
        if (ctx.cfg.summary_log > 0) {
        cgit_print_tags(ctx.cfg.summary_tags);
        if (ctx.cfg.summary_log > 0) {

-               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+               htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);

                cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
                cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,

-                              NULL, NULL, 0, 0);
+                              NULL, NULL, 0, 0, 0);

        }
        if (ctx.repo->clone_url)
        }
        if (ctx.repo->clone_url)

-               print_urls(ctx.repo->clone_url, NULL);
+               print_urls(expand_macros(ctx.repo->clone_url), NULL);

        else if (ctx.cfg.clone_prefix)
                print_urls(ctx.cfg.clone_prefix, ctx.repo->url);
        html("</table>");
        else if (ctx.cfg.clone_prefix)
                print_urls(ctx.cfg.clone_prefix, ctx.repo->url);
        html("</table>");


@@ -81,7 +108,12 @@ void cgit_print_repo_readme(char *path)
        colon = strchr(ctx.repo->readme, ':');
        if (colon && strlen(colon) > 1) {
                *colon = '\0';
        colon = strchr(ctx.repo->readme, ':');
        if (colon && strlen(colon) > 1) {
                *colon = '\0';

-               ref = ctx.repo->readme;
+               /* If it starts with a colon, we want to use
+                * the default branch */
+               if (colon == ctx.repo->readme && ctx.repo->defbranch)
+                       ref = ctx.repo->defbranch;
+               else
+                       ref = ctx.repo->readme;

                ctx.repo->readme = colon + 1;
                if (!(*ctx.repo->readme))
                        return;
                ctx.repo->readme = colon + 1;
                if (!(*ctx.repo->readme))
                        return;


@@ -89,8 +121,8 @@ void cgit_print_repo_readme(char *path)
 
        /* Prepend repo path to relative readme path unless tracked. */
        if (!ref && *ctx.repo->readme != '/')
 
        /* Prepend repo path to relative readme path unless tracked. */
        if (!ref && *ctx.repo->readme != '/')

-               ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path,
-                                              ctx.repo->readme));
+               ctx.repo->readme = fmtalloc("%s/%s", ctx.repo->path,
+                                               ctx.repo->readme);

 
        /* If a subpath is specified for the about page, make it relative
         * to the directory containing the configured readme.
 
        /* If a subpath is specified for the about page, make it relative
         * to the directory containing the configured readme.