X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/372b4041bd117cf073082559e1f0160d75f57374..caca860ba79fe9f6bc387f64ddb57ac0db1fac33:/ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index 25da00a..0399e6b 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -7,11 +7,10 @@
  */
 
 #include "cgit.h"
+#include "ui-refs.h"
 #include "html.h"
 #include "ui-shared.h"
 
-static int header;
-
 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);
 }
 
+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 +75,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'>");
@@ -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");
-	header = 1;
 }
 
 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;
+	int free_ref = 0;
 
 	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 (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 +123,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)
 {
@@ -136,8 +153,6 @@ static int print_tag(struct refinfo *ref)
 			cgit_print_age(info->tagger_date, -1, NULL);
 		html("</td></tr>\n");
 	} else {
-		if (!header)
-			print_tag_header();
 		html("<tr><td>");
 		cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
 		html("</td><td>");
@@ -145,6 +160,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;
@@ -152,7 +173,7 @@ static int print_tag(struct refinfo *ref)
 
 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>");
 }
@@ -170,6 +191,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 +202,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)
@@ -191,7 +216,6 @@ void cgit_print_tags(int maxcount)
 	struct reflist list;
 	int i;
 
-	header = 0;
 	list.refs = NULL;
 	list.alloc = list.count = 0;
 	for_each_tag_ref(cgit_refs_cb, &list);
@@ -203,11 +227,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()
@@ -221,7 +247,7 @@ void cgit_print_refs()
 		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>");