author | Lars Hjemli <hjemli@gmail.com> | 2007-06-29 18:32:08 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-29 18:32:08 (UTC) |
commit | 16a3d2779ccd56bf7954d98da547247d8796544b (patch) (unidiff) | |
tree | 86d2ed41adc3de842c7518d614ea49ca0200e4d2 /cgit.h | |
parent | f69250358a74efa5d7d9c562b2cdd80fad1430f1 (diff) | |
parent | 103940fe6b0914dc42b8b033d1d328f38135ca5f (diff) | |
download | cgit-16a3d2779ccd56bf7954d98da547247d8796544b.zip cgit-16a3d2779ccd56bf7954d98da547247d8796544b.tar.gz cgit-16a3d2779ccd56bf7954d98da547247d8796544b.tar.bz2 |
Merge branch 'lh/menu'
* lh/menu:
Add ofs argument to cgit_log_link and use it in ui-log.c
Add trim_end() and use it to remove trailing slashes from repo paths
Do not include current path in the "tree" menu link
Add setting to enable/disable extra links on index page
Change S/L/T to summary/log/tree
Change "files" to "tree"
Include querystring as part of cached filename for repo summary page
Add more menuitems on repo pages
-rw-r--r-- | cgit.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -115,12 +115,13 @@ extern char *cgit_virtual_root; | |||
115 | extern char *cgit_script_name; | 115 | extern char *cgit_script_name; |
116 | extern char *cgit_cache_root; | 116 | extern char *cgit_cache_root; |
117 | extern char *cgit_repo_group; | 117 | extern char *cgit_repo_group; |
118 | 118 | ||
119 | extern int cgit_nocache; | 119 | extern int cgit_nocache; |
120 | extern int cgit_snapshots; | 120 | extern int cgit_snapshots; |
121 | extern int cgit_enable_index_links; | ||
121 | extern int cgit_enable_log_filecount; | 122 | extern int cgit_enable_log_filecount; |
122 | extern int cgit_enable_log_linecount; | 123 | extern int cgit_enable_log_linecount; |
123 | extern int cgit_max_lock_attempts; | 124 | extern int cgit_max_lock_attempts; |
124 | extern int cgit_cache_root_ttl; | 125 | extern int cgit_cache_root_ttl; |
125 | extern int cgit_cache_repo_ttl; | 126 | extern int cgit_cache_repo_ttl; |
126 | extern int cgit_cache_dynamic_ttl; | 127 | extern int cgit_cache_dynamic_ttl; |
@@ -155,12 +156,13 @@ extern void cgit_repo_config_cb(const char *name, const char *value); | |||
155 | extern void cgit_querystring_cb(const char *name, const char *value); | 156 | extern void cgit_querystring_cb(const char *name, const char *value); |
156 | 157 | ||
157 | extern int chk_zero(int result, char *msg); | 158 | extern int chk_zero(int result, char *msg); |
158 | extern int chk_positive(int result, char *msg); | 159 | extern int chk_positive(int result, char *msg); |
159 | 160 | ||
160 | extern int hextoint(char c); | 161 | extern int hextoint(char c); |
162 | extern char *trim_end(const char *str, char c); | ||
161 | 163 | ||
162 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 164 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
163 | 165 | ||
164 | extern int cgit_diff_files(const unsigned char *old_sha1, | 166 | extern int cgit_diff_files(const unsigned char *old_sha1, |
165 | const unsigned char *new_sha1, | 167 | const unsigned char *new_sha1, |
166 | linediff_fn fn); | 168 | linediff_fn fn); |
@@ -201,13 +203,13 @@ extern char *cgit_repourl(const char *reponame); | |||
201 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 203 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
202 | const char *query); | 204 | const char *query); |
203 | 205 | ||
204 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, | 206 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
205 | char *rev, char *path); | 207 | char *rev, char *path); |
206 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 208 | extern void cgit_log_link(char *name, char *title, char *class, char *head, |
207 | char *rev, char *path); | 209 | char *rev, char *path, int ofs); |
208 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 210 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
209 | char *rev); | 211 | char *rev); |
210 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 212 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
211 | char *new_rev, char *old_rev, char *path); | 213 | char *new_rev, char *old_rev, char *path); |
212 | 214 | ||
213 | extern void cgit_print_error(char *msg); | 215 | extern void cgit_print_error(char *msg); |