display subject instead of sha1 as link title of parents

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 6cb7edb27ccb3d40b5c1e309940b7ed198a8d5c9..8827fff4b19ed6b231a09f6870d4c2615deea82a 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -20,7 +20,7 @@ static char *http_date(time_t t)
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
        static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
        static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",

-                "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
+                "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};

        struct tm *tm = gmtime(&t);
        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
                   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
        struct tm *tm = gmtime(&t);
        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
                   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,


@@ -246,7 +246,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
        char *delim;
 
        delim = repolink(title, class, page, head, path);
        char *delim;
 
        delim = repolink(title, class, page, head, path);

-       if (rev && strcmp(rev, ctx.qry.head)) {
+       if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) {

                html(delim);
                html("id=");
                html_url_arg(rev);
                html(delim);
                html("id=");
                html_url_arg(rev);


@@ -317,7 +317,7 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,

-                     char *rev)
+                     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';
 {
        if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
                name[ctx.cfg.max_msg_len] = '\0';


@@ -325,7 +325,23 @@ 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] = '.';
        }
                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 = "&";
+       }
+       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,
 }
 
 void cgit_refs_link(char *name, char *title, char *class, char *head,


@@ -341,12 +357,13 @@ void cgit_snapshot_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_diff_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_diff_link(char *name, char *title, char *class, char *head,

-                   char *new_rev, char *old_rev, char *path)
+                   char *new_rev, char *old_rev, char *path,
+                   int toggle_ssdiff)

 {
        char *delim;
 
        delim = repolink(title, class, "diff", head, path);
 {
        char *delim;
 
        delim = repolink(title, class, "diff", head, path);

-       if (new_rev && strcmp(new_rev, ctx.qry.head)) {
+       if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) {

                html(delim);
                html("id=");
                html_url_arg(new_rev);
                html(delim);
                html("id=");
                html_url_arg(new_rev);


@@ -356,6 +373,11 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
                html(delim);
                html("id2=");
                html_url_arg(old_rev);
                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("'>");
        html_txt(name);


@@ -383,7 +405,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,
        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";
                return;
        } else if (obj->type == OBJ_TREE)
                page = "tree";


@@ -695,9 +717,9 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_commit_link("commit", NULL, hc(cmd, "commit"),
                cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_commit_link("commit", NULL, hc(cmd, "commit"),

-                                ctx->qry.head, ctx->qry.sha1);
+                                ctx->qry.head, ctx->qry.sha1, 0);

                cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
                cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,

-                              ctx->qry.sha1, ctx->qry.sha2, NULL);
+                              ctx->qry.sha1, ctx->qry.sha2, NULL, 0);

                if (ctx->repo->max_stats)
                        cgit_stats_link("stats", NULL, hc(cmd, "stats"),
                                        ctx->qry.head, NULL);
                if (ctx->repo->max_stats)
                        cgit_stats_link("stats", NULL, hc(cmd, "stats"),
                                        ctx->qry.head, NULL);