ui-commit: Preserve path limit in links to tree and diff pages

[ps-cgit] / ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index b5e3c0159ba78ec080ee3f5cde8d2253c6cd8cbf..179392194df92a82f0f32c1848929c23fde165aa 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -12,7 +12,7 @@
 #include "ui-diff.h"
 #include "ui-log.h"
 
 #include "ui-diff.h"
 #include "ui-log.h"
 

-void cgit_print_commit(char *hex)
+void cgit_print_commit(char *hex, const char *prefix)

 {
        struct commit *commit, *parent;
        struct commitinfo *info;
 {
        struct commit *commit, *parent;
        struct commitinfo *info;


@@ -60,7 +60,7 @@ void cgit_print_commit(char *hex)
        tmp = sha1_to_hex(commit->object.sha1);
        cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0);
        html(" (");
        tmp = sha1_to_hex(commit->object.sha1);
        cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, 0);
        html(" (");

-       cgit_patch_link("patch", NULL, NULL, NULL, tmp);
+       cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);

        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);
        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);


@@ -71,6 +71,10 @@ void cgit_print_commit(char *hex)
        tmp = xstrdup(hex);
        cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
                       ctx.qry.head, tmp, NULL);
        tmp = xstrdup(hex);
        cgit_tree_link(sha1_to_hex(commit->tree->object.sha1), NULL, NULL,
                       ctx.qry.head, tmp, NULL);

+       if (prefix) {
+               html(" /");
+               cgit_tree_link(prefix, NULL, NULL, ctx.qry.head, tmp, prefix);
+       }

        html("</td></tr>\n");
        for (p = commit->parents; p ; p = p->next) {
                parent = lookup_commit_reference(p->item->object.sha1);
        html("</td></tr>\n");
        for (p = commit->parents; p ; p = p->next) {
                parent = lookup_commit_reference(p->item->object.sha1);


@@ -86,7 +90,7 @@ void cgit_print_commit(char *hex)
                                 ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0);
                html(" (");
                cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
                                 ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0);
                html(" (");
                cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,

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

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


@@ -117,7 +121,7 @@ void cgit_print_commit(char *hex)
                        tmp = sha1_to_hex(commit->parents->item->object.sha1);
                else
                        tmp = NULL;
                        tmp = sha1_to_hex(commit->parents->item->object.sha1);
                else
                        tmp = NULL;

-               cgit_print_diff(ctx.qry.sha1, tmp, NULL);
+               cgit_print_diff(ctx.qry.sha1, tmp, prefix);

        }
        cgit_free_commitinfo(info);
 }
        }
        cgit_free_commitinfo(info);
 }