ui-log.c: Several simplifications

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 857c05c01f7a7ac26dd79078f9710ef7019ace7f..c154f69224314dac9a3415cb21d793b2a1dcf0d3 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -7,9 +7,10 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "ui-log.h"

 #include "html.h"
 #include "ui-shared.h"
 #include "html.h"
 #include "ui-shared.h"

-#include "vector.h"
+#include "argv-array.h"

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


@@ -60,6 +61,7 @@ void show_commit_decorations(struct commit *commit)
 
        buf[sizeof(buf) - 1] = 0;
        deco = lookup_decoration(&name_decoration, &commit->object);
 
        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);
        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;
        }
 next:
                deco = deco->next;
        }

+       html("</span>");

 }
 
 static void print_commit(struct commit *commit, struct rev_info *revs)
 {
        struct commitinfo *info;
 }
 
 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)
        struct strbuf graphbuf = STRBUF_INIT;
        struct strbuf msgbuf = STRBUF_INIT;
 
        if (ctx.repo->enable_log_filecount)

-               cols++;
+               columns++;

        if (ctx.repo->enable_log_linecount)
        if (ctx.repo->enable_log_linecount)

-               cols++;
+               columns++;

 
        if (revs->graph) {
                /* Advance graph until current commit */
 
        if (revs->graph) {
                /* Advance graph until current commit */


@@ -113,7 +116,7 @@ static 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);
                        /* 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 */
                        strbuf_setlen(&graphbuf, 0);
                }
                /* Current commit's graph segment is now ready in graphbuf */


@@ -195,9 +198,8 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
                                strbuf_addstr(&msgbuf, info->msg);
                                strbuf_addch(&msgbuf, '\n');
                        }
                                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);
                }
                        strbuf_addch(&msgbuf, '\n');
                        strbuf_ltrim(&msgbuf);
                }


@@ -232,7 +234,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
                        html("<td/>"); /* Empty 'Age' column */
 
                /* Print msgbuf into remainder of table row */
                        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");
                        ctx.qry.showmsg ? " class='logmsg'" : "");
                html_txt(msgbuf.buf);
                html("</td></tr>\n");


@@ -243,15 +245,19 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
        cgit_free_commitinfo(info);
 }
 
        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];
 {
        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;
 }
 
        return ref;
 }
 


@@ -282,75 +288,64 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 {
        struct rev_info rev;
        struct commit *commit;
 {
        struct rev_info rev;
        struct commit *commit;

-       struct vector vec = VECTOR_INIT(char *);
-       int i, columns = 3;
-       char *arg;
+       struct argv_array rev_argv = ARGV_ARRAY_INIT;
+       int i, columns = commit_graph ? 4 : 3;
+       int must_free_tip = 0;

 
 

-       /* First argv is NULL */
-       vector_push(&vec, NULL, 0);
+       /* rev_argv.argv[0] will be ignored by setup_revisions */
+       argv_array_push(&rev_argv, "log_rev_setup");

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

-       tip = disambiguate_ref(tip);
-       vector_push(&vec, &tip, 0);
+       tip = disambiguate_ref(tip, &must_free_tip);
+       argv_array_push(&rev_argv, tip);

 
        if (grep && pattern && *pattern) {
                pattern = xstrdup(pattern);
                if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
                    !strcmp(grep, "committer")) {
 
        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")) {
+                       argv_array_pushf(&rev_argv, "--%s=%s", grep, pattern);
+               } else 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
                         * pushed tip (it's no longer relevant).
                         */
                        /* 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--;
+                       argv_array_pop(&rev_argv);

                        while ((arg = next_token(&pattern))) {
                                if (*arg == '-') {
                                        fprintf(stderr, "Bad range expr: %s\n",
                                                arg);
                                        break;
                                }
                        while ((arg = next_token(&pattern))) {
                                if (*arg == '-') {
                                        fprintf(stderr, "Bad range expr: %s\n",
                                                arg);
                                        break;
                                }

-                               vector_push(&vec, &arg, 0);
+                               argv_array_push(&rev_argv, arg);

                        }
                }
        }
        if (commit_graph) {
                        }
                }
        }
        if (commit_graph) {

-               static const char *graph_arg = "--graph";
-               static const char *color_arg = "--color";
-               vector_push(&vec, &graph_arg, 0);
-               vector_push(&vec, &color_arg, 0);
+               argv_array_push(&rev_argv, "--graph");
+               argv_array_push(&rev_argv, "--color");

                graph_set_column_colors(column_colors_html,
                                        COLUMN_COLORS_HTML_MAX);
        }
 
                graph_set_column_colors(column_colors_html,
                                        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 (commit_sort == 1)
+               argv_array_push(&rev_argv, "--date-order");
+       else if (commit_sort == 2)
+               argv_array_push(&rev_argv, "--topo-order");

 
        if (path) {
 
        if (path) {

-               arg = "--";
-               vector_push(&vec, &arg, 0);
-               vector_push(&vec, &path, 0);
+               argv_array_push(&rev_argv, "--");
+               argv_array_push(&rev_argv, path);

        }
 
        }
 

-       /* 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(vec.count, vec.data, &rev, NULL);
+       setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);

        load_ref_decorations(DECORATE_FULL_REFS);
        rev.show_decorations = 1;
        rev.grep_filter.regflags |= REG_ICASE;
        load_ref_decorations(DECORATE_FULL_REFS);
        rev.show_decorations = 1;
        rev.grep_filter.regflags |= REG_ICASE;


@@ -405,25 +400,32 @@ 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) {

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

                if (ofs > 0) {
                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);
                        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) {
                }
                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);
                        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) {
        } 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");
        }
                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);

 }
 }