|
diff --git a/ui-refs.c b/ui-refs.c index 6571cc4..caddfbc 100644 --- a/ ui-refs.c+++ b/ ui-refs.c |
|
@@ -31,97 +31,97 @@ static int cmp_ref_name(const void *a, const void *b) |
31 | struct refinfo *r1 = *(struct refinfo **)a; |
31 | struct refinfo *r1 = *(struct refinfo **)a; |
32 | struct refinfo *r2 = *(struct refinfo **)b; |
32 | struct refinfo *r2 = *(struct refinfo **)b; |
33 | |
33 | |
34 | return strcmp(r1->refname, r2->refname); |
34 | return strcmp(r1->refname, r2->refname); |
35 | } |
35 | } |
36 | |
36 | |
37 | static int cmp_branch_age(const void *a, const void *b) |
37 | static int cmp_branch_age(const void *a, const void *b) |
38 | { |
38 | { |
39 | struct refinfo *r1 = *(struct refinfo **)a; |
39 | struct refinfo *r1 = *(struct refinfo **)a; |
40 | struct refinfo *r2 = *(struct refinfo **)b; |
40 | struct refinfo *r2 = *(struct refinfo **)b; |
41 | |
41 | |
42 | return cmp_age(r1->commit->committer_date, r2->commit->committer_date); |
42 | return cmp_age(r1->commit->committer_date, r2->commit->committer_date); |
43 | } |
43 | } |
44 | |
44 | |
45 | static int get_ref_age(struct refinfo *ref) |
45 | static int get_ref_age(struct refinfo *ref) |
46 | { |
46 | { |
47 | if (!ref->object) |
47 | if (!ref->object) |
48 | return 0; |
48 | return 0; |
49 | switch (ref->object->type) { |
49 | switch (ref->object->type) { |
50 | case OBJ_TAG: |
50 | case OBJ_TAG: |
51 | return ref->tag ? ref->tag->tagger_date : 0; |
51 | return ref->tag ? ref->tag->tagger_date : 0; |
52 | case OBJ_COMMIT: |
52 | case OBJ_COMMIT: |
53 | return ref->commit ? ref->commit->committer_date : 0; |
53 | return ref->commit ? ref->commit->committer_date : 0; |
54 | } |
54 | } |
55 | return 0; |
55 | return 0; |
56 | } |
56 | } |
57 | |
57 | |
58 | static int cmp_tag_age(const void *a, const void *b) |
58 | static int cmp_tag_age(const void *a, const void *b) |
59 | { |
59 | { |
60 | struct refinfo *r1 = *(struct refinfo **)a; |
60 | struct refinfo *r1 = *(struct refinfo **)a; |
61 | struct refinfo *r2 = *(struct refinfo **)b; |
61 | struct refinfo *r2 = *(struct refinfo **)b; |
62 | |
62 | |
63 | return cmp_age(get_ref_age(r1), get_ref_age(r2)); |
63 | return cmp_age(get_ref_age(r1), get_ref_age(r2)); |
64 | } |
64 | } |
65 | |
65 | |
66 | static int print_branch(struct refinfo *ref) |
66 | static int print_branch(struct refinfo *ref) |
67 | { |
67 | { |
68 | struct commitinfo *info = ref->commit; |
68 | struct commitinfo *info = ref->commit; |
69 | char *name = (char *)ref->refname; |
69 | char *name = (char *)ref->refname; |
70 | |
70 | |
71 | if (!info) |
71 | if (!info) |
72 | return 1; |
72 | return 1; |
73 | html("<tr><td>"); |
73 | html("<tr><td>"); |
74 | cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL, |
74 | cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL, |
75 | ctx.qry.showmsg); |
75 | ctx.qry.showmsg); |
76 | html("</td><td>"); |
76 | html("</td><td>"); |
77 | |
77 | |
78 | if (ref->object->type == OBJ_COMMIT) { |
78 | if (ref->object->type == OBJ_COMMIT) { |
79 | cgit_commit_link(info->subject, NULL, NULL, name, NULL); |
79 | cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0); |
80 | html("</td><td>"); |
80 | html("</td><td>"); |
81 | html_txt(info->author); |
81 | html_txt(info->author); |
82 | html("</td><td colspan='2'>"); |
82 | html("</td><td colspan='2'>"); |
83 | cgit_print_age(info->commit->date, -1, NULL); |
83 | cgit_print_age(info->commit->date, -1, NULL); |
84 | } else { |
84 | } else { |
85 | html("</td><td></td><td>"); |
85 | html("</td><td></td><td>"); |
86 | cgit_object_link(ref->object); |
86 | cgit_object_link(ref->object); |
87 | } |
87 | } |
88 | html("</td></tr>\n"); |
88 | html("</td></tr>\n"); |
89 | return 0; |
89 | return 0; |
90 | } |
90 | } |
91 | |
91 | |
92 | static void print_tag_header() |
92 | static void print_tag_header() |
93 | { |
93 | { |
94 | html("<tr class='nohover'><th class='left'>Tag</th>" |
94 | html("<tr class='nohover'><th class='left'>Tag</th>" |
95 | "<th class='left'>Download</th>" |
95 | "<th class='left'>Download</th>" |
96 | "<th class='left'>Author</th>" |
96 | "<th class='left'>Author</th>" |
97 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
97 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
98 | header = 1; |
98 | header = 1; |
99 | } |
99 | } |
100 | |
100 | |
101 | static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) |
101 | static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) |
102 | { |
102 | { |
103 | const struct cgit_snapshot_format* f; |
103 | const struct cgit_snapshot_format* f; |
104 | char *filename; |
104 | char *filename; |
105 | const char *basename; |
105 | const char *basename; |
106 | |
106 | |
107 | if (!ref || strlen(ref) < 2) |
107 | if (!ref || strlen(ref) < 2) |
108 | return; |
108 | return; |
109 | |
109 | |
110 | basename = cgit_repobasename(repo->url); |
110 | basename = cgit_repobasename(repo->url); |
111 | if (prefixcmp(ref, basename) != 0) { |
111 | if (prefixcmp(ref, basename) != 0) { |
112 | if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1])) |
112 | if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1])) |
113 | ref++; |
113 | ref++; |
114 | if (isdigit(ref[0])) |
114 | if (isdigit(ref[0])) |
115 | ref = xstrdup(fmt("%s-%s", basename, ref)); |
115 | ref = xstrdup(fmt("%s-%s", basename, ref)); |
116 | } |
116 | } |
117 | |
117 | |
118 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
118 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
119 | if (!(repo->snapshots & f->bit)) |
119 | if (!(repo->snapshots & f->bit)) |
120 | continue; |
120 | continue; |
121 | filename = fmt("%s%s", ref, f->suffix); |
121 | filename = fmt("%s%s", ref, f->suffix); |
122 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); |
122 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); |
123 | html(" "); |
123 | html(" "); |
124 | } |
124 | } |
125 | } |
125 | } |
126 | static int print_tag(struct refinfo *ref) |
126 | static int print_tag(struct refinfo *ref) |
127 | { |
127 | { |
@@ -144,96 +144,98 @@ static int print_tag(struct refinfo *ref) |
144 | html("</td><td>"); |
144 | html("</td><td>"); |
145 | if (info->tagger) |
145 | if (info->tagger) |
146 | html(info->tagger); |
146 | html(info->tagger); |
147 | html("</td><td colspan='2'>"); |
147 | html("</td><td colspan='2'>"); |
148 | if (info->tagger_date > 0) |
148 | if (info->tagger_date > 0) |
149 | cgit_print_age(info->tagger_date, -1, NULL); |
149 | cgit_print_age(info->tagger_date, -1, NULL); |
150 | html("</td></tr>\n"); |
150 | html("</td></tr>\n"); |
151 | } else { |
151 | } else { |
152 | if (!header) |
152 | if (!header) |
153 | print_tag_header(); |
153 | print_tag_header(); |
154 | html("<tr><td>"); |
154 | html("<tr><td>"); |
155 | cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); |
155 | cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); |
156 | html("</td><td>"); |
156 | html("</td><td>"); |
157 | if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT)) |
157 | if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT)) |
158 | print_tag_downloads(ctx.repo, name); |
158 | print_tag_downloads(ctx.repo, name); |
159 | else |
159 | else |
160 | cgit_object_link(ref->object); |
160 | cgit_object_link(ref->object); |
161 | html("</td><td>"); |
161 | html("</td><td>"); |
162 | if (ref->object->type == OBJ_COMMIT) |
162 | if (ref->object->type == OBJ_COMMIT) |
163 | html(ref->commit->author); |
163 | html(ref->commit->author); |
164 | html("</td><td colspan='2'>"); |
164 | html("</td><td colspan='2'>"); |
165 | if (ref->object->type == OBJ_COMMIT) |
165 | if (ref->object->type == OBJ_COMMIT) |
166 | cgit_print_age(ref->commit->commit->date, -1, NULL); |
166 | cgit_print_age(ref->commit->commit->date, -1, NULL); |
167 | html("</td></tr>\n"); |
167 | html("</td></tr>\n"); |
168 | } |
168 | } |
169 | return 0; |
169 | return 0; |
170 | } |
170 | } |
171 | |
171 | |
172 | static void print_refs_link(char *path) |
172 | static void print_refs_link(char *path) |
173 | { |
173 | { |
174 | html("<tr class='nohover'><td colspan='4'>"); |
174 | html("<tr class='nohover'><td colspan='4'>"); |
175 | cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); |
175 | cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); |
176 | html("</td></tr>"); |
176 | html("</td></tr>"); |
177 | } |
177 | } |
178 | |
178 | |
179 | void cgit_print_branches(int maxcount) |
179 | void cgit_print_branches(int maxcount) |
180 | { |
180 | { |
181 | struct reflist list; |
181 | struct reflist list; |
182 | int i; |
182 | int i; |
183 | |
183 | |
184 | html("<tr class='nohover'><th class='left'>Branch</th>" |
184 | html("<tr class='nohover'><th class='left'>Branch</th>" |
185 | "<th class='left'>Commit message</th>" |
185 | "<th class='left'>Commit message</th>" |
186 | "<th class='left'>Author</th>" |
186 | "<th class='left'>Author</th>" |
187 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
187 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
188 | |
188 | |
189 | list.refs = NULL; |
189 | list.refs = NULL; |
190 | list.alloc = list.count = 0; |
190 | list.alloc = list.count = 0; |
191 | for_each_branch_ref(cgit_refs_cb, &list); |
191 | for_each_branch_ref(cgit_refs_cb, &list); |
| |
192 | if (ctx.repo->enable_remote_branches) |
| |
193 | for_each_remote_ref(cgit_refs_cb, &list); |
192 | |
194 | |
193 | if (maxcount == 0 || maxcount > list.count) |
195 | if (maxcount == 0 || maxcount > list.count) |
194 | maxcount = list.count; |
196 | maxcount = list.count; |
195 | |
197 | |
196 | if (maxcount < list.count) { |
198 | if (maxcount < list.count) { |
197 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); |
199 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); |
198 | qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); |
200 | qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); |
199 | } |
201 | } |
200 | |
202 | |
201 | for(i=0; i<maxcount; i++) |
203 | for(i=0; i<maxcount; i++) |
202 | print_branch(list.refs[i]); |
204 | print_branch(list.refs[i]); |
203 | |
205 | |
204 | if (maxcount < list.count) |
206 | if (maxcount < list.count) |
205 | print_refs_link("heads"); |
207 | print_refs_link("heads"); |
206 | } |
208 | } |
207 | |
209 | |
208 | void cgit_print_tags(int maxcount) |
210 | void cgit_print_tags(int maxcount) |
209 | { |
211 | { |
210 | struct reflist list; |
212 | struct reflist list; |
211 | int i; |
213 | int i; |
212 | |
214 | |
213 | header = 0; |
215 | header = 0; |
214 | list.refs = NULL; |
216 | list.refs = NULL; |
215 | list.alloc = list.count = 0; |
217 | list.alloc = list.count = 0; |
216 | for_each_tag_ref(cgit_refs_cb, &list); |
218 | for_each_tag_ref(cgit_refs_cb, &list); |
217 | if (list.count == 0) |
219 | if (list.count == 0) |
218 | return; |
220 | return; |
219 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age); |
221 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age); |
220 | if (!maxcount) |
222 | if (!maxcount) |
221 | maxcount = list.count; |
223 | maxcount = list.count; |
222 | else if (maxcount > list.count) |
224 | else if (maxcount > list.count) |
223 | maxcount = list.count; |
225 | maxcount = list.count; |
224 | print_tag_header(); |
226 | print_tag_header(); |
225 | for(i=0; i<maxcount; i++) |
227 | for(i=0; i<maxcount; i++) |
226 | print_tag(list.refs[i]); |
228 | print_tag(list.refs[i]); |
227 | |
229 | |
228 | if (maxcount < list.count) |
230 | if (maxcount < list.count) |
229 | print_refs_link("tags"); |
231 | print_refs_link("tags"); |
230 | } |
232 | } |
231 | |
233 | |
232 | void cgit_print_refs() |
234 | void cgit_print_refs() |
233 | { |
235 | { |
234 | |
236 | |
235 | html("<table class='list nowrap'>"); |
237 | html("<table class='list nowrap'>"); |
236 | |
238 | |
237 | if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5)) |
239 | if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5)) |
238 | cgit_print_branches(0); |
240 | cgit_print_branches(0); |
239 | else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4)) |
241 | else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4)) |
|