ui-shared: pass repo object to print_snapshot_links()

[cgit.git] / ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index 74064789ecdd281bd411472b20730501d1c52182..75f2789fc1653b76509f2ff3f8a9120051dd30e6 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -1,6 +1,6 @@
 /* ui-refs.c: browse symbolic refs
  *
 /* ui-refs.c: browse symbolic refs
  *

- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)


@@ -11,18 +11,10 @@
 #include "html.h"
 #include "ui-shared.h"
 
 #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)
 }
 
 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,
                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) {
        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>");
                html("</td><td>");

+               cgit_open_filter(ctx.repo->email_filter, info->author_email, "refs");

                html_txt(info->author);
                html_txt(info->author);

+               cgit_close_filter(ctx.repo->email_filter);

                html("</td><td colspan='2'>");
                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);
        } else {
                html("</td><td></td><td>");
                cgit_object_link(ref->object);


@@ -88,7 +82,7 @@ static int print_branch(struct refinfo *ref)
        return 0;
 }
 
        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>"
 {
        html("<tr class='nohover'><th class='left'>Tag</th>"
             "<th class='left'>Download</th>"


@@ -99,33 +93,29 @@ static void print_tag_header()
 static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
 {
        const struct cgit_snapshot_format* f;
 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 char *basename;

-       int free_ref = 0;
+       struct strbuf filename = STRBUF_INIT;
+       size_t prefixlen;

 
 

-       if (!ref || strlen(ref) < 2)
+       if (!ref || strlen(ref) < 1)

                return;
 
        basename = cgit_repobasename(repo->url);
                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));
-                       free_ref = 1;
-               }
-       }
-
+       if (starts_with(ref, basename))
+               strbuf_addstr(&filename, ref);
+       else
+               cgit_compose_snapshot_prefix(&filename, basename, ref);
+       prefixlen = filename.len;

        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (!(repo->snapshots & f->bit))
                        continue;
        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);
+               strbuf_setlen(&filename, prefixlen);
+               strbuf_addstr(&filename, f->suffix);
+               cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL, filename.buf);

                html("&nbsp;&nbsp;");
        }
 
                html("&nbsp;&nbsp;");
        }
 

-       if (free_ref)
-               free((char *)ref);
+       strbuf_release(&filename);

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


@@ -139,12 +129,12 @@ static int print_tag(struct refinfo *ref)
                tag = (struct tag *)obj;
                obj = tag->tagged;
                info = ref->tag;
                tag = (struct tag *)obj;
                obj = tag->tagged;
                info = ref->tag;

-               if (!tag || !info)
+               if (!info)

                        return 1;
        }
 
        html("<tr><td>");
                        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);
        html("</td><td>");
        if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT))
                print_tag_downloads(ctx.repo, name);


@@ -152,17 +142,22 @@ static int print_tag(struct refinfo *ref)
                cgit_object_link(obj);
        html("</td><td>");
        if (info) {
                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) {
        } 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)
        }
        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) {
        } 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");
 
        }
        html("</td></tr>\n");
 


@@ -195,10 +190,9 @@ void cgit_print_branches(int maxcount)
        if (maxcount == 0 || maxcount > list.count)
                maxcount = list.count;
 
        if (maxcount == 0 || maxcount > list.count)
                maxcount = list.count;
 

-       if (maxcount < list.count) {
-               qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
+       qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
+       if (ctx.repo->branch_sort == 0)

                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++)
                print_branch(list.refs[i]);
 
        for (i = 0; i < maxcount; i++)
                print_branch(list.refs[i]);


@@ -234,14 +228,14 @@ void cgit_print_tags(int maxcount)
        cgit_free_reflist_inner(&list);
 }
 
        cgit_free_reflist_inner(&list);
 }
 

-void cgit_print_refs()
+void cgit_print_refs(void)

 {
 {

-
+       cgit_print_layout_start();

        html("<table class='list nowrap'>");
 
        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);
                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);
                cgit_print_tags(0);
        else {
                cgit_print_branches(0);


@@ -249,4 +243,5 @@ void cgit_print_refs()
                cgit_print_tags(0);
        }
        html("</table>");
                cgit_print_tags(0);
        }
        html("</table>");

+       cgit_print_layout_end();

 }
 }