ui-shared: Remove needless cgit_get_cmd() call, and refactor hc() accordingly

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 8a7cc323363cc39837092609fee076300be95f60..137e469f58eb7e0909ddc054782ebe01f641689e 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -27,7 +27,7 @@ static char *http_date(time_t t)
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
-void cgit_print_error(char *msg)
+void cgit_print_error(const char *msg)
 {
        html("<div class='error'>");
        html_txt(msg);
@@ -133,7 +133,7 @@ char *cgit_currurl()
                return fmt("%s/", ctx.cfg.virtual_root);
 }
 
-static void site_url(char *page, char *search, int ofs)
+static void site_url(const char *page, const char *search, int ofs)
 {
        char *delim = "?";
 
@@ -160,8 +160,8 @@ static void site_url(char *page, char *search, int ofs)
        }
 }
 
-static void site_link(char *page, char *name, char *title, char *class,
-                     char *search, int ofs)
+static void site_link(const char *page, const char *name, const char *title,
+                     const char *class, const char *search, int ofs)
 {
        html("<a");
        if (title) {
@@ -181,14 +181,14 @@ static void site_link(char *page, char *name, char *title, char *class,
        html("</a>");
 }
 
-void cgit_index_link(char *name, char *title, char *class, char *pattern,
-                    int ofs)
+void cgit_index_link(const char *name, const char *title, const char *class,
+                    const char *pattern, int ofs)
 {
        site_link(NULL, name, title, class, pattern, ofs);
 }
 
-static char *repolink(char *title, char *class, char *page, char *head,
-                     char *path)
+static char *repolink(const char *title, const char *class, const char *page,
+                     const char *head, const char *path)
 {
        char *delim = "?";
 
@@ -240,8 +240,9 @@ static char *repolink(char *title, char *class, char *page, char *head,
        return fmt("%s", delim);
 }
 
-static void reporevlink(char *page, char *name, char *title, char *class,
-                       char *head, char *rev, char *path)
+static void reporevlink(const char *page, const char *name, const char *title,
+                       const char *class, const char *head, const char *rev,
+                       const char *path)
 {
        char *delim;
 
@@ -256,32 +257,33 @@ static void reporevlink(char *page, char *name, char *title, char *class,
        html("</a>");
 }
 
-void cgit_summary_link(char *name, char *title, char *class, char *head)
+void cgit_summary_link(const char *name, const char *title, const char *class,
+                      const char *head)
 {
        reporevlink(NULL, name, title, class, head, NULL, NULL);
 }
 
-void cgit_tag_link(char *name, char *title, char *class, char *head,
-                  char *rev)
+void cgit_tag_link(const char *name, const char *title, const char *class,
+                  const char *head, const char *rev)
 {
        reporevlink("tag", name, title, class, head, rev, NULL);
 }
 
-void cgit_tree_link(char *name, char *title, char *class, char *head,
-                   char *rev, char *path)
+void cgit_tree_link(const char *name, const char *title, const char *class,
+                   const char *head, const char *rev, const char *path)
 {
        reporevlink("tree", name, title, class, head, rev, path);
 }
 
-void cgit_plain_link(char *name, char *title, char *class, char *head,
-                    char *rev, char *path)
+void cgit_plain_link(const char *name, const char *title, const char *class,
+                    const char *head, const char *rev, const char *path)
 {
        reporevlink("plain", name, title, class, head, rev, path);
 }
 
-void cgit_log_link(char *name, char *title, char *class, char *head,
-                  char *rev, char *path, int ofs, char *grep, char *pattern,
-                  int showmsg)
+void cgit_log_link(const char *name, const char *title, const char *class,
+                  const char *head, const char *rev, const char *path,
+                  int ofs, const char *grep, const char *pattern, int showmsg)
 {
        char *delim;
 
@@ -316,8 +318,8 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
        html("</a>");
 }
 
-void cgit_commit_link(char *name, char *title, char *class, char *head,
-                     char *rev)
+void cgit_commit_link(char *name, const char *title, const char *class,
+                     const char *head, const char *rev, int toggle_ssdiff)
 {
        if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
                name[ctx.cfg.max_msg_len] = '\0';
@@ -325,23 +327,41 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
                name[ctx.cfg.max_msg_len - 2] = '.';
                name[ctx.cfg.max_msg_len - 3] = '.';
        }
-       reporevlink("commit", name, title, class, head, rev, NULL);
+
+       char *delim;
+
+       delim = repolink(title, class, "commit", head, NULL);
+       if (rev && strcmp(rev, ctx.qry.head)) {
+               html(delim);
+               html("id=");
+               html_url_arg(rev);
+               delim = "&amp;";
+       }
+       if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+               html(delim);
+               html("ss=1");
+       }
+       html("'>");
+       html_txt(name);
+       html("</a>");
 }
 
-void cgit_refs_link(char *name, char *title, char *class, char *head,
-                   char *rev, char *path)
+void cgit_refs_link(const char *name, const char *title, const char *class,
+                   const char *head, const char *rev, const 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)
+void cgit_snapshot_link(const char *name, const char *title, const char *class,
+                       const char *head, const char *rev,
+                       const 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)
+void cgit_diff_link(const char *name, const char *title, const char *class,
+                   const char *head, const char *new_rev, const char *old_rev,
+                   const char *path, int toggle_ssdiff)
 {
        char *delim;
 
@@ -356,20 +376,25 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
                html(delim);
                html("id2=");
                html_url_arg(old_rev);
+               delim = "&amp;";
+       }
+       if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+               html(delim);
+               html("ss=1");
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
-void cgit_patch_link(char *name, char *title, char *class, char *head,
-                    char *rev)
+void cgit_patch_link(const char *name, const char *title, const char *class,
+                    const char *head, const char *rev)
 {
        reporevlink("patch", name, title, class, head, rev, NULL);
 }
 
-void cgit_stats_link(char *name, char *title, char *class, char *head,
-                    char *path)
+void cgit_stats_link(const char *name, const char *title, const char *class,
+                    const char *head, const char *path)
 {
        reporevlink("stats", name, title, class, head, NULL, path);
 }
@@ -383,7 +408,7 @@ void cgit_object_link(struct object *obj)
        shortrev[10] = '\0';
        if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
-                                ctx.qry.head, fullrev);
+                                ctx.qry.head, fullrev, 0);
                return;
        } else if (obj->type == OBJ_TREE)
                page = "tree";
@@ -395,7 +420,7 @@ void cgit_object_link(struct object *obj)
        reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
 }
 
-void cgit_print_date(time_t secs, char *format, int local_time)
+void cgit_print_date(time_t secs, const char *format, int local_time)
 {
        char buf[64];
        struct tm *time;
@@ -410,7 +435,7 @@ void cgit_print_date(time_t secs, char *format, int local_time)
        html_txt(buf);
 }
 
-void cgit_print_age(time_t t, time_t max_relative, char *format)
+void cgit_print_age(time_t t, time_t max_relative, const char *format)
 {
        time_t now, secs;
 
@@ -589,7 +614,8 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
        return 0;
 }
 
-void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
+void cgit_add_hidden_formfields(int incl_head, int incl_search,
+                               const char *page)
 {
        char *url;
 
@@ -619,11 +645,9 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
        }
 }
 
-const char *fallback_cmd = "repolist";
-
-char *hc(struct cgit_cmd *cmd, const char *page)
+static const char *hc(struct cgit_context *ctx, const char *page)
 {
-       return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
+       return strcmp(ctx->qry.page, page) ? NULL : "active";
 }
 
 static void print_header(struct cgit_context *ctx)
@@ -675,35 +699,30 @@ static void print_header(struct cgit_context *ctx)
 
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
-       struct cgit_cmd *cmd = cgit_get_cmd(ctx);
-
-       if (!cmd && ctx->repo)
-               fallback_cmd = "summary";
-
        html("<div id='cgit'>");
        if (!ctx->cfg.noheader)
                print_header(ctx);
 
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {
-               cgit_summary_link("summary", NULL, hc(cmd, "summary"),
+               cgit_summary_link("summary", NULL, hc(ctx, "summary"),
                                  ctx->qry.head);
-               cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
+               cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
-               cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
+               cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
                              NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
-               cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
+               cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
-               cgit_commit_link("commit", NULL, hc(cmd, "commit"),
-                                ctx->qry.head, ctx->qry.sha1);
-               cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
-                              ctx->qry.sha1, ctx->qry.sha2, NULL);
+               cgit_commit_link("commit", NULL, hc(ctx, "commit"),
+                                ctx->qry.head, ctx->qry.sha1, 0);
+               cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
+                              ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
                if (ctx->repo->max_stats)
-                       cgit_stats_link("stats", NULL, hc(cmd, "stats"),
+                       cgit_stats_link("stats", NULL, hc(ctx, "stats"),
                                        ctx->qry.head, NULL);
                if (ctx->repo->readme)
                        reporevlink("about", "about", NULL,
-                                   hc(cmd, "about"), ctx->qry.head, NULL,
+                                   hc(ctx, "about"), ctx->qry.head, NULL,
                                    NULL);
                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
@@ -723,9 +742,9 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else {
-               site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
+               site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
                if (ctx->cfg.root_readme)
-                       site_link("about", "about", NULL, hc(cmd, "about"),
+                       site_link("about", "about", NULL, hc(ctx, "about"),
                                  NULL, 0);
                html("</td><td class='form'>");
                html("<form method='get' action='");
@@ -760,13 +779,18 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
                               const char *hex, int snapshots)
 {
        const struct cgit_snapshot_format* f;
+       char *prefix;
        char *filename;
+       unsigned char sha1[20];
 
+       if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
+           (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
+               hex++;
+       prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));
        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (!(snapshots & f->bit))
                        continue;
-               filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
-                              f->suffix);
+               filename = fmt("%s%s", prefix, f->suffix);
                cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                html("<br/>");
        }