tests: try with commit-graph

[cgit.git] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 6bff94807886c39e5e15ec58e66f67a81b50187b..6914f75e65e4cc2a313b690cab485b93b0ad3b4d 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -10,7 +10,7 @@
 #include "ui-log.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-log.h"
 #include "html.h"
 #include "ui-shared.h"

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

 
 static int files, add_lines, rem_lines, lines_counted;
 
 
 static int files, add_lines, rem_lines, lines_counted;
 


@@ -49,7 +49,7 @@ static void inspect_files(struct diff_filepair *pair)
 
        files++;
        if (ctx.repo->enable_log_linecount)
 
        files++;
        if (ctx.repo->enable_log_linecount)

-               cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
+               cgit_diff_files(&pair->one->oid, &pair->two->oid, &old_size,

                                &new_size, &binary, 0, ctx.qry.ignorews,
                                count_lines);
 }
                                &new_size, &binary, 0, ctx.qry.ignorews,
                                count_lines);
 }


@@ -61,38 +61,42 @@ void show_commit_decorations(struct commit *commit)
 
        buf[sizeof(buf) - 1] = 0;
        deco = get_name_decoration(&commit->object);
 
        buf[sizeof(buf) - 1] = 0;
        deco = get_name_decoration(&commit->object);

+       if (!deco)
+               return;

        html("<span class='decoration'>");
        while (deco) {
        html("<span class='decoration'>");
        while (deco) {

-               if (starts_with(deco->name, "refs/heads/")) {
-                       strncpy(buf, deco->name + 11, sizeof(buf) - 1);
+               struct object_id peeled;
+               int is_annotated = 0;
+               strlcpy(buf, prettify_refname(deco->name), sizeof(buf));
+               switch(deco->type) {
+               case DECORATION_NONE:
+                       /* If the git-core doesn't recognize it,
+                        * don't display anything. */
+                       break;
+               case DECORATION_REF_LOCAL:

                        cgit_log_link(buf, NULL, "branch-deco", buf, NULL,
                        cgit_log_link(buf, NULL, "branch-deco", buf, NULL,

-                                     ctx.qry.vpath, 0, NULL, NULL,
-                                     ctx.qry.showmsg, 0);
-               }
-               else if (starts_with(deco->name, "tag: refs/tags/")) {
-                       strncpy(buf, deco->name + 15, sizeof(buf) - 1);
-                       cgit_tag_link(buf, NULL, "tag-deco", buf);
-               }
-               else if (starts_with(deco->name, "refs/tags/")) {
-                       strncpy(buf, deco->name + 10, sizeof(buf) - 1);
-                       cgit_tag_link(buf, NULL, "tag-deco", buf);
-               }
-               else if (starts_with(deco->name, "refs/remotes/")) {
+                               ctx.qry.vpath, 0, NULL, NULL,
+                               ctx.qry.showmsg, 0);
+                       break;
+               case DECORATION_REF_TAG:
+                       if (!peel_ref(deco->name, &peeled))
+                               is_annotated = !oidcmp(&commit->object.oid, &peeled);
+                       cgit_tag_link(buf, NULL, is_annotated ? "tag-annotated-deco" : "tag-deco", buf);
+                       break;
+               case DECORATION_REF_REMOTE:

                        if (!ctx.repo->enable_remote_branches)
                        if (!ctx.repo->enable_remote_branches)

-                               goto next;
-                       strncpy(buf, deco->name + 13, sizeof(buf) - 1);
+                               break;

                        cgit_log_link(buf, NULL, "remote-deco", NULL,
                        cgit_log_link(buf, NULL, "remote-deco", NULL,

-                                     sha1_to_hex(commit->object.sha1),
-                                     ctx.qry.vpath, 0, NULL, NULL,
-                                     ctx.qry.showmsg, 0);
-               }
-               else {
-                       strncpy(buf, deco->name, sizeof(buf) - 1);
+                               oid_to_hex(&commit->object.oid),
+                               ctx.qry.vpath, 0, NULL, NULL,
+                               ctx.qry.showmsg, 0);
+                       break;
+               default:

                        cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
                        cgit_commit_link(buf, NULL, "deco", ctx.qry.head,

-                                        sha1_to_hex(commit->object.sha1),
-                                        ctx.qry.vpath);
+                                       oid_to_hex(&commit->object.oid),
+                                       ctx.qry.vpath);
+                       break;

                }
                }

-next:

                deco = deco->next;
        }
        html("</span>");
                deco = deco->next;
        }
        html("</span>");


@@ -119,8 +123,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
        struct commit_list *parents = commit->parents;
        struct commit *parent;
        int found = 0, saved_fmt;
        struct commit_list *parents = commit->parents;
        struct commit *parent;
        int found = 0, saved_fmt;

-       unsigned saved_flags = revs->diffopt.flags;
-
+       struct diff_flags saved_flags = revs->diffopt.flags;

 
        /* Always show if we're not in "follow" mode with a single file. */
        if (!ctx.qry.follow)
 
        /* Always show if we're not in "follow" mode with a single file. */
        if (!ctx.qry.follow)


@@ -141,16 +144,18 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
 
        /* When we get here we have precisely one parent. */
        parent = parents->item;
 
        /* When we get here we have precisely one parent. */
        parent = parents->item;

-       parse_commit(parent);
+       /* If we can't parse the commit, let print_commit() report an error. */
+       if (parse_commit(parent))
+               return 1;

 
        files = 0;
        add_lines = 0;
        rem_lines = 0;
 
 
        files = 0;
        add_lines = 0;
        rem_lines = 0;
 

-       DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
-       diff_tree_sha1(parent->tree->object.sha1,
-                      commit->tree->object.sha1,
-                      "", &revs->diffopt);
+       revs->diffopt.flags.recursive = 1;
+       diff_tree_oid(get_commit_tree_oid(parent),
+                     get_commit_tree_oid(commit),
+                     "", &revs->diffopt);

        diffcore_std(&revs->diffopt);
 
        found = !diff_queue_is_empty();
        diffcore_std(&revs->diffopt);
 
        found = !diff_queue_is_empty();


@@ -202,7 +207,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
        }
        else {
                html("<td>");
        }
        else {
                html("<td>");

-               cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
+               cgit_print_age(info->committer_date, info->committer_tz, TM_WEEK * 2);

                html("</td>");
        }
 
                html("</td>");
        }
 


@@ -229,11 +234,11 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
                        strbuf_add(&msgbuf, "\n\n", 2);
 
                        /* Place wrap_symbol at position i in info->subject */
                        strbuf_add(&msgbuf, "\n\n", 2);
 
                        /* Place wrap_symbol at position i in info->subject */

-                       strcpy(info->subject + i, wrap_symbol);
+                       strlcpy(info->subject + i, wrap_symbol, subject_len - i + 1);

                }
        }
        cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                }
        }
        cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,

-                        sha1_to_hex(commit->object.sha1), ctx.qry.vpath);
+                        oid_to_hex(&commit->object.oid), ctx.qry.vpath);

        show_commit_decorations(commit);
        html("</td><td>");
        cgit_open_filter(ctx.repo->email_filter, info->author_email, "log");
        show_commit_decorations(commit);
        html("</td><td>");
        cgit_open_filter(ctx.repo->email_filter, info->author_email, "log");


@@ -242,7 +247,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
 
        if (revs->graph) {
                html("</td><td>");
 
        if (revs->graph) {
                html("</td><td>");

-               cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
+               cgit_print_age(info->committer_date, info->committer_tz, TM_WEEK * 2);

        }
 
        if (!lines_counted && (ctx.repo->enable_log_filecount ||
        }
 
        if (!lines_counted && (ctx.repo->enable_log_filecount ||


@@ -256,12 +261,14 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
        if (ctx.repo->enable_log_filecount)
                htmlf("</td><td>%d", files);
        if (ctx.repo->enable_log_linecount)
        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);
+               htmlf("</td><td><span class='deletions'>-%d</span>/"
+                       "<span class='insertions'>+%d</span>", rem_lines, add_lines);

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

-       if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
-               html("<tr class='nohover'>");
+       if ((revs->graph && !graph_is_commit_finished(revs->graph))
+                       || ctx.qry.showmsg) { /* Print a second table row */
+               html("<tr class='nohover-highlight'>");

 
                if (ctx.qry.showmsg) {
                        /* Concatenate commit message + notes in msgbuf */
 
                if (ctx.qry.showmsg) {
                        /* Concatenate commit message + notes in msgbuf */


@@ -269,7 +276,7 @@ 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_display_notes(commit->object.sha1,
+                       format_display_notes(&commit->object.oid,

                                             &msgbuf, PAGE_ENCODING, 0);
                        strbuf_addch(&msgbuf, '\n');
                        strbuf_ltrim(&msgbuf);
                                             &msgbuf, PAGE_ENCODING, 0);
                        strbuf_addch(&msgbuf, '\n');
                        strbuf_ltrim(&msgbuf);


@@ -322,7 +329,7 @@ static const char *disambiguate_ref(const char *ref, int *must_free_result)
        struct strbuf longref = STRBUF_INIT;
 
        strbuf_addf(&longref, "refs/heads/%s", ref);
        struct strbuf longref = STRBUF_INIT;
 
        strbuf_addf(&longref, "refs/heads/%s", ref);

-       if (get_sha1(longref.buf, oid.hash) == 0) {
+       if (get_oid(longref.buf, &oid) == 0) {

                *must_free_result = 1;
                return strbuf_detach(&longref, NULL);
        }
                *must_free_result = 1;
                return strbuf_detach(&longref, NULL);
        }


@@ -355,27 +362,27 @@ static char *next_token(char **src)
 }
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
 }
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,

-                   char *path, int pager, int commit_graph, int commit_sort)
+                   const char *path, int pager, int commit_graph, int commit_sort)

 {
        struct rev_info rev;
        struct commit *commit;
 {
        struct rev_info rev;
        struct commit *commit;

-       struct argv_array rev_argv = ARGV_ARRAY_INIT;
+       struct strvec rev_argv = STRVEC_INIT;

        int i, columns = commit_graph ? 4 : 3;
        int must_free_tip = 0;
 
        /* rev_argv.argv[0] will be ignored by setup_revisions */
        int i, columns = commit_graph ? 4 : 3;
        int must_free_tip = 0;
 
        /* rev_argv.argv[0] will be ignored by setup_revisions */

-       argv_array_push(&rev_argv, "log_rev_setup");
+       strvec_push(&rev_argv, "log_rev_setup");

 
        if (!tip)
                tip = ctx.qry.head;
        tip = disambiguate_ref(tip, &must_free_tip);
 
        if (!tip)
                tip = ctx.qry.head;
        tip = disambiguate_ref(tip, &must_free_tip);

-       argv_array_push(&rev_argv, tip);
+       strvec_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")) {

-                       argv_array_pushf(&rev_argv, "--%s=%s", grep, pattern);
+                       strvec_pushf(&rev_argv, "--%s=%s", grep, pattern);

                } else if (!strcmp(grep, "range")) {
                        char *arg;
                        /* Split the pattern at whitespace and add each token
                } else if (!strcmp(grep, "range")) {
                        char *arg;
                        /* Split the pattern at whitespace and add each token


@@ -383,14 +390,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                         * rev-list options. Also, replace the previously
                         * pushed tip (it's no longer relevant).
                         */
                         * rev-list options. Also, replace the previously
                         * pushed tip (it's no longer relevant).
                         */

-                       argv_array_pop(&rev_argv);
+                       strvec_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;
                                }

-                               argv_array_push(&rev_argv, arg);
+                               strvec_push(&rev_argv, arg);

                        }
                }
        }
                        }
                }
        }


@@ -405,22 +412,22 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        }
 
        if (commit_graph && !ctx.qry.follow) {
        }
 
        if (commit_graph && !ctx.qry.follow) {

-               argv_array_push(&rev_argv, "--graph");
-               argv_array_push(&rev_argv, "--color");
+               strvec_push(&rev_argv, "--graph");
+               strvec_push(&rev_argv, "--color");

                graph_set_column_colors(column_colors_html,
                                        COLUMN_COLORS_HTML_MAX);
        }
 
        if (commit_sort == 1)
                graph_set_column_colors(column_colors_html,
                                        COLUMN_COLORS_HTML_MAX);
        }
 
        if (commit_sort == 1)

-               argv_array_push(&rev_argv, "--date-order");
+               strvec_push(&rev_argv, "--date-order");

        else if (commit_sort == 2)
        else if (commit_sort == 2)

-               argv_array_push(&rev_argv, "--topo-order");
+               strvec_push(&rev_argv, "--topo-order");

 
        if (path && ctx.qry.follow)
 
        if (path && ctx.qry.follow)

-               argv_array_push(&rev_argv, "--follow");
-       argv_array_push(&rev_argv, "--");
+               strvec_push(&rev_argv, "--follow");
+       strvec_push(&rev_argv, "--");

        if (path)
        if (path)

-               argv_array_push(&rev_argv, path);
+               strvec_push(&rev_argv, path);

 
        init_revisions(&rev, NULL);
        rev.abbrev = DEFAULT_ABBREV;
 
        init_revisions(&rev, NULL);
        rev.abbrev = DEFAULT_ABBREV;


@@ -429,10 +436,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        rev.show_root_diff = 0;
        rev.ignore_missing = 1;
        rev.simplify_history = 1;
        rev.show_root_diff = 0;
        rev.ignore_missing = 1;
        rev.simplify_history = 1;

-       setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
-       load_ref_decorations(DECORATE_FULL_REFS);
+       setup_revisions(rev_argv.nr, rev_argv.v, &rev, NULL);
+       load_ref_decorations(NULL, DECORATE_FULL_REFS);

        rev.show_decorations = 1;
        rev.show_decorations = 1;

-       rev.grep_filter.regflags |= REG_ICASE;
+       rev.grep_filter.ignore_case = 1;

 
        rev.diffopt.detect_rename = 1;
        rev.diffopt.rename_limit = ctx.cfg.renamelimit;
 
        rev.diffopt.detect_rename = 1;
        rev.diffopt.rename_limit = ctx.cfg.renamelimit;


@@ -442,8 +449,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        compile_grep_patterns(&rev.grep_filter);
        prepare_revision_walk(&rev);
 
        compile_grep_patterns(&rev.grep_filter);
        prepare_revision_walk(&rev);
 

-       if (pager)
+       if (pager) {
+               cgit_print_layout_start();

                html("<table class='list nowrap'>");
                html("<table class='list nowrap'>");

+       }

 
        html("<tr class='nohover'>");
        if (commit_graph)
 
        html("<tr class='nohover'>");
        if (commit_graph)


@@ -454,7 +463,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        if (pager) {
                html(" (");
                cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
        if (pager) {
                html(" (");
                cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,

-                             NULL, ctx.qry.head, ctx.qry.sha1,
+                             NULL, ctx.qry.head, ctx.qry.oid,

                              ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
                              ctx.qry.search, ctx.qry.showmsg ? 0 : 1,
                              ctx.qry.follow);
                              ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
                              ctx.qry.search, ctx.qry.showmsg ? 0 : 1,
                              ctx.qry.follow);


@@ -479,7 +488,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) {
                if (show_commit(commit, &rev))
                        i++;
        for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) {
                if (show_commit(commit, &rev))
                        i++;

-               free_commit_buffer(commit);
+               free_commit_buffer(the_repository->parsed_objects, commit);

                free_commit_list(commit->parents);
                commit->parents = NULL;
        }
                free_commit_list(commit->parents);
                commit->parents = NULL;
        }


@@ -501,7 +510,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                        i++;
                        print_commit(commit, &rev);
                }
                        i++;
                        print_commit(commit, &rev);
                }

-               free_commit_buffer(commit);
+               free_commit_buffer(the_repository->parsed_objects, commit);

                free_commit_list(commit->parents);
                commit->parents = NULL;
        }
                free_commit_list(commit->parents);
                commit->parents = NULL;
        }


@@ -510,7 +519,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                if (ofs > 0) {
                        html("<li>");
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                if (ofs > 0) {
                        html("<li>");
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,

-                                     ctx.qry.sha1, ctx.qry.vpath,
+                                     ctx.qry.oid, ctx.qry.vpath,

                                      ofs - cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg,
                                      ctx.qry.follow);
                                      ofs - cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg,
                                      ctx.qry.follow);


@@ -519,13 +528,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                if ((commit = get_revision(&rev)) != NULL) {
                        html("<li>");
                        cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
                if ((commit = get_revision(&rev)) != NULL) {
                        html("<li>");
                        cgit_log_link("[next]", NULL, NULL, ctx.qry.head,

-                                     ctx.qry.sha1, ctx.qry.vpath,
+                                     ctx.qry.oid, ctx.qry.vpath,

                                      ofs + cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg,
                                      ctx.qry.follow);
                        html("</li>");
                }
                html("</ul>");
                                      ofs + cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg,
                                      ctx.qry.follow);
                        html("</li>");
                }
                html("</ul>");

+               cgit_print_layout_end();

        } else if ((commit = get_revision(&rev)) != NULL) {
                htmlf("<tr class='nohover'><td colspan='%d'>", columns);
                cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
        } else if ((commit = get_revision(&rev)) != NULL) {
                htmlf("<tr class='nohover'><td colspan='%d'>", columns);
                cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,