scan-tree.c: Remove unused macro

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index aaffb4ef279e17cac4a4bedaab16e55a22ad6b3a..6f1249bdea1b33185a6f27ac3fefdbe8402c9fea 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "ui-log.h"

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


@@ -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,6 +95,7 @@ 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)
 }
 
 static void print_commit(struct commit *commit, struct rev_info *revs)


@@ -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);
                }


@@ -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;
 }
 


@@ -284,24 +290,26 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        struct commit *commit;
        struct vector vec = VECTOR_INIT(char *);
        int i, columns = commit_graph ? 4 : 3;
        struct commit *commit;
        struct vector vec = VECTOR_INIT(char *);
        int i, columns = commit_graph ? 4 : 3;

-       char *arg;
+       int must_free_tip = 0;
+       struct strbuf argbuf = STRBUF_INIT;

 
        /* First argv is NULL */
        vector_push(&vec, NULL, 0);
 
        if (!tip)
                tip = ctx.qry.head;
 
        /* First argv is NULL */
        vector_push(&vec, NULL, 0);
 
        if (!tip)
                tip = ctx.qry.head;

-       tip = disambiguate_ref(tip);
+       tip = disambiguate_ref(tip, &must_free_tip);

        vector_push(&vec, &tip, 0);
 
        if (grep && pattern && *pattern) {
                pattern = xstrdup(pattern);
                if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
                    !strcmp(grep, "committer")) {
        vector_push(&vec, &tip, 0);
 
        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);
+                       strbuf_addf(&argbuf, "--%s=%s", grep, pattern);
+                       vector_push(&vec, &argbuf.buf, 0);

                }
                if (!strcmp(grep, "range")) {
                }
                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
                        /* Split the pattern at whitespace and add each token
                         * as a revision expression. Do not accept other
                         * rev-list options. Also, replace the previously


@@ -336,8 +344,8 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        }
 
        if (path) {
        }
 
        if (path) {

-               arg = "--";
-               vector_push(&vec, &arg, 0);
+               static const char *double_dash_arg = "--";
+               vector_push(&vec, &double_dash_arg, 0);

                vector_push(&vec, &path, 0);
        }
 
                vector_push(&vec, &path, 0);
        }
 


@@ -429,4 +437,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                              ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg);
                html("</td></tr>\n");
        }
                              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);
+       strbuf_release(&argbuf);

 }
 }