ui-tree: add link to plain view for blobs in tree listing

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index d6b73eed90aaf5ee232e89f5a1655c94db392577..b5e3c0159ba78ec080ee3f5cde8d2253c6cd8cbf 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -35,7 +35,7 @@ void cgit_print_commit(char *hex)
        }
        info = cgit_parse_commit(commit);
 
        }
        info = cgit_parse_commit(commit);
 

-       load_ref_decorations();
+       load_ref_decorations(DECORATE_FULL_REFS);

 
        html("<table summary='commit info' class='commit-info'>\n");
        html("<tr><th>author</th><td>");
 
        html("<table summary='commit info' class='commit-info'>\n");
        html("<tr><th>author</th><td>");


@@ -58,9 +58,14 @@ void cgit_print_commit(char *hex)
        html("</td></tr>\n");
        html("<tr><th>commit</th><td colspan='2' class='sha1'>");
        tmp = sha1_to_hex(commit->object.sha1);
        html("</td></tr>\n");
        html("<tr><th>commit</th><td colspan='2' class='sha1'>");
        tmp = sha1_to_hex(commit->object.sha1);

-       cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp);
+       cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0);

        html(" (");
        cgit_patch_link("patch", NULL, NULL, NULL, tmp);
        html(" (");
        cgit_patch_link("patch", NULL, NULL, NULL, tmp);

+       html(") (");
+       if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
+               cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, 1);
+       else
+               cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1);

        html(")</td></tr>\n");
        html("<tr><th>tree</th><td colspan='2' class='sha1'>");
        tmp = xstrdup(hex);
        html(")</td></tr>\n");
        html("<tr><th>tree</th><td colspan='2' class='sha1'>");
        tmp = xstrdup(hex);


@@ -78,10 +83,10 @@ void cgit_print_commit(char *hex)
                html("<tr><th>parent</th>"
                     "<td colspan='2' class='sha1'>");
                cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,
                html("<tr><th>parent</th>"
                     "<td colspan='2' class='sha1'>");
                cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL,

-                                ctx.qry.head, sha1_to_hex(p->item->object.sha1));
+                                ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0);

                html(" (");
                cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
                html(" (");
                cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,

-                              sha1_to_hex(p->item->object.sha1), NULL);
+                              sha1_to_hex(p->item->object.sha1), NULL, 0);

                html(")</td></tr>");
                parents++;
        }
                html(")</td></tr>");
                parents++;
        }