ui-shared: make a char* parameter const

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index d6d94f658391e57cdc11da36c7a0f7902d8716e1..2d2bb31f0e96975f54da6f04ff84dde81ecba9da 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -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);
 }


@@ -150,9 +150,9 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
        rem_lines = 0;
 
        DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
        rem_lines = 0;
 
        DIFF_OPT_SET(&revs->diffopt, RECURSIVE);

-       diff_tree_sha1(parent->tree->object.oid.hash,
-                      commit->tree->object.oid.hash,
-                      "", &revs->diffopt);
+       diff_tree_oid(&parent->tree->object.oid,
+                     &commit->tree->object.oid,
+                     "", &revs->diffopt);

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


@@ -258,12 +258,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 */


@@ -271,7 +273,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.oid.hash,
+                       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);


@@ -324,7 +326,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);
        }


@@ -434,7 +436,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
        load_ref_decorations(DECORATE_FULL_REFS);
        rev.show_decorations = 1;
        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;
+       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;