filters: import more modern scripts

[cgit.git] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 5cf66cbd0828d764f59a2b6b012e1a80eb9ff622..6f1249bdea1b33185a6f27ac3fefdbe8402c9fea 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "ui-log.h"

 #include "html.h"
 #include "ui-shared.h"
 #include "vector.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "vector.h"


@@ -28,7 +29,7 @@ static const char *column_colors_html[] = {
 
 #define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
 
 
 #define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
 

-void count_lines(char *line, int size)
+static void count_lines(char *line, int size)

 {
        if (size <= 0)
                return;
 {
        if (size <= 0)
                return;


@@ -40,7 +41,7 @@ void count_lines(char *line, int size)
                rem_lines++;
 }
 
                rem_lines++;
 }
 

-void inspect_files(struct diff_filepair *pair)
+static void inspect_files(struct diff_filepair *pair)

 {
        unsigned long old_size = 0;
        unsigned long new_size = 0;
 {
        unsigned long old_size = 0;
        unsigned long new_size = 0;


@@ -60,6 +61,7 @@ void show_commit_decorations(struct commit *commit)
 
        buf[sizeof(buf) - 1] = 0;
        deco = lookup_decoration(&name_decoration, &commit->object);
 
        buf[sizeof(buf) - 1] = 0;
        deco = lookup_decoration(&name_decoration, &commit->object);

+       html("<span class='decoration'>");

        while (deco) {
                if (!prefixcmp(deco->name, "refs/heads/")) {
                        strncpy(buf, deco->name + 11, sizeof(buf) - 1);
        while (deco) {
                if (!prefixcmp(deco->name, "refs/heads/")) {
                        strncpy(buf, deco->name + 11, sizeof(buf) - 1);


@@ -76,6 +78,8 @@ void show_commit_decorations(struct commit *commit)
                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                }
                else if (!prefixcmp(deco->name, "refs/remotes/")) {
                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                }
                else if (!prefixcmp(deco->name, "refs/remotes/")) {

+                       if (!ctx.repo->enable_remote_branches)
+                               goto next;

                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                        cgit_log_link(buf, NULL, "remote-deco", NULL,
                                      sha1_to_hex(commit->object.sha1),
                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                        cgit_log_link(buf, NULL, "remote-deco", NULL,
                                      sha1_to_hex(commit->object.sha1),


@@ -88,44 +92,38 @@ void show_commit_decorations(struct commit *commit)
                                         sha1_to_hex(commit->object.sha1),
                                         ctx.qry.vpath, 0);
                }
                                         sha1_to_hex(commit->object.sha1),
                                         ctx.qry.vpath, 0);
                }

+next:

                deco = deco->next;
        }
                deco = deco->next;
        }

+       html("</span>");

 }
 
 }
 

-void print_commit(struct commit *commit, struct rev_info *revs)
+static void print_commit(struct commit *commit, struct rev_info *revs)

 {
        struct commitinfo *info;
 {
        struct commitinfo *info;

-       char *tmp;
-       int cols = 2;
+       int columns = revs->graph ? 4 : 3;

        struct strbuf graphbuf = STRBUF_INIT;
        struct strbuf graphbuf = STRBUF_INIT;

+       struct strbuf msgbuf = STRBUF_INIT;

 
 

-       if (ctx.repo->enable_log_filecount) {
-               cols++;
-               if (ctx.repo->enable_log_linecount)
-                       cols++;
-       }
+       if (ctx.repo->enable_log_filecount)
+               columns++;
+       if (ctx.repo->enable_log_linecount)
+               columns++;

 
        if (revs->graph) {
                /* Advance graph until current commit */
                while (!graph_next_line(revs->graph, &graphbuf)) {
                        /* Print graph segment in otherwise empty table row */
 
        if (revs->graph) {
                /* Advance graph until current commit */
                while (!graph_next_line(revs->graph, &graphbuf)) {
                        /* Print graph segment in otherwise empty table row */

-                       html("<tr class='nohover'><td/><td class='commitgraph'>");
+                       html("<tr class='nohover'><td class='commitgraph'>");

                        html(graphbuf.buf);
                        html(graphbuf.buf);

-                       htmlf("</td><td colspan='%d' /></tr>\n", cols);
+                       htmlf("</td><td colspan='%d' /></tr>\n", columns);

                        strbuf_setlen(&graphbuf, 0);
                }
                /* Current commit's graph segment is now ready in graphbuf */
        }
 
        info = cgit_parse_commit(commit);
                        strbuf_setlen(&graphbuf, 0);
                }
                /* Current commit's graph segment is now ready in graphbuf */
        }
 
        info = cgit_parse_commit(commit);

-       htmlf("<tr%s><td>",
-               ctx.qry.showmsg ? " class='logheader'" : "");
-       tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
-       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();
-       html("</td>");
+       htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : "");

 
        if (revs->graph) {
                /* Print graph segment for current commit */
 
        if (revs->graph) {
                /* Print graph segment for current commit */


@@ -134,30 +132,65 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                html("</td>");
                strbuf_setlen(&graphbuf, 0);
        }
                html("</td>");
                strbuf_setlen(&graphbuf, 0);
        }

+       else {
+               html("<td>");
+               cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
+               html("</td>");
+       }

 
        htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : "");
 
        htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : "");

+       if (ctx.qry.showmsg) {
+               /* line-wrap long commit subjects instead of truncating them */
+               size_t subject_len = strlen(info->subject);
+
+               if (subject_len > ctx.cfg.max_msg_len &&
+                   ctx.cfg.max_msg_len >= 15) {
+                       /* symbol for signaling line-wrap (in PAGE_ENCODING) */
+                       const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 };
+                       int i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
+
+                       /* Rewind i to preceding space character */
+                       while (i > 0 && !isspace(info->subject[i]))
+                               --i;
+                       if (!i) /* Oops, zero spaces. Reset i */
+                               i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
+
+                       /* add remainder starting at i to msgbuf */
+                       strbuf_add(&msgbuf, info->subject + i, subject_len - i);
+                       strbuf_trim(&msgbuf);
+                       strbuf_add(&msgbuf, "\n\n", 2);
+
+                       /* Place wrap_symbol at position i in info->subject */
+                       strcpy(info->subject + i, wrap_symbol);
+               }
+       }

        cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                         sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
        show_commit_decorations(commit);
        html("</td><td>");
        html_txt(info->author);
        cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                         sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
        show_commit_decorations(commit);
        html("</td><td>");
        html_txt(info->author);

-       if (ctx.repo->enable_log_filecount) {
+
+       if (revs->graph) {
+               html("</td><td>");
+               cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
+       }
+
+       if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) {

                files = 0;
                add_lines = 0;
                rem_lines = 0;
                cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
                files = 0;
                add_lines = 0;
                rem_lines = 0;
                cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);

-               html("</td><td>");
-               htmlf("%d", files);
-               if (ctx.repo->enable_log_linecount) {
-                       html("</td><td>");
-                       htmlf("-%d/+%d", rem_lines, add_lines);
-               }

        }
        }

+
+       if (ctx.repo->enable_log_filecount)
+               htmlf("</td><td>%d", files);
+       if (ctx.repo->enable_log_linecount)
+               htmlf("</td><td>-%d/+%d", rem_lines, add_lines);
+

        html("</td></tr>\n");
 
        if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
        html("</td></tr>\n");
 
        if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */

-               struct strbuf msgbuf = STRBUF_INIT;
-               html("<tr class='nohover'><td/>"); /* Empty 'Age' column */
+               html("<tr class='nohover'>");

 
                if (ctx.qry.showmsg) {
                        /* Concatenate commit message + notes in msgbuf */
 
                if (ctx.qry.showmsg) {
                        /* Concatenate commit message + notes in msgbuf */


@@ -165,9 +198,8 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                                strbuf_addstr(&msgbuf, info->msg);
                                strbuf_addch(&msgbuf, '\n');
                        }
                                strbuf_addstr(&msgbuf, info->msg);
                                strbuf_addch(&msgbuf, '\n');
                        }

-                       format_note(NULL, commit->object.sha1, &msgbuf,
-                                   PAGE_ENCODING,
-                                   NOTES_SHOW_HEADER | NOTES_INDENT);
+                       format_display_notes(commit->object.sha1,
+                                            &msgbuf, PAGE_ENCODING, 0);

                        strbuf_addch(&msgbuf, '\n');
                        strbuf_ltrim(&msgbuf);
                }
                        strbuf_addch(&msgbuf, '\n');
                        strbuf_ltrim(&msgbuf);
                }


@@ -198,28 +230,34 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                        }
                        html("</td>\n");
                }
                        }
                        html("</td>\n");
                }

+               else
+                       html("<td/>"); /* Empty 'Age' column */

 
                /* Print msgbuf into remainder of table row */
 
                /* Print msgbuf into remainder of table row */

-               htmlf("<td colspan='%d'%s>\n", cols,
+               htmlf("<td colspan='%d'%s>\n", columns - (revs->graph ? 1 : 0),

                        ctx.qry.showmsg ? " class='logmsg'" : "");
                html_txt(msgbuf.buf);
                html("</td></tr>\n");
                        ctx.qry.showmsg ? " class='logmsg'" : "");
                html_txt(msgbuf.buf);
                html("</td></tr>\n");

-               strbuf_release(&msgbuf);

        }
 
        }
 

+       strbuf_release(&msgbuf);

        strbuf_release(&graphbuf);
        cgit_free_commitinfo(info);
 }
 
        strbuf_release(&graphbuf);
        cgit_free_commitinfo(info);
 }
 

-static const char *disambiguate_ref(const char *ref)
+static const char *disambiguate_ref(const char *ref, int *must_free_result)

 {
        unsigned char sha1[20];
 {
        unsigned char sha1[20];

-       const char *longref;
+       struct strbuf longref = STRBUF_INIT;

 
 

-       longref = fmt("refs/heads/%s", ref);
-       if (get_sha1(longref, sha1) == 0)
-               return longref;
+       strbuf_addf(&longref, "refs/heads/%s", ref);
+       if (get_sha1(longref.buf, sha1) == 0) {
+               *must_free_result = 1;
+               return strbuf_detach(&longref, NULL);
+       }

 
 

+       *must_free_result = 0;
+       strbuf_release(&longref);

        return ref;
 }
 
        return ref;
 }
 


@@ -246,30 +284,32 @@ static char *next_token(char **src)
 }
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
 }
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,

-                   char *path, int pager)
+                   char *path, int pager, int commit_graph, int commit_sort)

 {
        struct rev_info rev;
        struct commit *commit;
        struct vector vec = VECTOR_INIT(char *);
 {
        struct rev_info rev;
        struct commit *commit;
        struct vector vec = VECTOR_INIT(char *);

-       int i, columns = 3;
-       char *arg;
+       int i, columns = commit_graph ? 4 : 3;
+       int must_free_tip = 0;
+       struct strbuf argbuf = STRBUF_INIT;

 
        /* First argv is NULL */
        vector_push(&vec, NULL, 0);
 
        if (!tip)
                tip = ctx.qry.head;
 
        /* First argv is NULL */
        vector_push(&vec, NULL, 0);
 
        if (!tip)
                tip = ctx.qry.head;

-       tip = disambiguate_ref(tip);
+       tip = disambiguate_ref(tip, &must_free_tip);

        vector_push(&vec, &tip, 0);
 
        if (grep && pattern && *pattern) {
                pattern = xstrdup(pattern);
                if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
                    !strcmp(grep, "committer")) {
        vector_push(&vec, &tip, 0);
 
        if (grep && pattern && *pattern) {
                pattern = xstrdup(pattern);
                if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
                    !strcmp(grep, "committer")) {

-                       arg = fmt("--%s=%s", grep, pattern);
-                       vector_push(&vec, &arg, 0);
+                       strbuf_addf(&argbuf, "--%s=%s", grep, pattern);
+                       vector_push(&vec, &argbuf.buf, 0);

                }
                if (!strcmp(grep, "range")) {
                }
                if (!strcmp(grep, "range")) {

+                       char *arg;

                        /* Split the pattern at whitespace and add each token
                         * as a revision expression. Do not accept other
                         * rev-list options. Also, replace the previously
                        /* Split the pattern at whitespace and add each token
                         * as a revision expression. Do not accept other
                         * rev-list options. Also, replace the previously


@@ -286,7 +326,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                        }
                }
        }
                        }
                }
        }

-       if (ctx.repo->enable_commit_graph) {
+       if (commit_graph) {

                static const char *graph_arg = "--graph";
                static const char *color_arg = "--color";
                vector_push(&vec, &graph_arg, 0);
                static const char *graph_arg = "--graph";
                static const char *color_arg = "--color";
                vector_push(&vec, &graph_arg, 0);


@@ -295,9 +335,17 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                                        COLUMN_COLORS_HTML_MAX);
        }
 
                                        COLUMN_COLORS_HTML_MAX);
        }
 

+       if (commit_sort == 1) {
+               static const char *date_order_arg = "--date-order";
+               vector_push(&vec, &date_order_arg, 0);
+       } else if (commit_sort == 2) {
+               static const char *topo_order_arg = "--topo-order";
+               vector_push(&vec, &topo_order_arg, 0);
+       }
+

        if (path) {
        if (path) {

-               arg = "--";
-               vector_push(&vec, &arg, 0);
+               static const char *double_dash_arg = "--";
+               vector_push(&vec, &double_dash_arg, 0);

                vector_push(&vec, &path, 0);
        }
 
                vector_push(&vec, &path, 0);
        }
 


@@ -320,9 +368,11 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        if (pager)
                html("<table class='list nowrap'>");
 
        if (pager)
                html("<table class='list nowrap'>");
 

-       html("<tr class='nohover'><th class='left'>Age</th>");
-       if (ctx.repo->enable_commit_graph)
+       html("<tr class='nohover'>");
+       if (commit_graph)

                html("<th></th>");
                html("<th></th>");

+       else
+               html("<th class='left'>Age</th>");

        html("<th class='left'>Commit message");
        if (pager) {
                html(" (");
        html("<th class='left'>Commit message");
        if (pager) {
                html(" (");


@@ -333,13 +383,15 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                html(")");
        }
        html("</th><th class='left'>Author</th>");
                html(")");
        }
        html("</th><th class='left'>Author</th>");

+       if (commit_graph)
+               html("<th class='left'>Age</th>");

        if (ctx.repo->enable_log_filecount) {
                html("<th class='left'>Files</th>");
                columns++;
        if (ctx.repo->enable_log_filecount) {
                html("<th class='left'>Files</th>");
                columns++;

-               if (ctx.repo->enable_log_linecount) {
-                       html("<th class='left'>Lines</th>");
-                       columns++;
-               }
+       }
+       if (ctx.repo->enable_log_linecount) {
+               html("<th class='left'>Lines</th>");
+               columns++;

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


@@ -361,25 +413,33 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                commit->parents = NULL;
        }
        if (pager) {
                commit->parents = NULL;
        }
        if (pager) {

-               html("</table><div class='pager'>");
+               html("</table><ul class='pager'>");

                if (ofs > 0) {
                if (ofs > 0) {

+                       html("<li>");

                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.vpath,
                                      ofs - cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg);
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.vpath,
                                      ofs - cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg);

-                       html("&nbsp;");
+                       html("</li>");

                }
                if ((commit = get_revision(&rev)) != NULL) {
                }
                if ((commit = get_revision(&rev)) != NULL) {

+                       html("<li>");

                        cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.vpath,
                                      ofs + cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg);
                        cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.vpath,
                                      ofs + cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg);

+                       html("</li>");

                }
                }

-               html("</div>");
+               html("</ul>");

        } else if ((commit = get_revision(&rev)) != NULL) {
        } else if ((commit = get_revision(&rev)) != NULL) {

-               html("<tr class='nohover'><td colspan='3'>");
+               htmlf("<tr class='nohover'><td colspan='%d'>", columns);

                cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
                              ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
                html("</td></tr>\n");
        }
                cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
                              ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
                html("</td></tr>\n");
        }

+
+       /* If we allocated tip then it is safe to cast away const. */
+       if (must_free_tip)
+               free((char*) tip);
+       strbuf_release(&argbuf);

 }
 }