git: update to v2.38.1

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 8e36fba9f811c13fb90ec9879f26bf3a4b33800e..565929f3f046daaf8db1c89fc3d6928c23119ad0 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;
 


@@ -65,7 +65,10 @@ void show_commit_decorations(struct commit *commit)
                return;
        html("<span class='decoration'>");
        while (deco) {
                return;
        html("<span class='decoration'>");
        while (deco) {

-               strncpy(buf, prettify_refname(deco->name), sizeof(buf) - 1);
+               struct object_id oid_tag, 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,
                switch(deco->type) {
                case DECORATION_NONE:
                        /* If the git-core doesn't recognize it,


@@ -77,7 +80,9 @@ void show_commit_decorations(struct commit *commit)
                                ctx.qry.showmsg, 0);
                        break;
                case DECORATION_REF_TAG:
                                ctx.qry.showmsg, 0);
                        break;
                case DECORATION_REF_TAG:

-                       cgit_tag_link(buf, NULL, "tag-deco", buf);
+                       if (!read_ref(deco->name, &oid_tag) && !peel_iterated_oid(&oid_tag, &peeled))
+                               is_annotated = !oideq(&oid_tag, &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)
                        break;
                case DECORATION_REF_REMOTE:
                        if (!ctx.repo->enable_remote_branches)


@@ -149,12 +154,12 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
        rem_lines = 0;
 
        revs->diffopt.flags.recursive = 1;
        rem_lines = 0;
 
        revs->diffopt.flags.recursive = 1;

-       diff_tree_oid(&parent->tree->object.oid,
-                     &commit->tree->object.oid,
+       diff_tree_oid(get_commit_tree_oid(parent),
+                     get_commit_tree_oid(commit),

                      "", &revs->diffopt);
        diffcore_std(&revs->diffopt);
 
                      "", &revs->diffopt);
        diffcore_std(&revs->diffopt);
 

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

        saved_fmt = revs->diffopt.output_format;
        revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
        revs->diffopt.format_callback = cgit_diff_tree_cb;
        saved_fmt = revs->diffopt.output_format;
        revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
        revs->diffopt.format_callback = cgit_diff_tree_cb;


@@ -230,7 +235,7 @@ 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,


@@ -358,27 +363,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


@@ -386,14 +391,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);

                        }
                }
        }
                        }
                }
        }


@@ -408,22 +413,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;


@@ -432,7 +437,7 @@ 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);
+       setup_revisions(rev_argv.nr, rev_argv.v, &rev, NULL);

        load_ref_decorations(NULL, DECORATE_FULL_REFS);
        rev.show_decorations = 1;
        rev.grep_filter.ignore_case = 1;
        load_ref_decorations(NULL, DECORATE_FULL_REFS);
        rev.show_decorations = 1;
        rev.grep_filter.ignore_case = 1;


@@ -459,7 +464,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);


@@ -484,7 +489,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;
        }


@@ -506,7 +511,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;
        }


@@ -515,7 +520,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);


@@ -524,7 +529,7 @@ 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);
                                      ofs + cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg,
                                      ctx.qry.follow);