ui-refs.c: Refactor print_tag()

[ps-cgit] / ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index d61ee7c8d150d1adf5da535148bf9a1114f1440a..74064789ecdd281bd411472b20730501d1c52182 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -7,11 +7,10 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "ui-refs.h"

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

-static int header;
-

 static int cmp_age(int age1, int age2)
 {
        if (age1 != 0 && age2 != 0)
 static int cmp_age(int age1, int age2)
 {
        if (age1 != 0 && age2 != 0)


@@ -42,12 +41,25 @@ static int cmp_branch_age(const void *a, const void *b)
        return cmp_age(r1->commit->committer_date, r2->commit->committer_date);
 }
 
        return cmp_age(r1->commit->committer_date, r2->commit->committer_date);
 }
 

+static int get_ref_age(struct refinfo *ref)
+{
+       if (!ref->object)
+               return 0;
+       switch (ref->object->type) {
+       case OBJ_TAG:
+               return ref->tag ? ref->tag->tagger_date : 0;
+       case OBJ_COMMIT:
+               return ref->commit ? ref->commit->committer_date : 0;
+       }
+       return 0;
+}
+

 static int cmp_tag_age(const void *a, const void *b)
 {
        struct refinfo *r1 = *(struct refinfo **)a;
        struct refinfo *r2 = *(struct refinfo **)b;
 
 static int cmp_tag_age(const void *a, const void *b)
 {
        struct refinfo *r1 = *(struct refinfo **)a;
        struct refinfo *r2 = *(struct refinfo **)b;
 

-       return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date);
+       return cmp_age(get_ref_age(r1), get_ref_age(r2));

 }
 
 static int print_branch(struct refinfo *ref)
 }
 
 static int print_branch(struct refinfo *ref)


@@ -63,7 +75,7 @@ static int print_branch(struct refinfo *ref)
        html("</td><td>");
 
        if (ref->object->type == OBJ_COMMIT) {
        html("</td><td>");
 
        if (ref->object->type == OBJ_COMMIT) {

-               cgit_commit_link(info->subject, NULL, NULL, name, NULL);
+               cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0);

                html("</td><td>");
                html_txt(info->author);
                html("</td><td colspan='2'>");
                html("</td><td>");
                html_txt(info->author);
                html("</td><td colspan='2'>");


@@ -82,7 +94,6 @@ static void print_tag_header()
             "<th class='left'>Download</th>"
             "<th class='left'>Author</th>"
             "<th class='left' colspan='2'>Age</th></tr>\n");
             "<th class='left'>Download</th>"
             "<th class='left'>Author</th>"
             "<th class='left' colspan='2'>Age</th></tr>\n");

-       header = 1;

 }
 
 static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
 }
 
 static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)


@@ -90,6 +101,7 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
        const struct cgit_snapshot_format* f;
        char *filename;
        const char *basename;
        const struct cgit_snapshot_format* f;
        char *filename;
        const char *basename;

+       int free_ref = 0;

 
        if (!ref || strlen(ref) < 2)
                return;
 
        if (!ref || strlen(ref) < 2)
                return;


@@ -98,8 +110,10 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
        if (prefixcmp(ref, basename) != 0) {
                if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
                        ref++;
        if (prefixcmp(ref, basename) != 0) {
                if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
                        ref++;

-               if (isdigit(ref[0]))
+               if (isdigit(ref[0])) {

                        ref = xstrdup(fmt("%s-%s", basename, ref));
                        ref = xstrdup(fmt("%s-%s", basename, ref));

+                       free_ref = 1;
+               }

        }
 
        for (f = cgit_snapshot_formats; f->suffix; f++) {
        }
 
        for (f = cgit_snapshot_formats; f->suffix; f++) {


@@ -109,50 +123,55 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
                cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                html("&nbsp;&nbsp;");
        }
                cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
                html("&nbsp;&nbsp;");
        }

+
+       if (free_ref)
+               free((char *)ref);

 }
 }

+

 static int print_tag(struct refinfo *ref)
 {
 static int print_tag(struct refinfo *ref)
 {

-       struct tag *tag;
-       struct taginfo *info;
+       struct tag *tag = NULL;
+       struct taginfo *info = NULL;

        char *name = (char *)ref->refname;
        char *name = (char *)ref->refname;

+       struct object *obj = ref->object;

 
 

-       if (ref->object->type == OBJ_TAG) {
-               tag = (struct tag *)ref->object;
+       if (obj->type == OBJ_TAG) {
+               tag = (struct tag *)obj;
+               obj = tag->tagged;

                info = ref->tag;
                if (!tag || !info)
                        return 1;
                info = ref->tag;
                if (!tag || !info)
                        return 1;

-               html("<tr><td>");
-               cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
-               html("</td><td>");
-               if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
-                       print_tag_downloads(ctx.repo, name);
-               else
-                       cgit_object_link(tag->tagged);
-               html("</td><td>");
+       }
+
+       html("<tr><td>");
+       cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
+       html("</td><td>");
+       if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT))
+               print_tag_downloads(ctx.repo, name);
+       else
+               cgit_object_link(obj);
+       html("</td><td>");
+       if (info) {

                if (info->tagger)
                        html(info->tagger);
                if (info->tagger)
                        html(info->tagger);

-               html("</td><td colspan='2'>");
+       } else if (ref->object->type == OBJ_COMMIT) {
+               html(ref->commit->author);
+       }
+       html("</td><td colspan='2'>");
+       if (info) {

                if (info->tagger_date > 0)
                        cgit_print_age(info->tagger_date, -1, NULL);
                if (info->tagger_date > 0)
                        cgit_print_age(info->tagger_date, -1, NULL);

-               html("</td></tr>\n");
-       } else {
-               if (!header)
-                       print_tag_header();
-               html("<tr><td>");
-               html_txt(name);
-               html("</td><td>");
-               if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
-                       print_tag_downloads(ctx.repo, name);
-               else
-                       cgit_object_link(ref->object);
-               html("</td></tr>\n");
+       } else if (ref->object->type == OBJ_COMMIT) {
+               cgit_print_age(ref->commit->commit->date, -1, NULL);

        }
        }

+       html("</td></tr>\n");
+

        return 0;
 }
 
 static void print_refs_link(char *path)
 {
        return 0;
 }
 
 static void print_refs_link(char *path)
 {

-       html("<tr class='nohover'><td colspan='4'>");
+       html("<tr class='nohover'><td colspan='5'>");

        cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
        html("</td></tr>");
 }
        cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
        html("</td></tr>");
 }


@@ -170,6 +189,8 @@ void cgit_print_branches(int maxcount)
        list.refs = NULL;
        list.alloc = list.count = 0;
        for_each_branch_ref(cgit_refs_cb, &list);
        list.refs = NULL;
        list.alloc = list.count = 0;
        for_each_branch_ref(cgit_refs_cb, &list);

+       if (ctx.repo->enable_remote_branches)
+               for_each_remote_ref(cgit_refs_cb, &list);

 
        if (maxcount == 0 || maxcount > list.count)
                maxcount = list.count;
 
        if (maxcount == 0 || maxcount > list.count)
                maxcount = list.count;


@@ -179,11 +200,13 @@ void cgit_print_branches(int maxcount)
                qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
        }
 
                qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
        }
 

-       for(i=0; i<maxcount; i++)
+       for (i = 0; i < maxcount; i++)

                print_branch(list.refs[i]);
 
        if (maxcount < list.count)
                print_refs_link("heads");
                print_branch(list.refs[i]);
 
        if (maxcount < list.count)
                print_refs_link("heads");

+
+       cgit_free_reflist_inner(&list);

 }
 
 void cgit_print_tags(int maxcount)
 }
 
 void cgit_print_tags(int maxcount)


@@ -191,7 +214,6 @@ void cgit_print_tags(int maxcount)
        struct reflist list;
        int i;
 
        struct reflist list;
        int i;
 

-       header = 0;

        list.refs = NULL;
        list.alloc = list.count = 0;
        for_each_tag_ref(cgit_refs_cb, &list);
        list.refs = NULL;
        list.alloc = list.count = 0;
        for_each_tag_ref(cgit_refs_cb, &list);


@@ -203,11 +225,13 @@ void cgit_print_tags(int maxcount)
        else if (maxcount > list.count)
                maxcount = list.count;
        print_tag_header();
        else if (maxcount > list.count)
                maxcount = list.count;
        print_tag_header();

-       for(i=0; i<maxcount; i++)
+       for (i = 0; i < maxcount; i++)

                print_tag(list.refs[i]);
 
        if (maxcount < list.count)
                print_refs_link("tags");
                print_tag(list.refs[i]);
 
        if (maxcount < list.count)
                print_refs_link("tags");

+
+       cgit_free_reflist_inner(&list);

 }
 
 void cgit_print_refs()
 }
 
 void cgit_print_refs()


@@ -221,7 +245,7 @@ void cgit_print_refs()
                cgit_print_tags(0);
        else {
                cgit_print_branches(0);
                cgit_print_tags(0);
        else {
                cgit_print_branches(0);

-               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+               html("<tr class='nohover'><td colspan='5'>&nbsp;</td></tr>");

                cgit_print_tags(0);
        }
        html("</table>");
                cgit_print_tags(0);
        }
        html("</table>");