ui-log: Change display of full commit messages (and notes)

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 32028484b7a531898aa4c3a00e51ebad4ec53da6..6d7fcaefa49b81485a4f40ca056f48aa97d38af5 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -9,6 +9,7 @@
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"

+#include "vector.h"

 
 int files, add_lines, rem_lines;
 
 
 int files, add_lines, rem_lines;
 


@@ -26,9 +27,15 @@ void count_lines(char *line, int size)
 
 void inspect_files(struct diff_filepair *pair)
 {
 
 void inspect_files(struct diff_filepair *pair)
 {

+       unsigned long old_size = 0;
+       unsigned long new_size = 0;
+       int binary = 0;
+

        files++;
        if (ctx.repo->enable_log_linecount)
        files++;
        if (ctx.repo->enable_log_linecount)

-               cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
+               cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
+                               &new_size, &binary, 0, ctx.qry.ignorews,
+                               count_lines);

 }
 
 void show_commit_decorations(struct commit *commit)
 }
 
 void show_commit_decorations(struct commit *commit)


@@ -41,23 +48,30 @@ void show_commit_decorations(struct commit *commit)
        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);

-                       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);
                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                }
                }
                else if (!prefixcmp(deco->name, "tag: refs/tags/")) {
                        strncpy(buf, deco->name + 15, sizeof(buf) - 1);
                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                }

+               else if (!prefixcmp(deco->name, "refs/tags/")) {
+                       strncpy(buf, deco->name + 10, sizeof(buf) - 1);
+                       cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
+               }

                else if (!prefixcmp(deco->name, "refs/remotes/")) {
                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                        cgit_log_link(buf, NULL, "remote-deco", NULL,
                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,
                }
                else {
                        strncpy(buf, deco->name, sizeof(buf) - 1);
                        cgit_commit_link(buf, NULL, "deco", ctx.qry.head,

-                               sha1_to_hex(commit->object.sha1));
+                                        sha1_to_hex(commit->object.sha1),
+                                        ctx.qry.vpath, 0);

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


@@ -73,14 +87,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));
        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,
        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));
+                        sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);

        show_commit_decorations(commit);
        html("</td><td>");
        html_txt(info->author);
        show_commit_decorations(commit);
        html("</td><td>");
        html_txt(info->author);


@@ -88,7 +102,7 @@ void print_commit(struct commit *commit)
                files = 0;
                add_lines = 0;
                rem_lines = 0;
                files = 0;
                add_lines = 0;
                rem_lines = 0;

-               cgit_diff_commit(commit, inspect_files);
+               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", files);
                if (ctx.repo->enable_log_linecount) {


@@ -97,17 +111,33 @@ void print_commit(struct commit *commit)
                }
        }
        html("</td></tr>\n");
                }
        }
        html("</td></tr>\n");

-       if (ctx.qry.showmsg) {
+
+       if (ctx.qry.showmsg) { /* Print message + notes in a second table row */
+               /* Concatenate commit message and notes in msgbuf */
+               struct strbuf msgbuf = STRBUF_INIT;
+               if (info->msg && *(info->msg)) {
+                       strbuf_addstr(&msgbuf, info->msg);
+                       strbuf_addch(&msgbuf, '\n');
+               }
+               format_note(NULL, commit->object.sha1, &msgbuf, PAGE_ENCODING,
+                           NOTES_SHOW_HEADER | NOTES_INDENT);
+               strbuf_addch(&msgbuf, '\n');
+               strbuf_ltrim(&msgbuf);
+

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

+
+               /* Create second table row containing msgbuf */

                htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
                        cols);
                htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
                        cols);

-               html_txt(info->msg);
+               html_txt(msgbuf.buf);

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

+               strbuf_release(&msgbuf);

        }
        }

+

        cgit_free_commitinfo(info);
 }
 
        cgit_free_commitinfo(info);
 }
 


@@ -123,36 +153,87 @@ static const char *disambiguate_ref(const char *ref)
        return ref;
 }
 
        return ref;
 }
 

+static char *next_token(char **src)
+{
+       char *result;
+
+       if (!src || !*src)
+               return NULL;
+       while (isspace(**src))
+               (*src)++;
+       if (!**src)
+               return NULL;
+       result = *src;
+       while (**src) {
+               if (isspace(**src)) {
+                       **src = '\0';
+                       (*src)++;
+                       break;
+               }
+               (*src)++;
+       }
+       return result;
+}
+

 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
                    char *path, int pager)
 {
        struct rev_info rev;
        struct commit *commit;
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
                    char *path, int pager)
 {
        struct rev_info rev;
        struct commit *commit;

-       const char *argv[] = {NULL, NULL, NULL, NULL, NULL};
-       int argc = 2;
+       struct vector vec = VECTOR_INIT(char *);

        int i, columns = 3;
        int i, columns = 3;

+       char *arg;
+
+       /* First argv is NULL */
+       vector_push(&vec, NULL, 0);

 
        if (!tip)
                tip = ctx.qry.head;
 
        if (!tip)
                tip = ctx.qry.head;

+       tip = disambiguate_ref(tip);
+       vector_push(&vec, &tip, 0);

 
 

-       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 && *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);
+               }
+               if (!strcmp(grep, "range")) {
+                       /* Split the pattern at whitespace and add each token
+                        * as a revision expression. Do not accept other
+                        * rev-list options. Also, replace the previously
+                        * pushed tip (it's no longer relevant).
+                        */
+                       vec.count--;
+                       while ((arg = next_token(&pattern))) {
+                               if (*arg == '-') {
+                                       fprintf(stderr, "Bad range expr: %s\n",
+                                               arg);
+                                       break;
+                               }
+                               vector_push(&vec, &arg, 0);
+                       }
+               }
+       }

 
        if (path) {
 
        if (path) {

-               argv[argc++] = "--";
-               argv[argc++] = path;
+               arg = "--";
+               vector_push(&vec, &arg, 0);
+               vector_push(&vec, &path, 0);

        }
        }

+
+       /* Make sure the vector is NULL-terminated */
+       vector_push(&vec, NULL, 0);
+       vec.count--;
+

        init_revisions(&rev, NULL);
        rev.abbrev = DEFAULT_ABBREV;
        rev.commit_format = CMIT_FMT_DEFAULT;
        rev.verbose_header = 1;
        rev.show_root_diff = 0;
        init_revisions(&rev, NULL);
        rev.abbrev = DEFAULT_ABBREV;
        rev.commit_format = CMIT_FMT_DEFAULT;
        rev.verbose_header = 1;
        rev.show_root_diff = 0;

-       setup_revisions(argc, argv, &rev, NULL);
-       load_ref_decorations();
+       setup_revisions(vec.count, vec.data, &rev, NULL);
+       load_ref_decorations(DECORATE_FULL_REFS);

        rev.show_decorations = 1;
        rev.grep_filter.regflags |= REG_ICASE;
        compile_grep_patterns(&rev.grep_filter);
        rev.show_decorations = 1;
        rev.grep_filter.regflags |= REG_ICASE;
        compile_grep_patterns(&rev.grep_filter);


@@ -167,7 +248,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                html(" (");
                cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
                              NULL, ctx.qry.head, ctx.qry.sha1,
                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(")");
        }
                              ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
                html(")");
        }


@@ -200,26 +281,25 @@ 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) {

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

                if (ofs > 0) {
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                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,
                                      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'>");
                                      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");
        }
 }
                html("</td></tr>\n");
        }
 }