Hosted on HTTPS now

[cgit.git] / ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index 7af6fed0ad0c85b6db64472330fcfcf06bc0a065..5b4530e5410fd159534e03051ce86471c0992bf3 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -11,18 +11,10 @@
 #include "html.h"
 #include "ui-shared.h"
 
-static int cmp_age(int age1, int age2)
+static inline int cmp_age(int age1, int age2)
 {
-       if (age1 != 0 && age2 != 0)
-               return age2 - age1;
-
-       if (age1 == 0 && age2 == 0)
-               return 0;
-
-       if (age1 == 0)
-               return +1;
-
-       return -1;
+       /* age1 and age2 are assumed to be non-negative */
+       return age2 - age1;
 }
 
 static int cmp_ref_name(const void *a, const void *b)
@@ -71,15 +63,17 @@ static int print_branch(struct refinfo *ref)
                return 1;
        html("<tr><td>");
        cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL,
-                     ctx.qry.showmsg);
+                     ctx.qry.showmsg, 0);
        html("</td><td>");
 
        if (ref->object->type == OBJ_COMMIT) {
-               cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0);
+               cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL);
                html("</td><td>");
+               cgit_open_filter(ctx.repo->email_filter, info->author_email, "refs");
                html_txt(info->author);
+               cgit_close_filter(ctx.repo->email_filter);
                html("</td><td colspan='2'>");
-               cgit_print_age(info->commit->date, -1, NULL);
+               cgit_print_age(info->committer_date, info->committer_tz, -1);
        } else {
                html("</td><td></td><td>");
                cgit_object_link(ref->object);
@@ -88,7 +82,7 @@ static int print_branch(struct refinfo *ref)
        return 0;
 }
 
-static void print_tag_header()
+static void print_tag_header(void)
 {
        html("<tr class='nohover'><th class='left'>Tag</th>"
             "<th class='left'>Download</th>"
@@ -103,11 +97,11 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
        const char *basename;
        int free_ref = 0;
 
-       if (!ref || strlen(ref) < 2)
+       if (!ref || strlen(ref) < 1)
                return;
 
        basename = cgit_repobasename(repo->url);
-       if (prefixcmp(ref, basename) != 0) {
+       if (!starts_with(ref, basename)) {
                if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
                        ref++;
                if (isdigit(ref[0])) {
@@ -141,12 +135,12 @@ static int print_tag(struct refinfo *ref)
                tag = (struct tag *)obj;
                obj = tag->tagged;
                info = ref->tag;
-               if (!tag || !info)
+               if (!info)
                        return 1;
        }
 
        html("<tr><td>");
-       cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
+       cgit_tag_link(name, NULL, NULL, name);
        html("</td><td>");
        if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT))
                print_tag_downloads(ctx.repo, name);
@@ -154,17 +148,22 @@ static int print_tag(struct refinfo *ref)
                cgit_object_link(obj);
        html("</td><td>");
        if (info) {
-               if (info->tagger)
-                       html(info->tagger);
+               if (info->tagger) {
+                       cgit_open_filter(ctx.repo->email_filter, info->tagger_email, "refs");
+                       html_txt(info->tagger);
+                       cgit_close_filter(ctx.repo->email_filter);
+               }
        } else if (ref->object->type == OBJ_COMMIT) {
-               html(ref->commit->author);
+               cgit_open_filter(ctx.repo->email_filter, ref->commit->author_email, "refs");
+               html_txt(ref->commit->author);
+               cgit_close_filter(ctx.repo->email_filter);
        }
        html("</td><td colspan='2'>");
        if (info) {
                if (info->tagger_date > 0)
-                       cgit_print_age(info->tagger_date, -1, NULL);
+                       cgit_print_age(info->tagger_date, info->tagger_tz, -1);
        } else if (ref->object->type == OBJ_COMMIT) {
-               cgit_print_age(ref->commit->commit->date, -1, NULL);
+               cgit_print_age(ref->commit->commit->date, 0, -1);
        }
        html("</td></tr>\n");
 
@@ -235,14 +234,14 @@ void cgit_print_tags(int maxcount)
        cgit_free_reflist_inner(&list);
 }
 
-void cgit_print_refs()
+void cgit_print_refs(void)
 {
-
+       cgit_print_layout_start();
        html("<table class='list nowrap'>");
 
-       if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5))
+       if (ctx.qry.path && starts_with(ctx.qry.path, "heads"))
                cgit_print_branches(0);
-       else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4))
+       else if (ctx.qry.path && starts_with(ctx.qry.path, "tags"))
                cgit_print_tags(0);
        else {
                cgit_print_branches(0);
@@ -250,4 +249,5 @@ void cgit_print_refs()
                cgit_print_tags(0);
        }
        html("</table>");
+       cgit_print_layout_end();
 }