ui-shared: remove unused parameter

[cgit.git] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index a31ff7c7df52c6de69cb21f66acbcc1b83ad3ee7..b5cd2f61d3305f15f4201e8faa4bca1b93b4864c 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -65,6 +65,8 @@ void show_commit_decorations(struct commit *commit)
                return;
        html("<span class='decoration'>");
        while (deco) {
+               struct object_id peeled;
+               int is_annotated = 0;
                strncpy(buf, prettify_refname(deco->name), sizeof(buf) - 1);
                switch(deco->type) {
                case DECORATION_NONE:
@@ -77,7 +79,9 @@ void show_commit_decorations(struct commit *commit)
                                ctx.qry.showmsg, 0);
                        break;
                case DECORATION_REF_TAG:
-                       cgit_tag_link(buf, NULL, "tag-deco", buf);
+                       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)
@@ -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;
-       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)
@@ -149,10 +152,10 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
        add_lines = 0;
        rem_lines = 0;
 
-       DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
-       diff_tree_sha1(parent->tree->object.oid.hash,
-                      commit->tree->object.oid.hash,
-                      "", &revs->diffopt);
+       revs->diffopt.flags.recursive = 1;
+       diff_tree_oid(&parent->tree->object.oid,
+                     &commit->tree->object.oid,
+                     "", &revs->diffopt);
        diffcore_std(&revs->diffopt);
 
        found = !diff_queue_is_empty();
@@ -263,8 +266,9 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
 
        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 */
@@ -272,7 +276,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
                                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);
@@ -325,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);
-       if (get_sha1(longref.buf, oid.hash) == 0) {
+       if (get_oid(longref.buf, &oid) == 0) {
                *must_free_result = 1;
                return strbuf_detach(&longref, NULL);
        }
@@ -433,9 +437,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        rev.ignore_missing = 1;
        rev.simplify_history = 1;
        setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
-       load_ref_decorations(DECORATE_FULL_REFS);
+       load_ref_decorations(NULL, 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;