|
diff --git a/ui-refs.c b/ui-refs.c index 44c8f9a..32e0429 100644 --- a/ ui-refs.c+++ b/ ui-refs.c |
|
@@ -43,109 +43,105 @@ static int cmp_branch_age(const void *a, const void *b) |
43 | } |
43 | } |
44 | |
44 | |
45 | static int cmp_tag_age(const void *a, const void *b) |
45 | static int cmp_tag_age(const void *a, const void *b) |
46 | { |
46 | { |
47 | struct refinfo *r1 = *(struct refinfo **)a; |
47 | struct refinfo *r1 = *(struct refinfo **)a; |
48 | struct refinfo *r2 = *(struct refinfo **)b; |
48 | struct refinfo *r2 = *(struct refinfo **)b; |
49 | |
49 | |
50 | return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date); |
50 | return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date); |
51 | } |
51 | } |
52 | |
52 | |
53 | static int print_branch(struct refinfo *ref) |
53 | static int print_branch(struct refinfo *ref) |
54 | { |
54 | { |
55 | struct commitinfo *info = ref->commit; |
55 | struct commitinfo *info = ref->commit; |
56 | char *name = (char *)ref->refname; |
56 | char *name = (char *)ref->refname; |
57 | |
57 | |
58 | if (!info) |
58 | if (!info) |
59 | return 1; |
59 | return 1; |
60 | html("<tr><td>"); |
60 | html("<tr><td>"); |
61 | cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL); |
61 | cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL); |
62 | html("</td><td>"); |
62 | html("</td><td>"); |
63 | |
63 | |
64 | if (ref->object->type == OBJ_COMMIT) { |
64 | if (ref->object->type == OBJ_COMMIT) { |
65 | cgit_commit_link(info->subject, NULL, NULL, name, NULL); |
65 | cgit_commit_link(info->subject, NULL, NULL, name, NULL); |
66 | html("</td><td>"); |
66 | html("</td><td>"); |
67 | html_txt(info->author); |
67 | html_txt(info->author); |
68 | html("</td><td colspan='2'>"); |
68 | html("</td><td colspan='2'>"); |
69 | cgit_print_age(info->commit->date, -1, NULL); |
69 | cgit_print_age(info->commit->date, -1, NULL); |
70 | } else { |
70 | } else { |
71 | html("</td><td></td><td>"); |
71 | html("</td><td></td><td>"); |
72 | cgit_object_link(ref->object); |
72 | cgit_object_link(ref->object); |
73 | } |
73 | } |
74 | html("</td></tr>\n"); |
74 | html("</td></tr>\n"); |
75 | return 0; |
75 | return 0; |
76 | } |
76 | } |
77 | |
77 | |
78 | static void print_tag_header() |
78 | static void print_tag_header() |
79 | { |
79 | { |
80 | html("<tr class='nohover'><th class='left'>Tag</th>" |
80 | html("<tr class='nohover'><th class='left'>Tag</th>" |
81 | "<th class='left'>Reference</th>" |
81 | "<th class='left'>Reference</th>" |
82 | "<th class='left'>Author</th>" |
82 | "<th class='left'>Author</th>" |
83 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
83 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
84 | header = 1; |
84 | header = 1; |
85 | } |
85 | } |
86 | |
86 | |
87 | static int print_tag(struct refinfo *ref) |
87 | static int print_tag(struct refinfo *ref) |
88 | { |
88 | { |
89 | struct tag *tag; |
89 | struct tag *tag; |
90 | struct taginfo *info; |
90 | struct taginfo *info; |
91 | char *url, *name = (char *)ref->refname; |
91 | char *name = (char *)ref->refname; |
92 | |
92 | |
93 | if (ref->object->type == OBJ_TAG) { |
93 | if (ref->object->type == OBJ_TAG) { |
94 | tag = (struct tag *)ref->object; |
94 | tag = (struct tag *)ref->object; |
95 | info = ref->tag; |
95 | info = ref->tag; |
96 | if (!tag || !info) |
96 | if (!tag || !info) |
97 | return 1; |
97 | return 1; |
98 | html("<tr><td>"); |
98 | html("<tr><td>"); |
99 | url = cgit_pageurl(ctx.qry.repo, "tag", |
99 | cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); |
100 | fmt("id=%s", name)); |
| |
101 | html_link_open(url, NULL, NULL); |
| |
102 | html_txt(name); |
| |
103 | html_link_close(); |
| |
104 | html("</td><td>"); |
100 | html("</td><td>"); |
105 | cgit_object_link(tag->tagged); |
101 | cgit_object_link(tag->tagged); |
106 | html("</td><td>"); |
102 | html("</td><td>"); |
107 | if (info->tagger) |
103 | if (info->tagger) |
108 | html(info->tagger); |
104 | html(info->tagger); |
109 | html("</td><td colspan='2'>"); |
105 | html("</td><td colspan='2'>"); |
110 | if (info->tagger_date > 0) |
106 | if (info->tagger_date > 0) |
111 | cgit_print_age(info->tagger_date, -1, NULL); |
107 | cgit_print_age(info->tagger_date, -1, NULL); |
112 | html("</td></tr>\n"); |
108 | html("</td></tr>\n"); |
113 | } else { |
109 | } else { |
114 | if (!header) |
110 | if (!header) |
115 | print_tag_header(); |
111 | print_tag_header(); |
116 | html("<tr><td>"); |
112 | html("<tr><td>"); |
117 | html_txt(name); |
113 | html_txt(name); |
118 | html("</td><td>"); |
114 | html("</td><td>"); |
119 | cgit_object_link(ref->object); |
115 | cgit_object_link(ref->object); |
120 | html("</td></tr>\n"); |
116 | html("</td></tr>\n"); |
121 | } |
117 | } |
122 | return 0; |
118 | return 0; |
123 | } |
119 | } |
124 | |
120 | |
125 | static void print_refs_link(char *path) |
121 | static void print_refs_link(char *path) |
126 | { |
122 | { |
127 | html("<tr class='nohover'><td colspan='4'>"); |
123 | html("<tr class='nohover'><td colspan='4'>"); |
128 | cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); |
124 | cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); |
129 | html("</td></tr>"); |
125 | html("</td></tr>"); |
130 | } |
126 | } |
131 | |
127 | |
132 | void cgit_print_branches(int maxcount) |
128 | void cgit_print_branches(int maxcount) |
133 | { |
129 | { |
134 | struct reflist list; |
130 | struct reflist list; |
135 | int i; |
131 | int i; |
136 | |
132 | |
137 | html("<tr class='nohover'><th class='left'>Branch</th>" |
133 | html("<tr class='nohover'><th class='left'>Branch</th>" |
138 | "<th class='left'>Commit message</th>" |
134 | "<th class='left'>Commit message</th>" |
139 | "<th class='left'>Author</th>" |
135 | "<th class='left'>Author</th>" |
140 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
136 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
141 | |
137 | |
142 | list.refs = NULL; |
138 | list.refs = NULL; |
143 | list.alloc = list.count = 0; |
139 | list.alloc = list.count = 0; |
144 | for_each_branch_ref(cgit_refs_cb, &list); |
140 | for_each_branch_ref(cgit_refs_cb, &list); |
145 | |
141 | |
146 | if (maxcount == 0 || maxcount > list.count) |
142 | if (maxcount == 0 || maxcount > list.count) |
147 | maxcount = list.count; |
143 | maxcount = list.count; |
148 | |
144 | |
149 | if (maxcount < list.count) { |
145 | if (maxcount < list.count) { |
150 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); |
146 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); |
151 | qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); |
147 | qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); |
|