ui-log.c: allow commit range as search expression

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 0e688a0141a4a055a35774856aa26d1d8e8c4675..0f65474fa708192ee2dc1a0e97b4332ae5779023 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -20,7 +20,7 @@ static char *http_date(time_t t)
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
        static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
        static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",

-                "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
+                "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};

        struct tm *tm = gmtime(&t);
        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
                   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
        struct tm *tm = gmtime(&t);
        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
                   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,


@@ -34,24 +34,23 @@ void cgit_print_error(char *msg)
        html("</div>\n");
 }
 
        html("</div>\n");
 }
 

-char *cgit_hosturl()
+char *cgit_httpscheme()

 {
 {

-       char *host, *port;
+       if (ctx.env.https && !strcmp(ctx.env.https, "on"))
+               return "https://";
+       else
+               return "http://";
+}

 
 

-       host = getenv("HTTP_HOST");
-       if (host) {
-               host = xstrdup(host);
-       } else {
-               host = getenv("SERVER_NAME");
-               if (!host)
-                       return NULL;
-               port = getenv("SERVER_PORT");
-               if (port && atoi(port) != 80)
-                       host = xstrdup(fmt("%s:%d", host, atoi(port)));
-               else
-                       host = xstrdup(host);
-       }
-       return host;
+char *cgit_hosturl()
+{
+       if (ctx.env.http_host)
+               return ctx.env.http_host;
+       if (!ctx.env.server_name)
+               return NULL;
+       if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
+               return ctx.env.server_name;
+       return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));

 }
 
 char *cgit_rooturl()
 }
 
 char *cgit_rooturl()


@@ -247,7 +246,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
        char *delim;
 
        delim = repolink(title, class, page, head, path);
        char *delim;
 
        delim = repolink(title, class, page, head, path);

-       if (rev && strcmp(rev, ctx.qry.head)) {
+       if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) {

                html(delim);
                html("id=");
                html_url_arg(rev);
                html(delim);
                html("id=");
                html_url_arg(rev);


@@ -281,7 +280,8 @@ void cgit_plain_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,

-                  char *rev, char *path, int ofs, char *grep, char *pattern)
+                  char *rev, char *path, int ofs, char *grep, char *pattern,
+                  int showmsg)

 {
        char *delim;
 
 {
        char *delim;
 


@@ -305,6 +305,11 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);

+               delim = "&";
+       }
+       if (showmsg) {
+               html(delim);
+               html("showmsg=1");

        }
        html("'>");
        html_txt(name);
        }
        html("'>");
        html_txt(name);


@@ -312,7 +317,7 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,

-                     char *rev)
+                     char *rev, int toggle_ssdiff)

 {
        if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
                name[ctx.cfg.max_msg_len] = '\0';
 {
        if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
                name[ctx.cfg.max_msg_len] = '\0';


@@ -320,7 +325,23 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
                name[ctx.cfg.max_msg_len - 2] = '.';
                name[ctx.cfg.max_msg_len - 3] = '.';
        }
                name[ctx.cfg.max_msg_len - 2] = '.';
                name[ctx.cfg.max_msg_len - 3] = '.';
        }

-       reporevlink("commit", name, title, class, head, rev, NULL);
+
+       char *delim;
+
+       delim = repolink(title, class, "commit", head, NULL);
+       if (rev && strcmp(rev, ctx.qry.head)) {
+               html(delim);
+               html("id=");
+               html_url_arg(rev);
+               delim = "&amp;";
+       }
+       if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+               html(delim);
+               html("ss=1");
+       }
+       html("'>");
+       html_txt(name);
+       html("</a>");

 }
 
 void cgit_refs_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_refs_link(char *name, char *title, char *class, char *head,


@@ -336,12 +357,13 @@ void cgit_snapshot_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_diff_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_diff_link(char *name, char *title, char *class, char *head,

-                   char *new_rev, char *old_rev, char *path)
+                   char *new_rev, char *old_rev, char *path,
+                   int toggle_ssdiff)

 {
        char *delim;
 
        delim = repolink(title, class, "diff", head, path);
 {
        char *delim;
 
        delim = repolink(title, class, "diff", head, path);

-       if (new_rev && strcmp(new_rev, ctx.qry.head)) {
+       if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) {

                html(delim);
                html("id=");
                html_url_arg(new_rev);
                html(delim);
                html("id=");
                html_url_arg(new_rev);


@@ -351,6 +373,11 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
                html(delim);
                html("id2=");
                html_url_arg(old_rev);
                html(delim);
                html("id2=");
                html_url_arg(old_rev);

+               delim = "&amp;";
+       }
+       if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) {
+               html(delim);
+               html("ss=1");

        }
        html("'>");
        html_txt(name);
        }
        html("'>");
        html_txt(name);


@@ -363,13 +390,22 @@ void cgit_patch_link(char *name, char *title, char *class, char *head,
        reporevlink("patch", name, title, class, head, rev, NULL);
 }
 
        reporevlink("patch", name, title, class, head, rev, NULL);
 }
 

+void cgit_stats_link(char *name, char *title, char *class, char *head,
+                    char *path)
+{
+       reporevlink("stats", name, title, class, head, NULL, path);
+}
+

 void cgit_object_link(struct object *obj)
 {
 void cgit_object_link(struct object *obj)
 {

-       char *page, *rev, *name;
+       char *page, *shortrev, *fullrev, *name;

 
 

+       fullrev = sha1_to_hex(obj->sha1);
+       shortrev = xstrdup(fullrev);
+       shortrev[10] = '\0';

        if (obj->type == OBJ_COMMIT) {
        if (obj->type == OBJ_COMMIT) {

-                cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
-                                ctx.qry.head, sha1_to_hex(obj->sha1));
+                cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
+                                ctx.qry.head, fullrev, 0);

                return;
        } else if (obj->type == OBJ_TREE)
                page = "tree";
                return;
        } else if (obj->type == OBJ_TREE)
                page = "tree";


@@ -377,9 +413,8 @@ void cgit_object_link(struct object *obj)
                page = "tag";
        else
                page = "blob";
                page = "tag";
        else
                page = "blob";

-       rev = sha1_to_hex(obj->sha1);
-       name = fmt("%s %s", typename(obj->type), rev);
-       reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL);
+       name = fmt("%s %s...", typename(obj->type), shortrev);
+       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, char *format, int local_time)


@@ -442,6 +477,11 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
 
 void cgit_print_http_headers(struct cgit_context *ctx)
 {

+       if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
+               return;
+
+       if (ctx->page.status)
+               htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);

        if (ctx->page.mimetype && ctx->page.charset)
                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                      ctx->page.charset);
        if (ctx->page.mimetype && ctx->page.charset)
                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                      ctx->page.charset);


@@ -454,11 +494,21 @@ void cgit_print_http_headers(struct cgit_context *ctx)
                      ctx->page.filename);
        htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
        htmlf("Expires: %s\n", http_date(ctx->page.expires));
                      ctx->page.filename);
        htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
        htmlf("Expires: %s\n", http_date(ctx->page.expires));

+       if (ctx->page.etag)
+               htmlf("ETag: \"%s\"\n", ctx->page.etag);

        html("\n");
        html("\n");

+       if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
+               exit(0);

 }
 
 void cgit_print_docstart(struct cgit_context *ctx)
 {
 }
 
 void cgit_print_docstart(struct cgit_context *ctx)
 {

+       if (ctx->cfg.embedded) {
+               if (ctx->cfg.header)
+                       html_include(ctx->cfg.header);
+               return;
+       }
+

        char *host = cgit_hosturl();
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        char *host = cgit_hosturl();
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");


@@ -478,19 +528,30 @@ void cgit_print_docstart(struct cgit_context *ctx)
                html("'/>\n");
        }
        if (host && ctx->repo) {
                html("'/>\n");
        }
        if (host && ctx->repo) {

-               html("<link rel='alternate' title='Atom feed' href='http://");
+               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,
                                       fmt("h=%s", ctx->qry.head)));
                html_attr(cgit_hosturl());
                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
                                       fmt("h=%s", ctx->qry.head)));

-               html("' type='application/atom+xml'/>");
+               html("' type='application/atom+xml'/>\n");

        }
        }

+       if (ctx->cfg.head_include)
+               html_include(ctx->cfg.head_include);

        html("</head>\n");
        html("<body>\n");
        html("</head>\n");
        html("<body>\n");

+       if (ctx->cfg.header)
+               html_include(ctx->cfg.header);

 }
 
 void cgit_print_docend()
 {
 }
 
 void cgit_print_docend()
 {

-       html("</div>");
+       html("</div> <!-- class=content -->\n");
+       if (ctx.cfg.embedded) {
+               html("</div> <!-- id=cgit -->\n");
+               if (ctx.cfg.footer)
+                       html_include(ctx.cfg.footer);
+               return;
+       }

        if (ctx.cfg.footer)
                html_include(ctx.cfg.footer);
        else {
        if (ctx.cfg.footer)
                html_include(ctx.cfg.footer);
        else {


@@ -499,6 +560,7 @@ void cgit_print_docend()
                cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                html("</div>\n");
        }
                cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                html("</div>\n");
        }

+       html("</div> <!-- id=cgit -->\n");

        html("</body>\n</html>\n");
 }
 
        html("</body>\n</html>\n");
 }
 


@@ -549,7 +611,7 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
        return 0;
 }
 
        return 0;
 }
 

-void add_hidden_formfields(int incl_head, int incl_search, char *page)
+void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)

 {
        char *url;
 
 {
        char *url;
 


@@ -568,6 +630,8 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
                html_hidden("id", ctx.qry.sha1);
        if (ctx.qry.sha2)
                html_hidden("id2", ctx.qry.sha2);
                html_hidden("id", ctx.qry.sha1);
        if (ctx.qry.sha2)
                html_hidden("id2", ctx.qry.sha2);

+       if (ctx.qry.showmsg)
+               html_hidden("showmsg", "1");

 
        if (incl_search) {
                if (ctx.qry.grep)
 
        if (incl_search) {
                if (ctx.qry.grep)


@@ -577,25 +641,28 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
        }
 }
 
        }
 }
 

+const char *fallback_cmd = "repolist";
+

 char *hc(struct cgit_cmd *cmd, const char *page)
 {
 char *hc(struct cgit_cmd *cmd, const char *page)
 {

-       return (strcmp(cmd->name, page) ? NULL : "active");
+       return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");

 }
 
 }
 

-void cgit_print_pageheader(struct cgit_context *ctx)
+static void print_header(struct cgit_context *ctx)

 {
 {

-       struct cgit_cmd *cmd = cgit_get_cmd(ctx);
-

        html("<table id='header'>\n");
        html("<tr>\n");
        html("<table id='header'>\n");
        html("<tr>\n");

-       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");
+
+       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) {
 
        html("<td class='main'>");
        if (ctx->repo) {


@@ -604,7 +671,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
                cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");

-               add_hidden_formfields(0, 1, ctx->qry.page);
+               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("<select name='h' onchange='this.form.submit();'>\n");
                for_each_branch_ref(print_branch_option, ctx->qry.head);
                html("</select> ");


@@ -626,6 +693,18 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                        html_include(ctx->cfg.index_info);
        }
        html("</td></tr></table>\n");
                        html_include(ctx->cfg.index_info);
        }
        html("</td></tr></table>\n");

+}
+
+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) {
 
        html("<table class='tabs'><tr><td>\n");
        if (ctx->repo) {


@@ -634,16 +713,16 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
                cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
                               ctx->qry.sha1, NULL);
                cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,

-                             NULL, NULL, 0, NULL, NULL);
+                             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"),
                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);
+                                ctx->qry.head, ctx->qry.sha1, 0);

                cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
                cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,

-                              ctx->qry.sha1, ctx->qry.sha2, NULL);
-               if (ctx->repo->enable_stats)
-                       reporevlink("stats", "stats", NULL, hc(cmd, "stats"),
-                                   ctx->qry.head, NULL, NULL);
+                              ctx->qry.sha1, ctx->qry.sha2, NULL, 0);
+               if (ctx->repo->max_stats)
+                       cgit_stats_link("stats", NULL, hc(cmd, "stats"),
+                                       ctx->qry.head, NULL);

                if (ctx->repo->readme)
                        reporevlink("about", "about", NULL,
                                    hc(cmd, "about"), ctx->qry.head, NULL,
                if (ctx->repo->readme)
                        reporevlink("about", "about", NULL,
                                    hc(cmd, "about"), ctx->qry.head, NULL,


@@ -654,11 +733,12 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                        html_url_path(cgit_fileurl(ctx->qry.repo, "log",
                                                   ctx->qry.path, NULL));
                html("'>\n");
                        html_url_path(cgit_fileurl(ctx->qry.repo, "log",
                                                   ctx->qry.path, NULL));
                html("'>\n");

-               add_hidden_formfields(1, 0, "log");
+               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 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("</select>\n");
                html("<input class='txt' type='text' size='10' name='q' value='");
                html_attr(ctx->qry.search);


@@ -703,15 +783,19 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
                               const char *hex, int snapshots)
 {
        const struct cgit_snapshot_format* f;
                               const char *hex, int snapshots)
 {
        const struct cgit_snapshot_format* f;

+       char *prefix;

        char *filename;
        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;
        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (!(snapshots & f->bit))
                        continue;

-               filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
-                              f->suffix);
-               cgit_snapshot_link(filename, NULL, NULL, (char *)head,
-                                  (char *)hex, filename);
+               filename = fmt("%s%s", prefix, f->suffix);
+               cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);

                html("<br/>");
        }
 }
                html("<br/>");
        }
 }