Merge branch 'js/notes'

[cgit.git] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index c3757dd0131d75c2764dc0a0931a57085b7fc8b5..7f38d2acb41dc9fe451c3ba9f133eb81794b71d9 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -26,9 +26,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 +47,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 +86,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);


@@ -98,6 +111,9 @@ void print_commit(struct commit *commit)
        }
        html("</td></tr>\n");
        if (ctx.qry.showmsg) {
        }
        html("</td></tr>\n");
        if (ctx.qry.showmsg) {

+               struct strbuf notes = STRBUF_INIT;
+               get_commit_notes(commit, &notes, PAGE_ENCODING, 0);
+

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


@@ -107,6 +123,15 @@ void print_commit(struct commit *commit)
                        cols);
                html_txt(info->msg);
                html("</td></tr>\n");
                        cols);
                html_txt(info->msg);
                html("</td></tr>\n");

+               if (notes.len != 0) {
+                       html("<tr class='nohover'>");
+                       html("<td class='lognotes-label'>Notes:</td>");
+                       htmlf("<td colspan='%d' class='lognotes'>",
+                               cols);
+                       html_txt(notes.buf);
+                       html("</td></tr>\n");
+               }
+               strbuf_release(&notes);

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


@@ -137,10 +162,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 
        argv[1] = disambiguate_ref(tip);
 
 
        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++] = "--";
 
        if (path) {
                argv[argc++] = "--";


@@ -152,7 +180,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        rev.verbose_header = 1;
        rev.show_root_diff = 0;
        setup_revisions(argc, argv, &rev, NULL);
        rev.verbose_header = 1;
        rev.show_root_diff = 0;
        setup_revisions(argc, argv, &rev, NULL);

-       load_ref_decorations();
+       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);


@@ -165,8 +193,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
              "<th class='left'>Commit message");
        if (pager) {
                html(" (");
              "<th class='left'>Commit message");
        if (pager) {
                html(" (");

-               cgit_log_link("toggle", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-                             ctx.qry.path, ctx.qry.ofs, ctx.qry.grep,
+               cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
+                             NULL, ctx.qry.head, ctx.qry.sha1,
+                             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(")");
        }


@@ -203,22 +232,22 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                     columns);
                if (ofs > 0) {
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                     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,
                                      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");
        }
 }