Makefile: re-use Git's Makefile where possible

[ps-cgit] / ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index 25da00a0f25ada4218e9e518f022dc32838a5769..e89f8368dcb1f4f667eb797e48f317e1d11376d4 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -42,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);
 }
 
+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;
 
-       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)
@@ -63,7 +76,7 @@ static int print_branch(struct refinfo *ref)
        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'>");
@@ -90,6 +103,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;
+       int free_ref = 0;
 
        if (!ref || strlen(ref) < 2)
                return;
@@ -98,8 +112,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 (isdigit(ref[0]))
+               if (isdigit(ref[0])) {
                        ref = xstrdup(fmt("%s-%s", basename, ref));
+                       free_ref = 1;
+               }
        }
 
        for (f = cgit_snapshot_formats; f->suffix; f++) {
@@ -109,6 +125,9 @@ 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;");
        }
+
+       if (free_ref)
+               free((char *)ref);
 }
 static int print_tag(struct refinfo *ref)
 {
@@ -145,6 +164,12 @@ static int print_tag(struct refinfo *ref)
                        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;
@@ -170,6 +195,8 @@ void cgit_print_branches(int maxcount)
        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;
@@ -179,11 +206,13 @@ void cgit_print_branches(int maxcount)
                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");
+
+       cgit_free_reflist_inner(&list);
 }
 
 void cgit_print_tags(int maxcount)
@@ -203,11 +232,13 @@ void cgit_print_tags(int maxcount)
        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");
+
+       cgit_free_reflist_inner(&list);
 }
 
 void cgit_print_refs()