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

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 3d5030bc5805e8b50afc10b252edd0a8367544ae..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=");
@@ -388,9 +389,9 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
 }
 
 void cgit_patch_link(const char *name, const char *title, const char *class,
-                    const char *head, const char *rev)
+                    const char *head, const char *rev, const char *path)
 {
-       reporevlink("patch", name, title, class, head, rev, NULL);
+       reporevlink("patch", name, title, class, head, rev, path);
 }
 
 void cgit_stats_link(const char *name, const char *title, const char *class,
@@ -399,6 +400,64 @@ void cgit_stats_link(const char *name, const char *title, const char *class,
        reporevlink("stats", name, title, class, head, NULL, path);
 }
 
+void cgit_self_link(char *name, const char *title, const char *class,
+                   struct cgit_context *ctx)
+{
+       if (!strcmp(ctx->qry.page, "repolist"))
+               return cgit_index_link(name, title, class, ctx->qry.search,
+                                      ctx->qry.ofs);
+       else if (!strcmp(ctx->qry.page, "summary"))
+               return cgit_summary_link(name, title, class, ctx->qry.head);
+       else if (!strcmp(ctx->qry.page, "tag"))
+               return cgit_tag_link(name, title, class, ctx->qry.head,
+                                    ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
+       else if (!strcmp(ctx->qry.page, "tree"))
+               return cgit_tree_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path);
+       else if (!strcmp(ctx->qry.page, "plain"))
+               return cgit_plain_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path);
+       else if (!strcmp(ctx->qry.page, "log"))
+               return cgit_log_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path, ctx->qry.ofs,
+                                     ctx->qry.grep, ctx->qry.search,
+                                     ctx->qry.showmsg);
+       else if (!strcmp(ctx->qry.page, "commit"))
+               return cgit_commit_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path, 0);
+       else if (!strcmp(ctx->qry.page, "patch"))
+               return cgit_patch_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path);
+       else if (!strcmp(ctx->qry.page, "refs"))
+               return cgit_refs_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path);
+       else if (!strcmp(ctx->qry.page, "snapshot"))
+               return cgit_snapshot_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                     ctx->qry.path);
+       else if (!strcmp(ctx->qry.page, "diff"))
+               return cgit_diff_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.sha1, ctx->qry.sha2,
+                                     ctx->qry.path, 0);
+       else if (!strcmp(ctx->qry.page, "stats"))
+               return cgit_stats_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.path);
+
+       /* Don't known how to make link for this page */
+       repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
+       html("><!-- cgit_self_link() doesn't know how to make link for page '");
+       html_txt(ctx->qry.page);
+       html("' -->");
+       html_txt(name);
+       html("</a>");
+}
+
 void cgit_object_link(struct object *obj)
 {
        char *page, *shortrev, *fullrev, *name;
@@ -408,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";
@@ -650,6 +709,27 @@ static const char *hc(struct cgit_context *ctx, const char *page)
        return strcmp(ctx->qry.page, page) ? NULL : "active";
 }
 
+static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
+{
+       char *old_path = ctx->qry.path;
+       char *p = path, *q, *end = path + strlen(path);
+
+       ctx->qry.path = NULL;
+       cgit_self_link("root", NULL, NULL, ctx);
+       ctx->qry.path = p = path;
+       while (p < end) {
+               if (!(q = strchr(p, '/')))
+                       q = end;
+               *q = '\0';
+               html_txt("/");
+               cgit_self_link(p, NULL, NULL, ctx);
+               if (q < end)
+                       *q = '/';
+               p = q + 1;
+       }
+       ctx->qry.path = old_path;
+}
+
 static void print_header(struct cgit_context *ctx)
 {
        html("<table id='header'>\n");
@@ -714,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)
@@ -757,6 +837,12 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                html("</form>");
        }
        html("</td></tr></table>\n");
+       if (ctx->qry.vpath) {
+               html("<div class='path'>");
+               html("path: ");
+               cgit_print_path_crumbs(ctx, ctx->qry.vpath);
+               html("</div>");
+       }
        html("<div class='content'>");
 }