|
diff --git a/ui-refs.c b/ui-refs.c index d61ee7c..c35e694 100644 --- a/ ui-refs.c+++ b/ ui-refs.c |
|
@@ -48,181 +48,181 @@ static int cmp_tag_age(const void *a, const void *b) |
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 | ctx.qry.showmsg); |
62 | ctx.qry.showmsg); |
63 | html("</td><td>"); |
63 | html("</td><td>"); |
64 | |
64 | |
65 | if (ref->object->type == OBJ_COMMIT) { |
65 | if (ref->object->type == OBJ_COMMIT) { |
66 | cgit_commit_link(info->subject, NULL, NULL, name, NULL); |
66 | cgit_commit_link(info->subject, NULL, NULL, name, NULL); |
67 | html("</td><td>"); |
67 | html("</td><td>"); |
68 | html_txt(info->author); |
68 | html_txt(info->author); |
69 | html("</td><td colspan='2'>"); |
69 | html("</td><td colspan='2'>"); |
70 | cgit_print_age(info->commit->date, -1, NULL); |
70 | cgit_print_age(info->commit->date, -1, NULL); |
71 | } else { |
71 | } else { |
72 | html("</td><td></td><td>"); |
72 | html("</td><td></td><td>"); |
73 | cgit_object_link(ref->object); |
73 | cgit_object_link(ref->object); |
74 | } |
74 | } |
75 | html("</td></tr>\n"); |
75 | html("</td></tr>\n"); |
76 | return 0; |
76 | return 0; |
77 | } |
77 | } |
78 | |
78 | |
79 | static void print_tag_header() |
79 | static void print_tag_header() |
80 | { |
80 | { |
81 | html("<tr class='nohover'><th class='left'>Tag</th>" |
81 | html("<tr class='nohover'><th class='left'>Tag</th>" |
82 | "<th class='left'>Download</th>" |
82 | "<th class='left'>Download</th>" |
83 | "<th class='left'>Author</th>" |
83 | "<th class='left'>Author</th>" |
84 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
84 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
85 | header = 1; |
85 | header = 1; |
86 | } |
86 | } |
87 | |
87 | |
88 | static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) |
88 | static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) |
89 | { |
89 | { |
90 | const struct cgit_snapshot_format* f; |
90 | const struct cgit_snapshot_format* f; |
91 | char *filename; |
91 | char *filename; |
92 | const char *basename; |
92 | const char *basename; |
93 | |
93 | |
94 | if (!ref || strlen(ref) < 2) |
94 | if (!ref || strlen(ref) < 2) |
95 | return; |
95 | return; |
96 | |
96 | |
97 | basename = cgit_repobasename(repo->url); |
97 | basename = cgit_repobasename(repo->url); |
98 | if (prefixcmp(ref, basename) != 0) { |
98 | if (prefixcmp(ref, basename) != 0) { |
99 | if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1])) |
99 | if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1])) |
100 | ref++; |
100 | ref++; |
101 | if (isdigit(ref[0])) |
101 | if (isdigit(ref[0])) |
102 | ref = xstrdup(fmt("%s-%s", basename, ref)); |
102 | ref = xstrdup(fmt("%s-%s", basename, ref)); |
103 | } |
103 | } |
104 | |
104 | |
105 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
105 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
106 | if (!(repo->snapshots & f->bit)) |
106 | if (!(repo->snapshots & f->bit)) |
107 | continue; |
107 | continue; |
108 | filename = fmt("%s%s", ref, f->suffix); |
108 | filename = fmt("%s%s", ref, f->suffix); |
109 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); |
109 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); |
110 | html(" "); |
110 | html(" "); |
111 | } |
111 | } |
112 | } |
112 | } |
113 | static int print_tag(struct refinfo *ref) |
113 | static int print_tag(struct refinfo *ref) |
114 | { |
114 | { |
115 | struct tag *tag; |
115 | struct tag *tag; |
116 | struct taginfo *info; |
116 | struct taginfo *info; |
117 | char *name = (char *)ref->refname; |
117 | char *name = (char *)ref->refname; |
118 | |
118 | |
119 | if (ref->object->type == OBJ_TAG) { |
119 | if (ref->object->type == OBJ_TAG) { |
120 | tag = (struct tag *)ref->object; |
120 | tag = (struct tag *)ref->object; |
121 | info = ref->tag; |
121 | info = ref->tag; |
122 | if (!tag || !info) |
122 | if (!tag || !info) |
123 | return 1; |
123 | return 1; |
124 | html("<tr><td>"); |
124 | html("<tr><td>"); |
125 | cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); |
125 | cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); |
126 | html("</td><td>"); |
126 | html("</td><td>"); |
127 | if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) |
127 | if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) |
128 | print_tag_downloads(ctx.repo, name); |
128 | print_tag_downloads(ctx.repo, name); |
129 | else |
129 | else |
130 | cgit_object_link(tag->tagged); |
130 | cgit_object_link(tag->tagged); |
131 | html("</td><td>"); |
131 | html("</td><td>"); |
132 | if (info->tagger) |
132 | if (info->tagger) |
133 | html(info->tagger); |
133 | html(info->tagger); |
134 | html("</td><td colspan='2'>"); |
134 | html("</td><td colspan='2'>"); |
135 | if (info->tagger_date > 0) |
135 | if (info->tagger_date > 0) |
136 | cgit_print_age(info->tagger_date, -1, NULL); |
136 | cgit_print_age(info->tagger_date, -1, NULL); |
137 | html("</td></tr>\n"); |
137 | html("</td></tr>\n"); |
138 | } else { |
138 | } else { |
139 | if (!header) |
139 | if (!header) |
140 | print_tag_header(); |
140 | print_tag_header(); |
141 | html("<tr><td>"); |
141 | html("<tr><td>"); |
142 | html_txt(name); |
142 | html_txt(name); |
143 | html("</td><td>"); |
143 | html("</td><td>"); |
144 | if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) |
144 | if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT)) |
145 | print_tag_downloads(ctx.repo, name); |
145 | print_tag_downloads(ctx.repo, name); |
146 | else |
146 | else |
147 | cgit_object_link(ref->object); |
147 | cgit_object_link(ref->object); |
148 | html("</td></tr>\n"); |
148 | html("</td></tr>\n"); |
149 | } |
149 | } |
150 | return 0; |
150 | return 0; |
151 | } |
151 | } |
152 | |
152 | |
153 | static void print_refs_link(char *path) |
153 | static void print_refs_link(char *path) |
154 | { |
154 | { |
155 | html("<tr class='nohover'><td colspan='4'>"); |
155 | html("<tr class='nohover'><td colspan='4'>"); |
156 | cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); |
156 | cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); |
157 | html("</td></tr>"); |
157 | html("</td></tr>"); |
158 | } |
158 | } |
159 | |
159 | |
160 | void cgit_print_branches(int maxcount) |
160 | void cgit_print_branches(int maxcount) |
161 | { |
161 | { |
162 | struct reflist list; |
162 | struct reflist list; |
163 | int i; |
163 | int i; |
164 | |
164 | |
165 | html("<tr class='nohover'><th class='left'>Branch</th>" |
165 | html("<tr class='nohover'><th class='left'>Branch</th>" |
166 | "<th class='left'>Commit message</th>" |
166 | "<th class='left'>Commit message</th>" |
167 | "<th class='left'>Author</th>" |
167 | "<th class='left'>Author</th>" |
168 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
168 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
169 | |
169 | |
170 | list.refs = NULL; |
170 | list.refs = NULL; |
171 | list.alloc = list.count = 0; |
171 | list.alloc = list.count = 0; |
172 | for_each_branch_ref(cgit_refs_cb, &list); |
172 | for_each_branch_ref(cgit_refs_cb, &list); |
173 | |
173 | |
174 | if (maxcount == 0 || maxcount > list.count) |
174 | if (maxcount == 0 || maxcount > list.count) |
175 | maxcount = list.count; |
175 | maxcount = list.count; |
176 | |
176 | |
177 | if (maxcount < list.count) { |
177 | if (maxcount < list.count) { |
178 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); |
178 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); |
179 | qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); |
179 | qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); |
180 | } |
180 | } |
181 | |
181 | |
182 | for(i=0; i<maxcount; i++) |
182 | for(i=0; i<maxcount; i++) |
183 | print_branch(list.refs[i]); |
183 | print_branch(list.refs[i]); |
184 | |
184 | |
185 | if (maxcount < list.count) |
185 | if (maxcount < list.count) |
186 | print_refs_link("heads"); |
186 | print_refs_link("heads"); |
187 | } |
187 | } |
188 | |
188 | |
189 | void cgit_print_tags(int maxcount) |
189 | void cgit_print_tags(int maxcount) |
190 | { |
190 | { |
191 | struct reflist list; |
191 | struct reflist list; |
192 | int i; |
192 | int i; |
193 | |
193 | |
194 | header = 0; |
194 | header = 0; |
195 | list.refs = NULL; |
195 | list.refs = NULL; |
196 | list.alloc = list.count = 0; |
196 | list.alloc = list.count = 0; |
197 | for_each_tag_ref(cgit_refs_cb, &list); |
197 | for_each_tag_ref(cgit_refs_cb, &list); |
198 | if (list.count == 0) |
198 | if (list.count == 0) |
199 | return; |
199 | return; |
200 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age); |
200 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age); |
201 | if (!maxcount) |
201 | if (!maxcount) |
202 | maxcount = list.count; |
202 | maxcount = list.count; |
203 | else if (maxcount > list.count) |
203 | else if (maxcount > list.count) |
204 | maxcount = list.count; |
204 | maxcount = list.count; |
205 | print_tag_header(); |
205 | print_tag_header(); |
206 | for(i=0; i<maxcount; i++) |
206 | for(i=0; i<maxcount; i++) |
207 | print_tag(list.refs[i]); |
207 | print_tag(list.refs[i]); |
208 | |
208 | |
209 | if (maxcount < list.count) |
209 | if (maxcount < list.count) |
210 | print_refs_link("tags"); |
210 | print_refs_link("tags"); |
211 | } |
211 | } |
212 | |
212 | |
213 | void cgit_print_refs() |
213 | void cgit_print_refs() |
214 | { |
214 | { |
215 | |
215 | |
216 | html("<table class='list nowrap'>"); |
216 | html("<table class='list nowrap'>"); |
217 | |
217 | |
218 | if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5)) |
218 | if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5)) |
219 | cgit_print_branches(0); |
219 | cgit_print_branches(0); |
220 | else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4)) |
220 | else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4)) |
221 | cgit_print_tags(0); |
221 | cgit_print_tags(0); |
222 | else { |
222 | else { |
223 | cgit_print_branches(0); |
223 | cgit_print_branches(0); |
224 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); |
224 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); |
225 | cgit_print_tags(0); |
225 | cgit_print_tags(0); |
226 | } |
226 | } |
227 | html("</table>"); |
227 | html("</table>"); |
228 | } |
228 | } |
|