Merge branch 'tz/make-improvements'

[cgit.git] / ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index fc82ca74227b4e518c1e5c33482b54c148970ef9..caddfbc4fbdb3949b6c2424e21baa528e220ce7f 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -8,6 +8,7 @@
 
 #include "cgit.h"
 #include "html.h"
 
 #include "cgit.h"
 #include "html.h"

+#include "ui-shared.h"

 
 static int header;
 
 
 static int header;
 


@@ -41,12 +42,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)


@@ -57,15 +71,16 @@ static int print_branch(struct refinfo *ref)
        if (!info)
                return 1;
        html("<tr><td>");
        if (!info)
                return 1;
        html("<tr><td>");

-       cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL);
+       cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL,
+                     ctx.qry.showmsg);

        html("</td><td>");
 
        if (ref->object->type == OBJ_COMMIT) {
        html("</td><td>");
 
        if (ref->object->type == OBJ_COMMIT) {

-               cgit_print_age(info->commit->date, -1, NULL);
+               cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0);

                html("</td><td>");
                html_txt(info->author);
                html("</td><td>");
                html_txt(info->author);

-               html("</td><td>");
-               cgit_commit_link(info->subject, NULL, NULL, name, NULL);
+               html("</td><td colspan='2'>");
+               cgit_print_age(info->commit->date, -1, NULL);

        } else {
                html("</td><td></td><td>");
                cgit_object_link(ref->object);
        } else {
                html("</td><td></td><td>");
                cgit_object_link(ref->object);


@@ -77,17 +92,42 @@ static int print_branch(struct refinfo *ref)
 static void print_tag_header()
 {
        html("<tr class='nohover'><th class='left'>Tag</th>"
 static void print_tag_header()
 {
        html("<tr class='nohover'><th class='left'>Tag</th>"

-            "<th class='left'>Age</th>"
+            "<th class='left'>Download</th>"

             "<th class='left'>Author</th>"
             "<th class='left'>Author</th>"

-            "<th class='left'>Reference</th></tr>\n");
+            "<th class='left' colspan='2'>Age</th></tr>\n");

        header = 1;
 }
 
        header = 1;
 }
 

+static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
+{
+       const struct cgit_snapshot_format* f;
+       char *filename;
+       const char *basename;
+
+       if (!ref || strlen(ref) < 2)
+               return;
+
+       basename = cgit_repobasename(repo->url);
+       if (prefixcmp(ref, basename) != 0) {
+               if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
+                       ref++;
+               if (isdigit(ref[0]))
+                       ref = xstrdup(fmt("%s-%s", basename, ref));
+       }
+
+       for (f = cgit_snapshot_formats; f->suffix; f++) {
+               if (!(repo->snapshots & f->bit))
+                       continue;
+               filename = fmt("%s%s", ref, f->suffix);
+               cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
+               html("&nbsp;&nbsp;");
+       }
+}

 static int print_tag(struct refinfo *ref)
 {
        struct tag *tag;
        struct taginfo *info;
 static int print_tag(struct refinfo *ref)
 {
        struct tag *tag;
        struct taginfo *info;

-       char *url, *name = (char *)ref->refname;
+       char *name = (char *)ref->refname;

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


@@ -95,27 +135,35 @@ static int print_tag(struct refinfo *ref)
                if (!tag || !info)
                        return 1;
                html("<tr><td>");
                if (!tag || !info)
                        return 1;
                html("<tr><td>");

-               url = cgit_pageurl(ctx.qry.repo, "tag",
-                                  fmt("id=%s", name));
-               html_link_open(url, NULL, NULL);
-               html_txt(name);
-               html_link_close();
+               cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);

                html("</td><td>");
                html("</td><td>");

-               if (info->tagger_date > 0)
-                       cgit_print_age(info->tagger_date, -1, NULL);
+               if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
+                       print_tag_downloads(ctx.repo, name);
+               else
+                       cgit_object_link(tag->tagged);

                html("</td><td>");
                if (info->tagger)
                        html(info->tagger);
                html("</td><td>");
                if (info->tagger)
                        html(info->tagger);

-               html("</td><td>");
-               cgit_object_link(tag->tagged);
+               html("</td><td colspan='2'>");
+               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("</td></tr>\n");
        } else {
                if (!header)
                        print_tag_header();
                html("<tr><td>");

-               html_txt(name);
-               html("</td><td colspan='2'/><td>");
-               cgit_object_link(ref->object);
+               cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
+               html("</td><td>");
+               if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT))
+                       print_tag_downloads(ctx.repo, name);
+               else
+                       cgit_object_link(ref->object);
+               html("</td><td>");
+               if (ref->object->type == OBJ_COMMIT)
+                       html(ref->commit->author);
+               html("</td><td colspan='2'>");
+               if (ref->object->type == OBJ_COMMIT)
+                       cgit_print_age(ref->commit->commit->date, -1, NULL);

                html("</td></tr>\n");
        }
        return 0;
                html("</td></tr>\n");
        }
        return 0;


@@ -134,13 +182,15 @@ void cgit_print_branches(int maxcount)
        int i;
 
        html("<tr class='nohover'><th class='left'>Branch</th>"
        int i;
 
        html("<tr class='nohover'><th class='left'>Branch</th>"

-            "<th class='left'>Idle</th>"
+            "<th class='left'>Commit message</th>"

             "<th class='left'>Author</th>"
             "<th class='left'>Author</th>"

-            "<th class='left'>Head commit</th></tr>\n");
+            "<th class='left' colspan='2'>Age</th></tr>\n");

 
        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;


@@ -195,6 +245,5 @@ void cgit_print_refs()
                html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
                cgit_print_tags(0);
        }
                html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
                cgit_print_tags(0);
        }

-

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