cache.c: cache ls_cache output properly

[cgit.git] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 6b12ca2acb845951be734a964725962f4e67cb93..6f1249bdea1b33185a6f27ac3fefdbe8402c9fea 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;
@@ -60,6 +61,7 @@ void show_commit_decorations(struct commit *commit)
 
        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);
@@ -93,19 +95,20 @@ void show_commit_decorations(struct commit *commit)
 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;
-       int cols = revs->graph ? 3 : 2;
+       int columns = revs->graph ? 4 : 3;
        struct strbuf graphbuf = STRBUF_INIT;
        struct strbuf msgbuf = STRBUF_INIT;
 
        if (ctx.repo->enable_log_filecount)
-               cols++;
+               columns++;
        if (ctx.repo->enable_log_linecount)
-               cols++;
+               columns++;
 
        if (revs->graph) {
                /* Advance graph until current commit */
@@ -113,7 +116,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                        /* Print graph segment in otherwise empty table row */
                        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 */
@@ -195,9 +198,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);
                }
@@ -232,7 +234,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                        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");
@@ -243,15 +245,19 @@ void print_commit(struct commit *commit, struct rev_info *revs)
        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];
-       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;
 }
 
@@ -278,30 +284,32 @@ 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;
-       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;
-       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")) {
-                       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")) {
+                       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
@@ -327,9 +335,17 @@ 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);
+               static const char *double_dash_arg = "--";
+               vector_push(&vec, &double_dash_arg, 0);
                vector_push(&vec, &path, 0);
        }
 
@@ -397,25 +413,33 @@ 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");
        }
+
+       /* If we allocated tip then it is safe to cast away const. */
+       if (must_free_tip)
+               free((char*) tip);
+       strbuf_release(&argbuf);
 }