author | Lars Hjemli <hjemli@gmail.com> | 2008-12-01 20:56:07 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-01 21:01:10 (UTC) |
commit | 6596268576a4f5fe2f5c8a3238856b0fb205ff76 (patch) (unidiff) | |
tree | 9cd8a7b68a6aeea9aa44e7b25dacc8f9cdc918f1 | |
parent | b9053a4ff04fef90d1b9ab3f813ae3fcee63a8c3 (diff) | |
download | cgit-6596268576a4f5fe2f5c8a3238856b0fb205ff76.zip cgit-6596268576a4f5fe2f5c8a3238856b0fb205ff76.tar.gz cgit-6596268576a4f5fe2f5c8a3238856b0fb205ff76.tar.bz2 |
ui-refs.c: show download links for all tags referring to commit objects
The snapshot function has only been linked to from the commit page while
users often would want to download a certain release. With this patch,
direct download links will now be printed for each tagged release on the
repo summary page.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-refs.c | 37 |
1 files changed, 34 insertions, 3 deletions
@@ -17,163 +17,194 @@ static int cmp_age(int age1, int age2) | |||
17 | if (age1 != 0 && age2 != 0) | 17 | if (age1 != 0 && age2 != 0) |
18 | return age2 - age1; | 18 | return age2 - age1; |
19 | 19 | ||
20 | if (age1 == 0 && age2 == 0) | 20 | if (age1 == 0 && age2 == 0) |
21 | return 0; | 21 | return 0; |
22 | 22 | ||
23 | if (age1 == 0) | 23 | if (age1 == 0) |
24 | return +1; | 24 | return +1; |
25 | 25 | ||
26 | return -1; | 26 | return -1; |
27 | } | 27 | } |
28 | 28 | ||
29 | static int cmp_ref_name(const void *a, const void *b) | 29 | static int cmp_ref_name(const void *a, const void *b) |
30 | { | 30 | { |
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 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'>Download</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 void print_tag_downloads(const struct cgit_repo *repo, const char *ref) | ||
88 | { | ||
89 | const struct cgit_snapshot_format* f; | ||
90 | char *filename; | ||
91 | const char *basename; | ||
92 | |||
93 | if (!ref || strlen(ref) < 2) | ||
94 | return; | ||
95 | |||
96 | basename = cgit_repobasename(repo->url); | ||
97 | if (prefixcmp(ref, basename) != 0) { | ||
98 | if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1])) | ||
99 | ref++; | ||
100 | if (isdigit(ref[0])) | ||
101 | ref = xstrdup(fmt("%s-%s", basename, ref)); | ||
102 | } | ||
103 | |||
104 | for (f = cgit_snapshot_formats; f->suffix; f++) { | ||
105 | if (!(repo->snapshots & f->bit)) | ||
106 | continue; | ||
107 | filename = fmt("%s%s", ref, f->suffix); | ||
108 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); | ||
109 | html(" "); | ||
110 | } | ||
111 | } | ||
87 | static int print_tag(struct refinfo *ref) | 112 | static int print_tag(struct refinfo *ref) |
88 | { | 113 | { |
89 | struct tag *tag; | 114 | struct tag *tag; |
90 | struct taginfo *info; | 115 | struct taginfo *info; |
91 | char *name = (char *)ref->refname; | 116 | char *name = (char *)ref->refname; |
92 | 117 | ||
93 | if (ref->object->type == OBJ_TAG) { | 118 | if (ref->object->type == OBJ_TAG) { |
94 | tag = (struct tag *)ref->object; | 119 | tag = (struct tag *)ref->object; |
95 | info = ref->tag; | 120 | info = ref->tag; |
96 | if (!tag || !info) | 121 | if (!tag || !info) |
97 | return 1; | 122 | return 1; |
98 | html("<tr><td>"); | 123 | html("<tr><td>"); |
99 | cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); | 124 | cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); |
100 | html("</td><td>"); | 125 | html("</td><td>"); |
101 | cgit_object_link(tag->tagged); | 126 | if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) |
127 | print_tag_downloads(ctx.repo, name); | ||
128 | else | ||
129 | cgit_object_link(tag->tagged); | ||
102 | html("</td><td>"); | 130 | html("</td><td>"); |
103 | if (info->tagger) | 131 | if (info->tagger) |
104 | html(info->tagger); | 132 | html(info->tagger); |
105 | html("</td><td colspan='2'>"); | 133 | html("</td><td colspan='2'>"); |
106 | if (info->tagger_date > 0) | 134 | if (info->tagger_date > 0) |
107 | cgit_print_age(info->tagger_date, -1, NULL); | 135 | cgit_print_age(info->tagger_date, -1, NULL); |
108 | html("</td></tr>\n"); | 136 | html("</td></tr>\n"); |
109 | } else { | 137 | } else { |
110 | if (!header) | 138 | if (!header) |
111 | print_tag_header(); | 139 | print_tag_header(); |
112 | html("<tr><td>"); | 140 | html("<tr><td>"); |
113 | html_txt(name); | 141 | html_txt(name); |
114 | html("</td><td>"); | 142 | html("</td><td>"); |
115 | cgit_object_link(ref->object); | 143 | if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) |
144 | print_tag_downloads(ctx.repo, name); | ||
145 | else | ||
146 | cgit_object_link(ref->object); | ||
116 | html("</td></tr>\n"); | 147 | html("</td></tr>\n"); |
117 | } | 148 | } |
118 | return 0; | 149 | return 0; |
119 | } | 150 | } |
120 | 151 | ||
121 | static void print_refs_link(char *path) | 152 | static void print_refs_link(char *path) |
122 | { | 153 | { |
123 | html("<tr class='nohover'><td colspan='4'>"); | 154 | html("<tr class='nohover'><td colspan='4'>"); |
124 | cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); | 155 | cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path); |
125 | html("</td></tr>"); | 156 | html("</td></tr>"); |
126 | } | 157 | } |
127 | 158 | ||
128 | void cgit_print_branches(int maxcount) | 159 | void cgit_print_branches(int maxcount) |
129 | { | 160 | { |
130 | struct reflist list; | 161 | struct reflist list; |
131 | int i; | 162 | int i; |
132 | 163 | ||
133 | html("<tr class='nohover'><th class='left'>Branch</th>" | 164 | html("<tr class='nohover'><th class='left'>Branch</th>" |
134 | "<th class='left'>Commit message</th>" | 165 | "<th class='left'>Commit message</th>" |
135 | "<th class='left'>Author</th>" | 166 | "<th class='left'>Author</th>" |
136 | "<th class='left' colspan='2'>Age</th></tr>\n"); | 167 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
137 | 168 | ||
138 | list.refs = NULL; | 169 | list.refs = NULL; |
139 | list.alloc = list.count = 0; | 170 | list.alloc = list.count = 0; |
140 | for_each_branch_ref(cgit_refs_cb, &list); | 171 | for_each_branch_ref(cgit_refs_cb, &list); |
141 | 172 | ||
142 | if (maxcount == 0 || maxcount > list.count) | 173 | if (maxcount == 0 || maxcount > list.count) |
143 | maxcount = list.count; | 174 | maxcount = list.count; |
144 | 175 | ||
145 | if (maxcount < list.count) { | 176 | if (maxcount < list.count) { |
146 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); | 177 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); |
147 | qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); | 178 | qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); |
148 | } | 179 | } |
149 | 180 | ||
150 | for(i=0; i<maxcount; i++) | 181 | for(i=0; i<maxcount; i++) |
151 | print_branch(list.refs[i]); | 182 | print_branch(list.refs[i]); |
152 | 183 | ||
153 | if (maxcount < list.count) | 184 | if (maxcount < list.count) |
154 | print_refs_link("heads"); | 185 | print_refs_link("heads"); |
155 | } | 186 | } |
156 | 187 | ||
157 | void cgit_print_tags(int maxcount) | 188 | void cgit_print_tags(int maxcount) |
158 | { | 189 | { |
159 | struct reflist list; | 190 | struct reflist list; |
160 | int i; | 191 | int i; |
161 | 192 | ||
162 | header = 0; | 193 | header = 0; |
163 | list.refs = NULL; | 194 | list.refs = NULL; |
164 | list.alloc = list.count = 0; | 195 | list.alloc = list.count = 0; |
165 | for_each_tag_ref(cgit_refs_cb, &list); | 196 | for_each_tag_ref(cgit_refs_cb, &list); |
166 | if (list.count == 0) | 197 | if (list.count == 0) |
167 | return; | 198 | return; |
168 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age); | 199 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age); |
169 | if (!maxcount) | 200 | if (!maxcount) |
170 | maxcount = list.count; | 201 | maxcount = list.count; |
171 | else if (maxcount > list.count) | 202 | else if (maxcount > list.count) |
172 | maxcount = list.count; | 203 | maxcount = list.count; |
173 | print_tag_header(); | 204 | print_tag_header(); |
174 | for(i=0; i<maxcount; i++) | 205 | for(i=0; i<maxcount; i++) |
175 | print_tag(list.refs[i]); | 206 | print_tag(list.refs[i]); |
176 | 207 | ||
177 | if (maxcount < list.count) | 208 | if (maxcount < list.count) |
178 | print_refs_link("tags"); | 209 | print_refs_link("tags"); |
179 | } | 210 | } |