summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h2
-rw-r--r--ui-summary.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/cgit.h b/cgit.h
index bb0e64c..a1fe527 100644
--- a/cgit.h
+++ b/cgit.h
@@ -190,81 +190,83 @@ extern int cgit_diff_files(const unsigned char *old_sha1,
190 linediff_fn fn); 190 linediff_fn fn);
191 191
192extern void cgit_diff_tree(const unsigned char *old_sha1, 192extern void cgit_diff_tree(const unsigned char *old_sha1,
193 const unsigned char *new_sha1, 193 const unsigned char *new_sha1,
194 filepair_fn fn, const char *prefix); 194 filepair_fn fn, const char *prefix);
195 195
196extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 196extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
197 197
198extern char *fmt(const char *format,...); 198extern char *fmt(const char *format,...);
199 199
200extern void html(const char *txt); 200extern void html(const char *txt);
201extern void htmlf(const char *format,...); 201extern void htmlf(const char *format,...);
202extern void html_txt(char *txt); 202extern void html_txt(char *txt);
203extern void html_ntxt(int len, char *txt); 203extern void html_ntxt(int len, char *txt);
204extern void html_attr(char *txt); 204extern void html_attr(char *txt);
205extern void html_hidden(char *name, char *value); 205extern void html_hidden(char *name, char *value);
206extern void html_link_open(char *url, char *title, char *class); 206extern void html_link_open(char *url, char *title, char *class);
207extern void html_link_close(void); 207extern void html_link_close(void);
208extern void html_filemode(unsigned short mode); 208extern void html_filemode(unsigned short mode);
209extern int html_include(const char *filename); 209extern int html_include(const char *filename);
210 210
211extern int cgit_read_config(const char *filename, configfn fn); 211extern int cgit_read_config(const char *filename, configfn fn);
212extern int cgit_parse_query(char *txt, configfn fn); 212extern int cgit_parse_query(char *txt, configfn fn);
213extern struct commitinfo *cgit_parse_commit(struct commit *commit); 213extern struct commitinfo *cgit_parse_commit(struct commit *commit);
214extern struct taginfo *cgit_parse_tag(struct tag *tag); 214extern struct taginfo *cgit_parse_tag(struct tag *tag);
215extern void cgit_parse_url(const char *url); 215extern void cgit_parse_url(const char *url);
216 216
217extern char *cache_safe_filename(const char *unsafe); 217extern char *cache_safe_filename(const char *unsafe);
218extern int cache_lock(struct cacheitem *item); 218extern int cache_lock(struct cacheitem *item);
219extern int cache_unlock(struct cacheitem *item); 219extern int cache_unlock(struct cacheitem *item);
220extern int cache_cancel_lock(struct cacheitem *item); 220extern int cache_cancel_lock(struct cacheitem *item);
221extern int cache_exist(struct cacheitem *item); 221extern int cache_exist(struct cacheitem *item);
222extern int cache_expired(struct cacheitem *item); 222extern int cache_expired(struct cacheitem *item);
223 223
224extern char *cgit_repourl(const char *reponame); 224extern char *cgit_repourl(const char *reponame);
225extern char *cgit_fileurl(const char *reponame, const char *pagename, 225extern char *cgit_fileurl(const char *reponame, const char *pagename,
226 const char *filename, const char *query); 226 const char *filename, const char *query);
227extern char *cgit_pageurl(const char *reponame, const char *pagename, 227extern char *cgit_pageurl(const char *reponame, const char *pagename,
228 const char *query); 228 const char *query);
229 229
230extern const char *cgit_repobasename(const char *reponame); 230extern const char *cgit_repobasename(const char *reponame);
231 231
232extern void cgit_tree_link(char *name, char *title, char *class, char *head, 232extern void cgit_tree_link(char *name, char *title, char *class, char *head,
233 char *rev, char *path); 233 char *rev, char *path);
234extern void cgit_log_link(char *name, char *title, char *class, char *head, 234extern void cgit_log_link(char *name, char *title, char *class, char *head,
235 char *rev, char *path, int ofs); 235 char *rev, char *path, int ofs);
236extern void cgit_commit_link(char *name, char *title, char *class, char *head, 236extern void cgit_commit_link(char *name, char *title, char *class, char *head,
237 char *rev); 237 char *rev);
238extern void cgit_snapshot_link(char *name, char *title, char *class, 238extern void cgit_snapshot_link(char *name, char *title, char *class,
239 char *head, char *rev, char *archivename); 239 char *head, char *rev, char *archivename);
240extern void cgit_diff_link(char *name, char *title, char *class, char *head, 240extern void cgit_diff_link(char *name, char *title, char *class, char *head,
241 char *new_rev, char *old_rev, char *path); 241 char *new_rev, char *old_rev, char *path);
242 242
243extern void cgit_object_link(struct object *obj); 243extern void cgit_object_link(struct object *obj);
244 244
245extern void cgit_print_error(char *msg); 245extern void cgit_print_error(char *msg);
246extern void cgit_print_date(time_t secs, char *format); 246extern void cgit_print_date(time_t secs, char *format);
247extern void cgit_print_age(time_t t, time_t max_relative, char *format); 247extern void cgit_print_age(time_t t, time_t max_relative, char *format);
248extern void cgit_print_docstart(char *title, struct cacheitem *item); 248extern void cgit_print_docstart(char *title, struct cacheitem *item);
249extern void cgit_print_docend(); 249extern void cgit_print_docend();
250extern void cgit_print_pageheader(char *title, int show_search); 250extern void cgit_print_pageheader(char *title, int show_search);
251extern void cgit_print_snapshot_start(const char *mimetype, 251extern void cgit_print_snapshot_start(const char *mimetype,
252 const char *filename, 252 const char *filename,
253 struct cacheitem *item); 253 struct cacheitem *item);
254extern void cgit_print_branches(int maxcount);
255extern void cgit_print_tags(int maxcount);
254 256
255extern void cgit_print_repolist(struct cacheitem *item); 257extern void cgit_print_repolist(struct cacheitem *item);
256extern void cgit_print_summary(); 258extern void cgit_print_summary();
257extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); 259extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager);
258extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); 260extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
259extern void cgit_print_tree(const char *rev, char *path); 261extern void cgit_print_tree(const char *rev, char *path);
260extern void cgit_print_commit(char *hex); 262extern void cgit_print_commit(char *hex);
261extern void cgit_print_tag(char *revname); 263extern void cgit_print_tag(char *revname);
262extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); 264extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);
263extern void cgit_print_snapshot(struct cacheitem *item, const char *head, 265extern void cgit_print_snapshot(struct cacheitem *item, const char *head,
264 const char *hex, const char *prefix, 266 const char *hex, const char *prefix,
265 const char *filename, int snapshot); 267 const char *filename, int snapshot);
266extern void cgit_print_snapshot_links(const char *repo, const char *head, 268extern void cgit_print_snapshot_links(const char *repo, const char *head,
267 const char *hex, int snapshots); 269 const char *hex, int snapshots);
268extern int cgit_parse_snapshots_mask(const char *str); 270extern int cgit_parse_snapshots_mask(const char *str);
269 271
270#endif /* CGIT_H */ 272#endif /* CGIT_H */
diff --git a/ui-summary.c b/ui-summary.c
index df79d01..97f1b57 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -105,141 +105,141 @@ static int print_tag(struct refinfo *ref)
105 html_txt(name); 105 html_txt(name);
106 html_link_close(); 106 html_link_close();
107 html("</td><td>"); 107 html("</td><td>");
108 if (info->tagger_date > 0) 108 if (info->tagger_date > 0)
109 cgit_print_age(info->tagger_date, -1, NULL); 109 cgit_print_age(info->tagger_date, -1, NULL);
110 html("</td><td>"); 110 html("</td><td>");
111 if (info->tagger) 111 if (info->tagger)
112 html(info->tagger); 112 html(info->tagger);
113 html("</td><td>"); 113 html("</td><td>");
114 cgit_object_link(tag->tagged); 114 cgit_object_link(tag->tagged);
115 html("</td></tr>\n"); 115 html("</td></tr>\n");
116 } else { 116 } else {
117 if (!header) 117 if (!header)
118 print_tag_header(); 118 print_tag_header();
119 html("<tr><td>"); 119 html("<tr><td>");
120 html_txt(name); 120 html_txt(name);
121 html("</td><td colspan='2'/><td>"); 121 html("</td><td colspan='2'/><td>");
122 cgit_object_link(ref->object); 122 cgit_object_link(ref->object);
123 html("</td></tr>\n"); 123 html("</td></tr>\n");
124 } 124 }
125 return 0; 125 return 0;
126} 126}
127 127
128static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, 128static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
129 int flags, void *cb_data) 129 int flags, void *cb_data)
130{ 130{
131 struct tag *tag; 131 struct tag *tag;
132 struct taginfo *info; 132 struct taginfo *info;
133 struct object *obj; 133 struct object *obj;
134 char buf[256], *url; 134 char buf[256], *url;
135 unsigned char fileid[20]; 135 unsigned char fileid[20];
136 136
137 if (prefixcmp(refname, "refs/archives")) 137 if (prefixcmp(refname, "refs/archives"))
138 return 0; 138 return 0;
139 strncpy(buf, refname+14, sizeof(buf)); 139 strncpy(buf, refname+14, sizeof(buf));
140 obj = parse_object(sha1); 140 obj = parse_object(sha1);
141 if (!obj) 141 if (!obj)
142 return 1; 142 return 1;
143 if (obj->type == OBJ_TAG) { 143 if (obj->type == OBJ_TAG) {
144 tag = lookup_tag(sha1); 144 tag = lookup_tag(sha1);
145 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) 145 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
146 return 0; 146 return 0;
147 hashcpy(fileid, tag->tagged->sha1); 147 hashcpy(fileid, tag->tagged->sha1);
148 } else if (obj->type != OBJ_BLOB) { 148 } else if (obj->type != OBJ_BLOB) {
149 return 0; 149 return 0;
150 } else { 150 } else {
151 hashcpy(fileid, sha1); 151 hashcpy(fileid, sha1);
152 } 152 }
153 if (!header) { 153 if (!header) {
154 html("<table id='downloads'>"); 154 html("<table id='downloads'>");
155 html("<tr><th>Downloads</th></tr>"); 155 html("<tr><th>Downloads</th></tr>");
156 header = 1; 156 header = 1;
157 } 157 }
158 html("<tr><td>"); 158 html("<tr><td>");
159 url = cgit_pageurl(cgit_query_repo, "blob", 159 url = cgit_pageurl(cgit_query_repo, "blob",
160 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid), 160 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
161 buf)); 161 buf));
162 html_link_open(url, NULL, NULL); 162 html_link_open(url, NULL, NULL);
163 html_txt(buf); 163 html_txt(buf);
164 html_link_close(); 164 html_link_close();
165 html("</td></tr>"); 165 html("</td></tr>");
166 return 0; 166 return 0;
167} 167}
168 168
169static void cgit_print_branches(int maxcount) 169void cgit_print_branches(int maxcount)
170{ 170{
171 struct reflist list; 171 struct reflist list;
172 int i; 172 int i;
173 173
174 html("<tr class='nohover'><th class='left'>Branch</th>" 174 html("<tr class='nohover'><th class='left'>Branch</th>"
175 "<th class='left'>Idle</th>" 175 "<th class='left'>Idle</th>"
176 "<th class='left'>Author</th>" 176 "<th class='left'>Author</th>"
177 "<th class='left'>Head commit</th></tr>\n"); 177 "<th class='left'>Head commit</th></tr>\n");
178 178
179 list.refs = NULL; 179 list.refs = NULL;
180 list.alloc = list.count = 0; 180 list.alloc = list.count = 0;
181 for_each_branch_ref(cgit_refs_cb, &list); 181 for_each_branch_ref(cgit_refs_cb, &list);
182 182
183 if (maxcount == 0 || maxcount > list.count) 183 if (maxcount == 0 || maxcount > list.count)
184 maxcount = list.count; 184 maxcount = list.count;
185 185
186 if (maxcount < list.count) { 186 if (maxcount < list.count) {
187 qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); 187 qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
188 qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); 188 qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
189 } 189 }
190 190
191 for(i=0; i<maxcount; i++) 191 for(i=0; i<maxcount; i++)
192 cgit_print_branch(list.refs[i]); 192 cgit_print_branch(list.refs[i]);
193} 193}
194 194
195static void cgit_print_tags(int maxcount) 195void cgit_print_tags(int maxcount)
196{ 196{
197 struct reflist list; 197 struct reflist list;
198 int i; 198 int i;
199 199
200 header = 0; 200 header = 0;
201 list.refs = NULL; 201 list.refs = NULL;
202 list.alloc = list.count = 0; 202 list.alloc = list.count = 0;
203 for_each_tag_ref(cgit_refs_cb, &list); 203 for_each_tag_ref(cgit_refs_cb, &list);
204 if (list.count == 0) 204 if (list.count == 0)
205 return; 205 return;
206 qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age); 206 qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age);
207 if (!maxcount) 207 if (!maxcount)
208 maxcount = list.count; 208 maxcount = list.count;
209 else if (maxcount > list.count) 209 else if (maxcount > list.count)
210 maxcount = list.count; 210 maxcount = list.count;
211 print_tag_header(); 211 print_tag_header();
212 for(i=0; i<maxcount; i++) 212 for(i=0; i<maxcount; i++)
213 print_tag(list.refs[i]); 213 print_tag(list.refs[i]);
214} 214}
215 215
216static void cgit_print_archives() 216static void cgit_print_archives()
217{ 217{
218 header = 0; 218 header = 0;
219 for_each_ref(cgit_print_archive_cb, NULL); 219 for_each_ref(cgit_print_archive_cb, NULL);
220 if (header) 220 if (header)
221 html("</table>"); 221 html("</table>");
222} 222}
223 223
224void cgit_print_summary() 224void cgit_print_summary()
225{ 225{
226 html("<div id='summary'>"); 226 html("<div id='summary'>");
227 cgit_print_archives(); 227 cgit_print_archives();
228 html("<h2>"); 228 html("<h2>");
229 html_txt(cgit_repo->name); 229 html_txt(cgit_repo->name);
230 html(" - "); 230 html(" - ");
231 html_txt(cgit_repo->desc); 231 html_txt(cgit_repo->desc);
232 html("</h2>"); 232 html("</h2>");
233 if (cgit_repo->readme) 233 if (cgit_repo->readme)
234 html_include(cgit_repo->readme); 234 html_include(cgit_repo->readme);
235 html("</div>"); 235 html("</div>");
236 if (cgit_summary_log > 0) 236 if (cgit_summary_log > 0)
237 cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0); 237 cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0);
238 html("<table class='list nowrap'>"); 238 html("<table class='list nowrap'>");
239 if (cgit_summary_log > 0) 239 if (cgit_summary_log > 0)
240 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 240 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
241 cgit_print_branches(cgit_summary_branches); 241 cgit_print_branches(cgit_summary_branches);
242 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>"); 242 html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
243 cgit_print_tags(cgit_summary_tags); 243 cgit_print_tags(cgit_summary_tags);
244 html("</table>"); 244 html("</table>");
245} 245}