ui-shared: Preserve path limit in "tab bar" links

When using the "tab bar" in the pageheader to navigate between pages, any
path limit in effect on the current page is forgotten in the link to the
target page, even if the target page can interpret and use the path limit
constructively.

Instead, preserve the current page's path limit in the "tab bar" links to
other pages, where the path limit is useful to the target page.

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

1 files changed, 6 insertions, 5 deletions

diff --git a/ui-shared.c b/ui-shared.c
index 372b9e7..e991799 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -697,187 +697,188 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
                 html_hidden("showmsg", "1");
 
         if (incl_search) {
                 if (ctx.qry.grep)
                         html_hidden("qt", ctx.qry.grep);
                 if (ctx.qry.search)
                         html_hidden("q", ctx.qry.search);
         }
 }
 
 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");
         html("<tr>\n");
 
         if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
                 html("<td class='logo' rowspan='2'><a href='");
                 if (ctx->cfg.logo_link)
                         html_attr(ctx->cfg.logo_link);
                 else
                         html_attr(cgit_rooturl());
                 html("'><img src='");
                 html_attr(ctx->cfg.logo);
                 html("' alt='cgit logo'/></a></td>\n");
         }
 
         html("<td class='main'>");
         if (ctx->repo) {
                 cgit_index_link("index", NULL, NULL, NULL, 0);
                 html(" : ");
                 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                 html("</td><td class='form'>");
                 html("<form method='get' action=''>\n");
                 cgit_add_hidden_formfields(0, 1, ctx->qry.page);
                 html("<select name='h' onchange='this.form.submit();'>\n");
                 for_each_branch_ref(print_branch_option, ctx->qry.head);
                 html("</select> ");
                 html("<input type='submit' name='' value='switch'/>");
                 html("</form>");
         } else
                 html_txt(ctx->cfg.root_title);
         html("</td></tr>\n");
 
         html("<tr><td class='sub'>");
         if (ctx->repo) {
                 html_txt(ctx->repo->desc);
                 html("</td><td class='sub right'>");
                 html_txt(ctx->repo->owner);
         } else {
                 if (ctx->cfg.root_desc)
                         html_txt(ctx->cfg.root_desc);
                 else if (ctx->cfg.index_info)
                         html_include(ctx->cfg.index_info);
         }
         html("</td></tr></table>\n");
 }
 
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
         html("<div id='cgit'>");
         if (!ctx->cfg.noheader)
                 print_header(ctx);
 
         html("<table class='tabs'><tr><td>\n");
         if (ctx->repo) {
                 cgit_summary_link("summary", NULL, hc(ctx, "summary"),
                                   ctx->qry.head);
                 cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
                                ctx->qry.sha1, NULL);
                 cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
-                              NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
+                              NULL, ctx->qry.vpath, 0, NULL, NULL,
+                              ctx->qry.showmsg);
                 cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
-                               ctx->qry.sha1, NULL);
+                               ctx->qry.sha1, ctx->qry.vpath);
                 cgit_commit_link("commit", NULL, hc(ctx, "commit"),
-                                 ctx->qry.head, ctx->qry.sha1, NULL, 0);
+                                 ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0);
                 cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head,
-                               ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
+                               ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0);
                 if (ctx->repo->max_stats)
                         cgit_stats_link("stats", NULL, hc(ctx, "stats"),
-                                        ctx->qry.head, NULL);
+                                        ctx->qry.head, ctx->qry.vpath);
                 if (ctx->repo->readme)
                         reporevlink("about", "about", NULL,
                                     hc(ctx, "about"), ctx->qry.head, NULL,
                                     NULL);
                 html("</td><td class='form'>");
                 html("<form class='right' method='get' action='");
                 if (ctx->cfg.virtual_root)
                         html_url_path(cgit_fileurl(ctx->qry.repo, "log",
                                                    ctx->qry.vpath, NULL));
                 html("'>\n");
                 cgit_add_hidden_formfields(1, 0, "log");
                 html("<select name='qt'>\n");
                 html_option("grep", "log msg", ctx->qry.grep);
                 html_option("author", "author", ctx->qry.grep);
                 html_option("committer", "committer", ctx->qry.grep);
                 html("</select>\n");
                 html("<input class='txt' type='text' size='10' name='q' value='");
                 html_attr(ctx->qry.search);
                 html("'/>\n");
                 html("<input type='submit' value='search'/>\n");
                 html("</form>\n");
         } else {
                 site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
                 if (ctx->cfg.root_readme)
                         site_link("about", "about", NULL, hc(ctx, "about"),
                                   NULL, 0);
                 html("</td><td class='form'>");
                 html("<form method='get' action='");
                 html_attr(cgit_rooturl());
                 html("'>\n");
                 html("<input type='text' name='q' size='10' value='");
                 html_attr(ctx->qry.search);
                 html("'/>\n");
                 html("<input type='submit' value='search'/>\n");
                 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'>");
 }
 
 void cgit_print_filemode(unsigned short mode)
 {
         if (S_ISDIR(mode))
                 html("d");
         else if (S_ISLNK(mode))
                 html("l");
         else if (S_ISGITLINK(mode))
                 html("m");
         else
                 html("-");
         html_fileperm(mode >> 6);
         html_fileperm(mode >> 3);
         html_fileperm(mode);
 }
 
 void cgit_print_snapshot_links(const char *repo, const char *head,
                                const char *hex, int snapshots)
 {
         const struct cgit_snapshot_format* f;
         char *prefix;
             char *filename;
         unsigned char sha1[20];
 
         if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
             (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1]))
                 hex++;
         prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex));
         for (f = cgit_snapshot_formats; f->suffix; f++) {
                 if (!(snapshots & f->bit))
                         continue;
                 filename = fmt("%s%s", prefix, f->suffix);
                 cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                 html("<br/>");
         }
 }