Free reflists after usage

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 4a295bd4a484bb86ba3373a07a62f3b2ed4b1d35..857c05c01f7a7ac26dd79078f9710ef7019ace7f 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -28,7 +28,7 @@ static const char *column_colors_html[] = {
 
 #define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
 
 
 #define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1)
 

-void count_lines(char *line, int size)
+static void count_lines(char *line, int size)

 {
        if (size <= 0)
                return;
 {
        if (size <= 0)
                return;


@@ -40,7 +40,7 @@ void count_lines(char *line, int size)
                rem_lines++;
 }
 
                rem_lines++;
 }
 

-void inspect_files(struct diff_filepair *pair)
+static void inspect_files(struct diff_filepair *pair)

 {
        unsigned long old_size = 0;
        unsigned long new_size = 0;
 {
        unsigned long old_size = 0;
        unsigned long new_size = 0;


@@ -76,6 +76,8 @@ void show_commit_decorations(struct commit *commit)
                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                }
                else if (!prefixcmp(deco->name, "refs/remotes/")) {
                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                }
                else if (!prefixcmp(deco->name, "refs/remotes/")) {

+                       if (!ctx.repo->enable_remote_branches)
+                               goto next;

                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                        cgit_log_link(buf, NULL, "remote-deco", NULL,
                                      sha1_to_hex(commit->object.sha1),
                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                        cgit_log_link(buf, NULL, "remote-deco", NULL,
                                      sha1_to_hex(commit->object.sha1),


@@ -88,11 +90,12 @@ void show_commit_decorations(struct commit *commit)
                                         sha1_to_hex(commit->object.sha1),
                                         ctx.qry.vpath, 0);
                }
                                         sha1_to_hex(commit->object.sha1),
                                         ctx.qry.vpath, 0);
                }

+next:

                deco = deco->next;
        }
 }
 
                deco = deco->next;
        }
 }
 

-void print_commit(struct commit *commit, struct rev_info *revs)
+static void print_commit(struct commit *commit, struct rev_info *revs)

 {
        struct commitinfo *info;
        int cols = revs->graph ? 3 : 2;
 {
        struct commitinfo *info;
        int cols = revs->graph ? 3 : 2;


@@ -275,7 +278,7 @@ 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)
+                   char *path, int pager, int commit_graph, int commit_sort)

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


@@ -324,6 +327,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                                        COLUMN_COLORS_HTML_MAX);
        }
 
                                        COLUMN_COLORS_HTML_MAX);
        }
 

+       if (commit_sort == 1) {
+               static const char *date_order_arg = "--date-order";
+               vector_push(&vec, &date_order_arg, 0);
+       } else if (commit_sort == 2) {
+               static const char *topo_order_arg = "--topo-order";
+               vector_push(&vec, &topo_order_arg, 0);
+       }
+

        if (path) {
                arg = "--";
                vector_push(&vec, &arg, 0);
        if (path) {
                arg = "--";
                vector_push(&vec, &arg, 0);