ui-log: Line-wrap long commit subjects when showmsg is enabled

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 0d86fd54bcfc0ba2de0902a6d790eee9cf87efb2..05b5c297bb9885f0421178eb698558a19d959abd 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -13,6 +13,21 @@
 
 int files, add_lines, rem_lines;
 
 
 int files, add_lines, rem_lines;
 

+/*
+ * The list of available column colors in the commit graph.
+ */
+static const char *column_colors_html[] = {
+       "<span class='column1'>",
+       "<span class='column2'>",
+       "<span class='column3'>",
+       "<span class='column4'>",
+       "<span class='column5'>",
+       "<span class='column6'>",
+       "</span>",
+};
+
+#define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
+

 void count_lines(char *line, int size)
 {
        if (size <= 0)
 void count_lines(char *line, int size)
 {
        if (size <= 0)


@@ -83,6 +98,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
        char *tmp;
        int cols = 2;
        struct strbuf graphbuf = STRBUF_INIT;
        char *tmp;
        int cols = 2;
        struct strbuf graphbuf = STRBUF_INIT;

+       struct strbuf msgbuf = STRBUF_INIT;

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


@@ -121,6 +137,31 @@ void print_commit(struct commit *commit, struct rev_info *revs)
        }
 
        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);
        cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                         sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
        show_commit_decorations(commit);


@@ -141,7 +182,6 @@ void print_commit(struct commit *commit, struct rev_info *revs)
        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 */
 
                if (ctx.qry.showmsg) {
                html("<tr class='nohover'><td/>"); /* Empty 'Age' column */
 
                if (ctx.qry.showmsg) {


@@ -189,9 +229,9 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                        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);
 }


@@ -231,7 +271,7 @@ 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)

 {
        struct rev_info rev;
        struct commit *commit;
 {
        struct rev_info rev;
        struct commit *commit;


@@ -271,9 +311,13 @@ 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 *graph_arg = "--graph";

+               static const char *color_arg = "--color";

                vector_push(&vec, &graph_arg, 0);
                vector_push(&vec, &graph_arg, 0);

+               vector_push(&vec, &color_arg, 0);
+               graph_set_column_colors(column_colors_html,
+                                       COLUMN_COLORS_HTML_MAX);

        }
 
        if (path) {
        }
 
        if (path) {


@@ -302,7 +346,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                html("<table class='list nowrap'>");
 
        html("<tr class='nohover'><th class='left'>Age</th>");
                html("<table class='list nowrap'>");
 
        html("<tr class='nohover'><th class='left'>Age</th>");

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

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