author | Lars Hjemli <hjemli@gmail.com> | 2007-07-22 21:57:48 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-07-22 21:57:56 (UTC) |
commit | 1d4aaff696ee1b9085dda0f0f3d84d9d20d96db0 (patch) (unidiff) | |
tree | 6674c5168d967c3efdbf8f445e7e975d54e43629 /cgit.h | |
parent | 4e9107abfe8d3edff17826875b417bcf40dc7390 (diff) | |
parent | d6b01dac856efda565d4085e77826fd9ac83348a (diff) | |
download | cgit-1d4aaff696ee1b9085dda0f0f3d84d9d20d96db0.zip cgit-1d4aaff696ee1b9085dda0f0f3d84d9d20d96db0.tar.gz cgit-1d4aaff696ee1b9085dda0f0f3d84d9d20d96db0.tar.bz2 |
Merge branch 'master' of git://git.klever.net/patchwork/cgit
* 'master' of git://git.klever.net/patchwork/cgit:
link raw blob from tree file view
fix: changed view link to blob in summary.
allow selective enabling of snapshots
shorten snapshot names to repo basename
introduce cgit_repobasename
added snapshot filename to the link
add plain uncompressed tar snapshort format
introduced .tar.bz2 snapshots
compress .tar.gz using gzip as a filter
added a chk_non_negative check
css: adjust vertical-align of commit info th cells
add support for snapshot tarballs
Conflicts:
ui-summary.c
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -144,32 +144,33 @@ extern char *cgit_query_head; | |||
144 | extern char *cgit_query_sha1; | 144 | extern char *cgit_query_sha1; |
145 | extern char *cgit_query_sha2; | 145 | extern char *cgit_query_sha2; |
146 | extern char *cgit_query_path; | 146 | extern char *cgit_query_path; |
147 | extern char *cgit_query_name; | 147 | extern char *cgit_query_name; |
148 | extern int cgit_query_ofs; | 148 | extern int cgit_query_ofs; |
149 | 149 | ||
150 | extern int htmlfd; | 150 | extern int htmlfd; |
151 | 151 | ||
152 | extern int cgit_get_cmd_index(const char *cmd); | 152 | extern int cgit_get_cmd_index(const char *cmd); |
153 | extern struct repoinfo *cgit_get_repoinfo(const char *url); | 153 | extern struct repoinfo *cgit_get_repoinfo(const char *url); |
154 | extern void cgit_global_config_cb(const char *name, const char *value); | 154 | extern void cgit_global_config_cb(const char *name, const char *value); |
155 | extern void cgit_repo_config_cb(const char *name, const char *value); | 155 | extern void cgit_repo_config_cb(const char *name, const char *value); |
156 | extern void cgit_querystring_cb(const char *name, const char *value); | 156 | extern void cgit_querystring_cb(const char *name, const char *value); |
157 | 157 | ||
158 | extern int chk_zero(int result, char *msg); | 158 | extern int chk_zero(int result, char *msg); |
159 | extern int chk_positive(int result, char *msg); | 159 | extern int chk_positive(int result, char *msg); |
160 | extern int chk_non_negative(int result, char *msg); | ||
160 | 161 | ||
161 | extern int hextoint(char c); | 162 | extern int hextoint(char c); |
162 | extern char *trim_end(const char *str, char c); | 163 | extern char *trim_end(const char *str, char c); |
163 | 164 | ||
164 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 165 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
165 | 166 | ||
166 | extern int cgit_diff_files(const unsigned char *old_sha1, | 167 | extern int cgit_diff_files(const unsigned char *old_sha1, |
167 | const unsigned char *new_sha1, | 168 | const unsigned char *new_sha1, |
168 | linediff_fn fn); | 169 | linediff_fn fn); |
169 | 170 | ||
170 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 171 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
171 | const unsigned char *new_sha1, | 172 | const unsigned char *new_sha1, |
172 | filepair_fn fn); | 173 | filepair_fn fn); |
173 | 174 | ||
174 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 175 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
175 | 176 | ||
@@ -187,53 +188,59 @@ extern void html_filemode(unsigned short mode); | |||
187 | extern int html_include(const char *filename); | 188 | extern int html_include(const char *filename); |
188 | 189 | ||
189 | extern int cgit_read_config(const char *filename, configfn fn); | 190 | extern int cgit_read_config(const char *filename, configfn fn); |
190 | extern int cgit_parse_query(char *txt, configfn fn); | 191 | extern int cgit_parse_query(char *txt, configfn fn); |
191 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 192 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
192 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 193 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
193 | extern void cgit_parse_url(const char *url); | 194 | extern void cgit_parse_url(const char *url); |
194 | 195 | ||
195 | extern char *cache_safe_filename(const char *unsafe); | 196 | extern char *cache_safe_filename(const char *unsafe); |
196 | extern int cache_lock(struct cacheitem *item); | 197 | extern int cache_lock(struct cacheitem *item); |
197 | extern int cache_unlock(struct cacheitem *item); | 198 | extern int cache_unlock(struct cacheitem *item); |
198 | extern int cache_cancel_lock(struct cacheitem *item); | 199 | extern int cache_cancel_lock(struct cacheitem *item); |
199 | extern int cache_exist(struct cacheitem *item); | 200 | extern int cache_exist(struct cacheitem *item); |
200 | extern int cache_expired(struct cacheitem *item); | 201 | extern int cache_expired(struct cacheitem *item); |
201 | 202 | ||
202 | extern char *cgit_repourl(const char *reponame); | 203 | extern char *cgit_repourl(const char *reponame); |
204 | extern char *cgit_fileurl(const char *reponame, const char *pagename, | ||
205 | const char *filename, const char *query); | ||
203 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 206 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
204 | const char *query); | 207 | const char *query); |
205 | 208 | ||
209 | extern const char *cgit_repobasename(const char *reponame); | ||
210 | |||
206 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, | 211 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
207 | char *rev, char *path); | 212 | char *rev, char *path); |
208 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 213 | extern void cgit_log_link(char *name, char *title, char *class, char *head, |
209 | char *rev, char *path, int ofs); | 214 | char *rev, char *path, int ofs); |
210 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 215 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
211 | char *rev); | 216 | char *rev); |
212 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 217 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
213 | char *new_rev, char *old_rev, char *path); | 218 | char *new_rev, char *old_rev, char *path); |
214 | 219 | ||
215 | extern void cgit_object_link(struct object *obj); | 220 | extern void cgit_object_link(struct object *obj); |
216 | 221 | ||
217 | extern void cgit_print_error(char *msg); | 222 | extern void cgit_print_error(char *msg); |
218 | extern void cgit_print_date(time_t secs, char *format); | 223 | extern void cgit_print_date(time_t secs, char *format); |
219 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); | 224 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); |
220 | extern void cgit_print_docstart(char *title, struct cacheitem *item); | 225 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
221 | extern void cgit_print_docend(); | 226 | extern void cgit_print_docend(); |
222 | extern void cgit_print_pageheader(char *title, int show_search); | 227 | extern void cgit_print_pageheader(char *title, int show_search); |
223 | extern void cgit_print_snapshot_start(const char *mimetype, | 228 | extern void cgit_print_snapshot_start(const char *mimetype, |
224 | const char *filename, | 229 | const char *filename, |
225 | struct cacheitem *item); | 230 | struct cacheitem *item); |
226 | 231 | ||
227 | extern void cgit_print_repolist(struct cacheitem *item); | 232 | extern void cgit_print_repolist(struct cacheitem *item); |
228 | extern void cgit_print_summary(); | 233 | extern void cgit_print_summary(); |
229 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); | 234 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); |
230 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); | 235 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); |
231 | extern void cgit_print_tree(const char *rev, char *path); | 236 | extern void cgit_print_tree(const char *rev, char *path); |
232 | extern void cgit_print_commit(char *hex); | 237 | extern void cgit_print_commit(char *hex); |
233 | extern void cgit_print_tag(char *revname); | 238 | extern void cgit_print_tag(char *revname); |
234 | extern void cgit_print_diff(const char *new_hex, const char *old_hex); | 239 | extern void cgit_print_diff(const char *new_hex, const char *old_hex); |
235 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, | 240 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, |
236 | const char *format, const char *prefix, | 241 | const char *prefix, const char *filename, |
237 | const char *filename); | 242 | int snapshot); |
243 | extern void cgit_print_snapshot_links(const char *repo, const char *hex,int snapshots); | ||
244 | extern int cgit_parse_snapshots_mask(const char *str); | ||
238 | 245 | ||
239 | #endif /* CGIT_H */ | 246 | #endif /* CGIT_H */ |