]> gitweb.ps.run Git - ps-cgit/commitdiff
Merge branch 'lh/range-search'
authorLars Hjemli <hjemli@gmail.com>
Tue, 22 Jun 2010 14:16:24 +0000 (16:16 +0200)
committerLars Hjemli <hjemli@gmail.com>
Tue, 22 Jun 2010 14:16:24 +0000 (16:16 +0200)
1  2 
ui-log.c
ui-shared.c

diff --combined ui-log.c
index 5eb5c813beedaebf7bb0921f20c892c0556f9628,4441d1d55025405e47d69f07ee79176c510fa111..33ec8a95f5712d09a1151f69b91cee9a6a91cb75
+++ b/ui-log.c
@@@ -33,7 -33,7 +33,7 @@@ void inspect_files(struct diff_filepai
        files++;
        if (ctx.repo->enable_log_linecount)
                cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
 -                              &new_size, &binary, count_lines);
 +                              &new_size, &binary, 0, count_lines);
  }
  
  void show_commit_decorations(struct commit *commit)
@@@ -46,9 -46,8 +46,9 @@@
        while (deco) {
                if (!prefixcmp(deco->name, "refs/heads/")) {
                        strncpy(buf, deco->name + 11, sizeof(buf) - 1);
 -                      cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL,
 -                              0, NULL, NULL, ctx.qry.showmsg);
 +                      cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
 +                                    ctx.qry.vpath, 0, NULL, NULL,
 +                                    ctx.qry.showmsg);
                }
                else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
                        strncpy(buf, deco->name + 15, sizeof(buf) - 1);
                else if (!prefixcmp(deco->name, "refs/remotes/")) {
                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                        cgit_log_link(buf, NULL, "remote-deco", NULL,
 -                              sha1_to_hex(commit->object.sha1), NULL,
 -                              0, NULL, NULL, ctx.qry.showmsg);
 +                                    sha1_to_hex(commit->object.sha1),
 +                                    ctx.qry.vpath, 0, NULL, NULL,
 +                                    ctx.qry.showmsg);
                }
                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),
 +                                       ctx.qry.vpath, 0);
                }
                deco = deco->next;
        }
@@@ -85,14 -82,14 +85,14 @@@ void print_commit(struct commit *commit
        htmlf("<tr%s><td>",
                ctx.qry.showmsg ? " class='logheader'" : "");
        tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
 -      tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
 +      tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
        html_link_open(tmp, NULL, NULL);
        cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
        html_link_close();
        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), ctx.qry.vpath, 0);
        show_commit_decorations(commit);
        html("</td><td>");
        html_txt(info->author);
@@@ -149,10 -146,13 +149,13 @@@ void cgit_print_log(const char *tip, in
  
        argv[1] = disambiguate_ref(tip);
  
-       if (grep && pattern && (!strcmp(grep, "grep") ||
-                               !strcmp(grep, "author") ||
-                               !strcmp(grep, "committer")))
-               argv[argc++] = fmt("--%s=%s", grep, pattern);
+       if (grep && pattern) {
+               if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
+                   !strcmp(grep, "committer"))
+                       argv[argc++] = fmt("--%s=%s", grep, pattern);
+               if (!strcmp(grep, "range"))
+                       argv[1] = pattern;
+       }
  
        if (path) {
                argv[argc++] = "--";
                html(" (");
                cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
                              NULL, ctx.qry.head, ctx.qry.sha1,
 -                            ctx.qry.path, ctx.qry.ofs, ctx.qry.grep,
 +                            ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
                              ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
                html(")");
        }
                     columns);
                if (ofs > 0) {
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
 -                                    ctx.qry.sha1, ctx.qry.path,
 +                                    ctx.qry.sha1, ctx.qry.vpath,
                                      ofs - cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg);
                        html("&nbsp;");
                }
                if ((commit = get_revision(&rev)) != NULL) {
                        cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
 -                                    ctx.qry.sha1, ctx.qry.path,
 +                                    ctx.qry.sha1, ctx.qry.vpath,
                                      ofs + cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg);
                }
                html("</div>");
        } else if ((commit = get_revision(&rev)) != NULL) {
                html("<tr class='nohover'><td colspan='3'>");
 -              cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
 -                            NULL, NULL, ctx.qry.showmsg);
 +              cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
 +                            ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
                html("</td></tr>\n");
        }
  }
diff --combined ui-shared.c
index c99bcecdf7905fa373d8839d83e3935d9c30faeb,0f65474fa708192ee2dc1a0e97b4332ae5779023..c398d7aaf85a4ce5dfedbccc97bc844713dd44bf
@@@ -27,7 -27,7 +27,7 @@@ static char *http_date(time_t t
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
  }
  
 -void cgit_print_error(char *msg)
 +void cgit_print_error(const char *msg)
  {
        html("<div class='error'>");
        html_txt(msg);
@@@ -133,7 -133,7 +133,7 @@@ char *cgit_currurl(
                return fmt("%s/", ctx.cfg.virtual_root);
  }
  
 -static void site_url(char *page, char *search, int ofs)
 +static void site_url(const char *page, const char *search, int ofs)
  {
        char *delim = "?";
  
        }
  }
  
 -static void site_link(char *page, char *name, char *title, char *class,
 -                    char *search, int ofs)
 +static void site_link(const char *page, const char *name, const char *title,
 +                    const char *class, const char *search, int ofs)
  {
        html("<a");
        if (title) {
        html("</a>");
  }
  
 -void cgit_index_link(char *name, char *title, char *class, char *pattern,
 -                   int ofs)
 +void cgit_index_link(const char *name, const char *title, const char *class,
 +                   const char *pattern, int ofs)
  {
        site_link(NULL, name, title, class, pattern, ofs);
  }
  
 -static char *repolink(char *title, char *class, char *page, char *head,
 -                    char *path)
 +static char *repolink(const char *title, const char *class, const char *page,
 +                    const char *head, const char *path)
  {
        char *delim = "?";
  
        return fmt("%s", delim);
  }
  
 -static void reporevlink(char *page, char *name, char *title, char *class,
 -                      char *head, char *rev, char *path)
 +static void reporevlink(const char *page, const char *name, const char *title,
 +                      const char *class, const char *head, const char *rev,
 +                      const char *path)
  {
        char *delim;
  
        html("</a>");
  }
  
 -void cgit_summary_link(char *name, char *title, char *class, char *head)
 +void cgit_summary_link(const char *name, const char *title, const char *class,
 +                     const char *head)
  {
        reporevlink(NULL, name, title, class, head, NULL, NULL);
  }
  
 -void cgit_tag_link(char *name, char *title, char *class, char *head,
 -                 char *rev)
 +void cgit_tag_link(const char *name, const char *title, const char *class,
 +                 const char *head, const char *rev)
  {
        reporevlink("tag", name, title, class, head, rev, NULL);
  }
  
 -void cgit_tree_link(char *name, char *title, char *class, char *head,
 -                  char *rev, char *path)
 +void cgit_tree_link(const char *name, const char *title, const char *class,
 +                  const char *head, const char *rev, const char *path)
  {
        reporevlink("tree", name, title, class, head, rev, path);
  }
  
 -void cgit_plain_link(char *name, char *title, char *class, char *head,
 -                   char *rev, char *path)
 +void cgit_plain_link(const char *name, const char *title, const char *class,
 +                   const char *head, const char *rev, const char *path)
  {
        reporevlink("plain", name, title, class, head, rev, path);
  }
  
 -void cgit_log_link(char *name, char *title, char *class, char *head,
 -                 char *rev, char *path, int ofs, char *grep, char *pattern,
 -                 int showmsg)
 +void cgit_log_link(const char *name, const char *title, const char *class,
 +                 const char *head, const char *rev, const char *path,
 +                 int ofs, const char *grep, const char *pattern, int showmsg)
  {
        char *delim;
  
        html("</a>");
  }
  
 -void cgit_commit_link(char *name, char *title, char *class, char *head,
 -                    char *rev, int toggle_ssdiff)
 +void cgit_commit_link(char *name, const char *title, const char *class,
 +                    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';
  
        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=");
        if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
                html(delim);
                html("ss=1");
 +              delim = "&amp;";
 +      }
 +      if (ctx.qry.context > 0 && ctx.qry.context != 3) {
 +              html(delim);
 +              html("context=");
 +              htmlf("%d", ctx.qry.context);
 +              delim = "&amp;";
        }
        html("'>");
        html_txt(name);
        html("</a>");
  }
  
 -void cgit_refs_link(char *name, char *title, char *class, char *head,
 -                  char *rev, char *path)
 +void cgit_refs_link(const char *name, const char *title, const char *class,
 +                  const char *head, const char *rev, const char *path)
  {
        reporevlink("refs", name, title, class, head, rev, path);
  }
  
 -void cgit_snapshot_link(char *name, char *title, char *class, char *head,
 -                      char *rev, char *archivename)
 +void cgit_snapshot_link(const char *name, const char *title, const char *class,
 +                      const char *head, const char *rev,
 +                      const char *archivename)
  {
        reporevlink("snapshot", name, title, class, head, rev, archivename);
  }
  
 -void cgit_diff_link(char *name, char *title, char *class, char *head,
 -                  char *new_rev, char *old_rev, char *path,
 -                  int toggle_ssdiff)
 +void cgit_diff_link(const char *name, const char *title, const char *class,
 +                  const char *head, const char *new_rev, const char *old_rev,
 +                  const char *path, int toggle_ssdiff)
  {
        char *delim;
  
        if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
                html(delim);
                html("ss=1");
 +              delim = "&amp;";
 +      }
 +      if (ctx.qry.context > 0 && ctx.qry.context != 3) {
 +              html(delim);
 +              html("context=");
 +              htmlf("%d", ctx.qry.context);
 +              delim = "&amp;";
        }
        html("'>");
        html_txt(name);
        html("</a>");
  }
  
 -void cgit_patch_link(char *name, char *title, char *class, char *head,
 -                   char *rev)
 +void cgit_patch_link(const char *name, const char *title, const char *class,
 +                   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(char *name, char *title, char *class, char *head,
 -                   char *path)
 +void cgit_stats_link(const char *name, const char *title, const char *class,
 +                   const char *head, const char *path)
  {
        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;
        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";
        reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
  }
  
 -void cgit_print_date(time_t secs, char *format, int local_time)
 +void cgit_print_date(time_t secs, const char *format, int local_time)
  {
        char buf[64];
        struct tm *time;
        html_txt(buf);
  }
  
 -void cgit_print_age(time_t t, time_t max_relative, char *format)
 +void cgit_print_age(time_t t, time_t max_relative, const char *format)
  {
        time_t now, secs;
  
@@@ -607,7 -531,7 +607,7 @@@ void cgit_print_docstart(struct cgit_co
                html("<link rel='alternate' title='Atom feed' href='");
                html(cgit_httpscheme());
                html_attr(cgit_hosturl());
 -              html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
 +              html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath,
                                       fmt("h=%s", ctx->qry.head)));
                html("' type='application/atom+xml'/>\n");
        }
@@@ -687,15 -611,14 +687,15 @@@ int print_archive_ref(const char *refna
        return 0;
  }
  
 -void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
 +void cgit_add_hidden_formfields(int incl_head, int incl_search,
 +                              const char *page)
  {
        char *url;
  
        if (!ctx.cfg.virtual_root) {
                url = fmt("%s/%s", ctx.qry.repo, page);
 -              if (ctx.qry.path)
 -                      url = fmt("%s/%s", url, ctx.qry.path);
 +              if (ctx.qry.vpath)
 +                      url = fmt("%s/%s", url, ctx.qry.vpath);
                html_hidden("url", url);
        }
  
        }
  }
  
 -const char *fallback_cmd = "repolist";
 +static const char *hc(struct cgit_context *ctx, const char *page)
 +{
 +      return strcmp(ctx->qry.page, page) ? NULL : "active";
 +}
  
 -char *hc(struct cgit_cmd *cmd, const char *page)
 +static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
  {
 -      return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
 +      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)
  
  void cgit_print_pageheader(struct cgit_context *ctx)
  {
 -      struct cgit_cmd *cmd = cgit_get_cmd(ctx);
 -
 -      if (!cmd && ctx->repo)
 -              fallback_cmd = "summary";
 -
        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(cmd, "summary"),
 +              cgit_summary_link("summary", NULL, hc(ctx, "summary"),
                                  ctx->qry.head);
 -              cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
 +              cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
 -              cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
 -                            NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg);
 -              cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
 -                             ctx->qry.sha1, NULL);
 -              cgit_commit_link("commit", NULL, hc(cmd, "commit"),
 -                               ctx->qry.head, ctx->qry.sha1, 0);
 -              cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
 -                             ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
 +              cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head,
 +                            NULL, ctx->qry.vpath, 0, NULL, NULL,
 +                            ctx->qry.showmsg);
 +              cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head,
 +                             ctx->qry.sha1, ctx->qry.vpath);
 +              cgit_commit_link("commit", NULL, hc(ctx, "commit"),
 +                               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, ctx->qry.vpath, 0);
                if (ctx->repo->max_stats)
 -                      cgit_stats_link("stats", NULL, hc(cmd, "stats"),
 -                                      ctx->qry.head, NULL);
 +                      cgit_stats_link("stats", NULL, hc(ctx, "stats"),
 +                                      ctx->qry.head, ctx->qry.vpath);
                if (ctx->repo->readme)
                        reporevlink("about", "about", NULL,
 -                                  hc(cmd, "about"), ctx->qry.head, 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.path, NULL));
 +                                                 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_option("range", "range", ctx->qry.grep);
                html("</select>\n");
                html("<input class='txt' type='text' size='10' name='q' value='");
                html_attr(ctx->qry.search);
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else {
 -              site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
 +              site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
                if (ctx->cfg.root_readme)
 -                      site_link("about", "about", NULL, hc(cmd, "about"),
 +                      site_link("about", "about", NULL, hc(ctx, "about"),
                                  NULL, 0);
                html("</td><td class='form'>");
                html("<form method='get' action='");
                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'>");
  }