ui-commit: Preserve path limit in links to commit page

This includes adding a path argument to cgit_commit_link() and updating all
its callers. The callers from within the commit page (i.e. the "commit",
"unidiff"/"side-by-side diff" and "parent" links) all preserve the path
limit of the current commit page. All other callers pass NULL (i.e. no path
limit).

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/ui-commit.c b/ui-commit.c
index 179392194df92a82f0f32c1848929c23fde165aa..2d98ed9ea956cef5f71272e1473293c0c1b32338 100644 (file)
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -58,14 +58,14 @@ void cgit_print_commit(char *hex, const char *prefix)
        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, 0);
+       cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix, 0);
        html(" (");
        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);
+               cgit_commit_link("unidiff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
        else
-               cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, 1);
+               cgit_commit_link("side-by-side diff", NULL, NULL, ctx.qry.head, tmp, prefix, 1);
        html(")</td></tr>\n");
        html("<tr><th>tree</th><td colspan='2' class='sha1'>");
        tmp = xstrdup(hex);
@@ -87,7 +87,8 @@ void cgit_print_commit(char *hex, const char *prefix)
                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), 0);
+                                ctx.qry.head,
+                                sha1_to_hex(p->item->object.sha1), prefix, 0);
                html(" (");
                cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
                               sha1_to_hex(p->item->object.sha1), prefix, 0);

diff --git a/ui-log.c b/ui-log.c
index 09476049b858783a4d165a3a45e21879790957f0..282eca3275ecdfca7cf3395434b5d08b2ec57969 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -66,7 +66,7 @@ void show_commit_decorations(struct commit *commit)
                else {
                        strncpy(buf, deco->name, sizeof(buf) - 1);
                        cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
-                               sha1_to_hex(commit->object.sha1), 0);
+                               sha1_to_hex(commit->object.sha1), NULL, 0);
                }
                deco = deco->next;
        }
@@ -89,7 +89,7 @@ void print_commit(struct commit *commit)
        htmlf("</td><td%s>",
                ctx.qry.showmsg ? " class='logsubject'" : "");
        cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
-                        sha1_to_hex(commit->object.sha1), 0);
+                        sha1_to_hex(commit->object.sha1), NULL, 0);
        show_commit_decorations(commit);
        html("</td><td>");
        html_txt(info->author);

diff --git a/ui-refs.c b/ui-refs.c
index 98738dba6e74f00b22bd86e635d41a733d8acd08..94ff6be13cee2cfefde5369a0d7cbd760d454b1e 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -74,7 +74,7 @@ static int print_branch(struct refinfo *ref)
        html("</td><td>");
 
        if (ref->object->type == OBJ_COMMIT) {
-               cgit_commit_link(info->subject, NULL, NULL, name, NULL, 0);
+               cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0);
                html("</td><td>");
                html_txt(info->author);
                html("</td><td colspan='2'>");

diff --git a/ui-shared.c b/ui-shared.c
index d5c4c10e76c4d9188629242d1aa9b1e7a5ebb4b2..372b9e7758b016c4f1420aade0e5a31b2a4c982a 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -319,7 +319,8 @@ void cgit_log_link(const char *name, const char *title, const char *class,
 }
 
 void cgit_commit_link(char *name, const char *title, const char *class,
-                     const char *head, const char *rev, int toggle_ssdiff)
+                     const char *head, const char *rev, const char *path,
+                     int toggle_ssdiff)
 {
        if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
                name[ctx.cfg.max_msg_len] = '\0';
@@ -330,7 +331,7 @@ void cgit_commit_link(char *name, const char *title, const char *class,
 
        char *delim;
 
-       delim = repolink(title, class, "commit", head, NULL);
+       delim = repolink(title, class, "commit", head, path);
        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
@@ -466,7 +467,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, 0);
+                                ctx.qry.head, fullrev, NULL, 0);
                return;
        } else if (obj->type == OBJ_TREE)
                page = "tree";
@@ -793,7 +794,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_commit_link("commit", NULL, hc(ctx, "commit"),
-                                ctx->qry.head, ctx->qry.sha1, 0);
+                                ctx->qry.head, ctx->qry.sha1, NULL, 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)

diff --git a/ui-shared.h b/ui-shared.h
index c0e5c554c6eeb3bf4252c080829e3b06609411a6..3cc12586dfd77c03cf33fffb8dcf3ed8d4a211d8 100644 (file)
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -29,7 +29,8 @@ extern void cgit_log_link(const char *name, const char *title,
                          const char *pattern, int showmsg);
 extern void cgit_commit_link(char *name, const char *title,
                             const char *class, const char *head,
-                            const char *rev, int toggle_ssdiff);
+                            const char *rev, const char *path,
+                            int toggle_ssdiff);
 extern void cgit_patch_link(const char *name, const char *title,
                            const char *class, const char *head,
                            const char *rev, const char *path);