Always #include corresponding .h in .c files

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 05b5c297bb9885f0421178eb698558a19d959abd..8592843cea8f943552650145deb76450988343dc 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
+#include "ui-log.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)
 
-void count_lines(char *line, int size)
+static void count_lines(char *line, int size)
 {
        if (size <= 0)
                return;
@@ -40,7 +41,7 @@ void count_lines(char *line, int size)
                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;
@@ -76,6 +77,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/")) {
+                       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),
@@ -88,45 +91,37 @@ void show_commit_decorations(struct commit *commit)
                                         sha1_to_hex(commit->object.sha1),
                                         ctx.qry.vpath, 0);
                }
+next:
                deco = deco->next;
        }
 }
 
-void print_commit(struct commit *commit, struct rev_info *revs)
+static void print_commit(struct commit *commit, struct rev_info *revs)
 {
        struct commitinfo *info;
-       char *tmp;
-       int cols = 2;
+       int columns = revs->graph ? 4 : 3;
        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 */
-                       html("<tr class='nohover'><td/><td class='commitgraph'>");
+                       html("<tr class='nohover'><td class='commitgraph'>");
                        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);
-       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 */
@@ -135,6 +130,11 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                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'" : "");
        if (ctx.qry.showmsg) {
@@ -167,22 +167,28 @@ void print_commit(struct commit *commit, struct rev_info *revs)
        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);
-               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("<tr class='nohover'><td/>"); /* Empty 'Age' column */
+               html("<tr class='nohover'>");
 
                if (ctx.qry.showmsg) {
                        /* Concatenate commit message + notes in msgbuf */
@@ -190,9 +196,8 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                                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);
                }
@@ -223,9 +228,11 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                        }
                        html("</td>\n");
                }
+               else
+                       html("<td/>"); /* Empty 'Age' column */
 
                /* 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");
@@ -271,12 +278,12 @@ static char *next_token(char **src)
 }
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
-                   char *path, int pager, int commit_graph)
+                   char *path, int pager, int commit_graph, int commit_sort)
 {
        struct rev_info rev;
        struct commit *commit;
        struct vector vec = VECTOR_INIT(char *);
-       int i, columns = 3;
+       int i, columns = commit_graph ? 4 : 3;
        char *arg;
 
        /* First argv is NULL */
@@ -320,6 +327,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                                        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) {
                arg = "--";
                vector_push(&vec, &arg, 0);
@@ -345,9 +360,11 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        if (pager)
                html("<table class='list nowrap'>");
 
-       html("<tr class='nohover'><th class='left'>Age</th>");
+       html("<tr class='nohover'>");
        if (commit_graph)
                html("<th></th>");
+       else
+               html("<th class='left'>Age</th>");
        html("<th class='left'>Commit message");
        if (pager) {
                html(" (");
@@ -358,13 +375,15 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                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_linecount) {
-                       html("<th class='left'>Lines</th>");
-                       columns++;
-               }
+       }
+       if (ctx.repo->enable_log_linecount) {
+               html("<th class='left'>Lines</th>");
+               columns++;
        }
        html("</tr>\n");
 
@@ -378,6 +397,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                commit->parents = NULL;
        }
 
+       init_display_notes(NULL);
        for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
                print_commit(commit, &rev);
                free(commit->buffer);
@@ -386,23 +406,26 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                commit->parents = NULL;
        }
        if (pager) {
-               html("</table><div class='pager'>");
+               html("</table><ul class='pager'>");
                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);
-                       html("&nbsp;");
+                       html("</li>");
                }
                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);
+                       html("</li>");
                }
-               html("</div>");
+               html("</ul>");
        } 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");