author | Robin Redeker <elmex@ta-sa.org> | 2009-01-11 15:25:01 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 15:39:43 (UTC) |
commit | 372b4041bd117cf073082559e1f0160d75f57374 (patch) (unidiff) | |
tree | c4843a6edef658da195d662cc54ae09b257b9753 | |
parent | 5176db2e2bd221c5448a512514f9165258503a8e (diff) | |
download | cgit-372b4041bd117cf073082559e1f0160d75f57374.zip cgit-372b4041bd117cf073082559e1f0160d75f57374.tar.gz cgit-372b4041bd117cf073082559e1f0160d75f57374.tar.bz2 |
Make all tags viewable
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-refs.c | 2 | ||||
-rw-r--r-- | ui-tag.c | 11 |
2 files changed, 11 insertions, 2 deletions
@@ -78,129 +78,129 @@ static int print_branch(struct refinfo *ref) | |||
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 | cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); |
143 | html("</td><td>"); | 143 | html("</td><td>"); |
144 | if (ctx.repo->snapshots && (ref->object->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++) |
@@ -14,67 +14,76 @@ static void print_tag_content(char *buf) | |||
14 | { | 14 | { |
15 | char *p; | 15 | char *p; |
16 | 16 | ||
17 | if (!buf) | 17 | if (!buf) |
18 | return; | 18 | return; |
19 | 19 | ||
20 | html("<div class='commit-subject'>"); | 20 | html("<div class='commit-subject'>"); |
21 | p = strchr(buf, '\n'); | 21 | p = strchr(buf, '\n'); |
22 | if (p) | 22 | if (p) |
23 | *p = '\0'; | 23 | *p = '\0'; |
24 | html_txt(buf); | 24 | html_txt(buf); |
25 | html("</div>"); | 25 | html("</div>"); |
26 | if (p) { | 26 | if (p) { |
27 | html("<div class='commit-msg'>"); | 27 | html("<div class='commit-msg'>"); |
28 | html_txt(++p); | 28 | html_txt(++p); |
29 | html("</div>"); | 29 | html("</div>"); |
30 | } | 30 | } |
31 | } | 31 | } |
32 | 32 | ||
33 | void cgit_print_tag(char *revname) | 33 | void cgit_print_tag(char *revname) |
34 | { | 34 | { |
35 | unsigned char sha1[20]; | 35 | unsigned char sha1[20]; |
36 | struct object *obj; | 36 | struct object *obj; |
37 | struct tag *tag; | 37 | struct tag *tag; |
38 | struct taginfo *info; | 38 | struct taginfo *info; |
39 | 39 | ||
40 | if (get_sha1(revname, sha1)) { | 40 | if (get_sha1(revname, sha1)) { |
41 | cgit_print_error(fmt("Bad tag reference: %s", revname)); | 41 | cgit_print_error(fmt("Bad tag reference: %s", revname)); |
42 | return; | 42 | return; |
43 | } | 43 | } |
44 | obj = parse_object(sha1); | 44 | obj = parse_object(sha1); |
45 | if (!obj) { | 45 | if (!obj) { |
46 | cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1))); | 46 | cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1))); |
47 | return; | 47 | return; |
48 | } | 48 | } |
49 | if (obj->type == OBJ_TAG) { | 49 | if (obj->type == OBJ_TAG) { |
50 | tag = lookup_tag(sha1); | 50 | tag = lookup_tag(sha1); |
51 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) { | 51 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) { |
52 | cgit_print_error(fmt("Bad tag object: %s", revname)); | 52 | cgit_print_error(fmt("Bad tag object: %s", revname)); |
53 | return; | 53 | return; |
54 | } | 54 | } |
55 | html("<table class='commit-info'>\n"); | 55 | html("<table class='commit-info'>\n"); |
56 | htmlf("<tr><td>Tag name</td><td>"); | 56 | htmlf("<tr><td>Tag name</td><td>"); |
57 | html_txt(revname); | 57 | html_txt(revname); |
58 | htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1)); | 58 | htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1)); |
59 | if (info->tagger_date > 0) { | 59 | if (info->tagger_date > 0) { |
60 | html("<tr><td>Tag date</td><td>"); | 60 | html("<tr><td>Tag date</td><td>"); |
61 | cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); | 61 | cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); |
62 | html("</td></tr>\n"); | 62 | html("</td></tr>\n"); |
63 | } | 63 | } |
64 | if (info->tagger) { | 64 | if (info->tagger) { |
65 | html("<tr><td>Tagged by</td><td>"); | 65 | html("<tr><td>Tagged by</td><td>"); |
66 | html_txt(info->tagger); | 66 | html_txt(info->tagger); |
67 | if (info->tagger_email) { | 67 | if (info->tagger_email) { |
68 | html(" "); | 68 | html(" "); |
69 | html_txt(info->tagger_email); | 69 | html_txt(info->tagger_email); |
70 | } | 70 | } |
71 | html("</td></tr>\n"); | 71 | html("</td></tr>\n"); |
72 | } | 72 | } |
73 | html("<tr><td>Tagged object</td><td>"); | 73 | html("<tr><td>Tagged object</td><td>"); |
74 | cgit_object_link(tag->tagged); | 74 | cgit_object_link(tag->tagged); |
75 | html("</td></tr>\n"); | 75 | html("</td></tr>\n"); |
76 | html("</table>\n"); | 76 | html("</table>\n"); |
77 | print_tag_content(info->msg); | 77 | print_tag_content(info->msg); |
78 | } | 78 | } else { |
79 | html("<table class='commit-info'>\n"); | ||
80 | htmlf("<tr><td>Tag name</td><td>"); | ||
81 | html_txt(revname); | ||
82 | html("</td></tr>\n"); | ||
83 | html("<tr><td>Tagged object</td><td>"); | ||
84 | cgit_object_link(obj); | ||
85 | html("</td></tr>\n"); | ||
86 | html("</table>\n"); | ||
87 | } | ||
79 | return; | 88 | return; |
80 | } | 89 | } |