author | Lars Hjemli <hjemli@gmail.com> | 2007-10-27 08:55:10 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-10-27 08:55:10 (UTC) |
commit | dd0f27eb36e737261b57d6ebcbd9fe20e559470d (patch) (unidiff) | |
tree | 4729ecc84e0b24b044131546ff39bdd55a6cd9a6 /cgit.h | |
parent | 47bae9f58d5ecae437767b8e7835b23ad1804d0b (diff) | |
parent | ac1f493b6bbc589327e9ba3303f112fcd323c6b6 (diff) | |
download | cgit-dd0f27eb36e737261b57d6ebcbd9fe20e559470d.zip cgit-dd0f27eb36e737261b57d6ebcbd9fe20e559470d.tar.gz cgit-dd0f27eb36e737261b57d6ebcbd9fe20e559470d.tar.bz2 |
Merge branch 'filter-refs'
* filter-refs:
Add links to the new refs page from summary page
Add support for refs view
Make cgit_print_branches()/cgit_print_tags() external
Add descriptions of summary-branches and summary-tags to cgitrc
Add support for config param summary-branches
Move logic for age comparision from cmp_tag_age into cmp_age()
Add support for config param summary-tags
Sort tags by age
Use reflist to print tag info
Use reflist to print branch info
Add functions and types for ref lists
-rw-r--r-- | cgit.h | 27 |
1 files changed, 27 insertions, 0 deletions
@@ -1,62 +1,63 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <git-compat-util.h> | 5 | #include <git-compat-util.h> |
6 | #include <cache.h> | 6 | #include <cache.h> |
7 | #include <grep.h> | 7 | #include <grep.h> |
8 | #include <object.h> | 8 | #include <object.h> |
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff/xdiff.h> | 18 | #include <xdiff/xdiff.h> |
19 | 19 | ||
20 | 20 | ||
21 | /* | 21 | /* |
22 | * The valid cgit repo-commands | 22 | * The valid cgit repo-commands |
23 | */ | 23 | */ |
24 | #define CMD_LOG 1 | 24 | #define CMD_LOG 1 |
25 | #define CMD_COMMIT 2 | 25 | #define CMD_COMMIT 2 |
26 | #define CMD_DIFF 3 | 26 | #define CMD_DIFF 3 |
27 | #define CMD_TREE 4 | 27 | #define CMD_TREE 4 |
28 | #define CMD_BLOB 5 | 28 | #define CMD_BLOB 5 |
29 | #define CMD_SNAPSHOT 6 | 29 | #define CMD_SNAPSHOT 6 |
30 | #define CMD_TAG 7 | 30 | #define CMD_TAG 7 |
31 | #define CMD_REFS 8 | ||
31 | 32 | ||
32 | /* | 33 | /* |
33 | * Dateformats used on misc. pages | 34 | * Dateformats used on misc. pages |
34 | */ | 35 | */ |
35 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" | 36 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" |
36 | #define FMT_SHORTDATE "%Y-%m-%d" | 37 | #define FMT_SHORTDATE "%Y-%m-%d" |
37 | 38 | ||
38 | 39 | ||
39 | /* | 40 | /* |
40 | * Limits used for relative dates | 41 | * Limits used for relative dates |
41 | */ | 42 | */ |
42 | #define TM_MIN 60 | 43 | #define TM_MIN 60 |
43 | #define TM_HOUR (TM_MIN * 60) | 44 | #define TM_HOUR (TM_MIN * 60) |
44 | #define TM_DAY (TM_HOUR * 24) | 45 | #define TM_DAY (TM_HOUR * 24) |
45 | #define TM_WEEK (TM_DAY * 7) | 46 | #define TM_WEEK (TM_DAY * 7) |
46 | #define TM_YEAR (TM_DAY * 365) | 47 | #define TM_YEAR (TM_DAY * 365) |
47 | #define TM_MONTH (TM_YEAR / 12.0) | 48 | #define TM_MONTH (TM_YEAR / 12.0) |
48 | 49 | ||
49 | 50 | ||
50 | typedef void (*configfn)(const char *name, const char *value); | 51 | typedef void (*configfn)(const char *name, const char *value); |
51 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 52 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
52 | typedef void (*linediff_fn)(char *line, int len); | 53 | typedef void (*linediff_fn)(char *line, int len); |
53 | 54 | ||
54 | struct cacheitem { | 55 | struct cacheitem { |
55 | char *name; | 56 | char *name; |
56 | struct stat st; | 57 | struct stat st; |
57 | int ttl; | 58 | int ttl; |
58 | int fd; | 59 | int fd; |
59 | }; | 60 | }; |
60 | 61 | ||
61 | struct repoinfo { | 62 | struct repoinfo { |
62 | char *url; | 63 | char *url; |
@@ -69,181 +70,207 @@ struct repoinfo { | |||
69 | char *module_link; | 70 | char *module_link; |
70 | char *readme; | 71 | char *readme; |
71 | int snapshots; | 72 | int snapshots; |
72 | int enable_log_filecount; | 73 | int enable_log_filecount; |
73 | int enable_log_linecount; | 74 | int enable_log_linecount; |
74 | }; | 75 | }; |
75 | 76 | ||
76 | struct repolist { | 77 | struct repolist { |
77 | int length; | 78 | int length; |
78 | int count; | 79 | int count; |
79 | struct repoinfo *repos; | 80 | struct repoinfo *repos; |
80 | }; | 81 | }; |
81 | 82 | ||
82 | struct commitinfo { | 83 | struct commitinfo { |
83 | struct commit *commit; | 84 | struct commit *commit; |
84 | char *author; | 85 | char *author; |
85 | char *author_email; | 86 | char *author_email; |
86 | unsigned long author_date; | 87 | unsigned long author_date; |
87 | char *committer; | 88 | char *committer; |
88 | char *committer_email; | 89 | char *committer_email; |
89 | unsigned long committer_date; | 90 | unsigned long committer_date; |
90 | char *subject; | 91 | char *subject; |
91 | char *msg; | 92 | char *msg; |
92 | }; | 93 | }; |
93 | 94 | ||
94 | struct taginfo { | 95 | struct taginfo { |
95 | char *tagger; | 96 | char *tagger; |
96 | char *tagger_email; | 97 | char *tagger_email; |
97 | int tagger_date; | 98 | int tagger_date; |
98 | char *msg; | 99 | char *msg; |
99 | }; | 100 | }; |
100 | 101 | ||
102 | struct refinfo { | ||
103 | const char *refname; | ||
104 | struct object *object; | ||
105 | union { | ||
106 | struct taginfo *tag; | ||
107 | struct commitinfo *commit; | ||
108 | }; | ||
109 | }; | ||
110 | |||
111 | struct reflist { | ||
112 | struct refinfo **refs; | ||
113 | int alloc; | ||
114 | int count; | ||
115 | }; | ||
116 | |||
101 | extern const char *cgit_version; | 117 | extern const char *cgit_version; |
102 | 118 | ||
103 | extern struct repolist cgit_repolist; | 119 | extern struct repolist cgit_repolist; |
104 | extern struct repoinfo *cgit_repo; | 120 | extern struct repoinfo *cgit_repo; |
105 | extern int cgit_cmd; | 121 | extern int cgit_cmd; |
106 | 122 | ||
107 | extern char *cgit_root_title; | 123 | extern char *cgit_root_title; |
108 | extern char *cgit_css; | 124 | extern char *cgit_css; |
109 | extern char *cgit_logo; | 125 | extern char *cgit_logo; |
110 | extern char *cgit_index_header; | 126 | extern char *cgit_index_header; |
111 | extern char *cgit_logo_link; | 127 | extern char *cgit_logo_link; |
112 | extern char *cgit_module_link; | 128 | extern char *cgit_module_link; |
113 | extern char *cgit_agefile; | 129 | extern char *cgit_agefile; |
114 | extern char *cgit_virtual_root; | 130 | extern char *cgit_virtual_root; |
115 | extern char *cgit_script_name; | 131 | extern char *cgit_script_name; |
116 | extern char *cgit_cache_root; | 132 | extern char *cgit_cache_root; |
117 | extern char *cgit_repo_group; | 133 | extern char *cgit_repo_group; |
118 | 134 | ||
119 | extern int cgit_nocache; | 135 | extern int cgit_nocache; |
120 | extern int cgit_snapshots; | 136 | extern int cgit_snapshots; |
121 | extern int cgit_enable_index_links; | 137 | extern int cgit_enable_index_links; |
122 | extern int cgit_enable_log_filecount; | 138 | extern int cgit_enable_log_filecount; |
123 | extern int cgit_enable_log_linecount; | 139 | extern int cgit_enable_log_linecount; |
124 | extern int cgit_max_lock_attempts; | 140 | extern int cgit_max_lock_attempts; |
125 | extern int cgit_cache_root_ttl; | 141 | extern int cgit_cache_root_ttl; |
126 | extern int cgit_cache_repo_ttl; | 142 | extern int cgit_cache_repo_ttl; |
127 | extern int cgit_cache_dynamic_ttl; | 143 | extern int cgit_cache_dynamic_ttl; |
128 | extern int cgit_cache_static_ttl; | 144 | extern int cgit_cache_static_ttl; |
129 | extern int cgit_cache_max_create_time; | 145 | extern int cgit_cache_max_create_time; |
130 | extern int cgit_summary_log; | 146 | extern int cgit_summary_log; |
147 | extern int cgit_summary_tags; | ||
148 | extern int cgit_summary_branches; | ||
131 | 149 | ||
132 | extern int cgit_max_msg_len; | 150 | extern int cgit_max_msg_len; |
133 | extern int cgit_max_repodesc_len; | 151 | extern int cgit_max_repodesc_len; |
134 | extern int cgit_max_commit_count; | 152 | extern int cgit_max_commit_count; |
135 | 153 | ||
136 | extern int cgit_query_has_symref; | 154 | extern int cgit_query_has_symref; |
137 | extern int cgit_query_has_sha1; | 155 | extern int cgit_query_has_sha1; |
138 | 156 | ||
139 | extern char *cgit_querystring; | 157 | extern char *cgit_querystring; |
140 | extern char *cgit_query_repo; | 158 | extern char *cgit_query_repo; |
141 | extern char *cgit_query_page; | 159 | extern char *cgit_query_page; |
142 | extern char *cgit_query_search; | 160 | extern char *cgit_query_search; |
143 | extern char *cgit_query_head; | 161 | extern char *cgit_query_head; |
144 | extern char *cgit_query_sha1; | 162 | extern char *cgit_query_sha1; |
145 | extern char *cgit_query_sha2; | 163 | extern char *cgit_query_sha2; |
146 | extern char *cgit_query_path; | 164 | extern char *cgit_query_path; |
147 | extern char *cgit_query_name; | 165 | extern char *cgit_query_name; |
148 | extern int cgit_query_ofs; | 166 | extern int cgit_query_ofs; |
149 | 167 | ||
150 | extern int htmlfd; | 168 | extern int htmlfd; |
151 | 169 | ||
152 | extern int cgit_get_cmd_index(const char *cmd); | 170 | extern int cgit_get_cmd_index(const char *cmd); |
153 | extern struct repoinfo *cgit_get_repoinfo(const char *url); | 171 | extern struct repoinfo *cgit_get_repoinfo(const char *url); |
154 | extern void cgit_global_config_cb(const char *name, const char *value); | 172 | 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); | 173 | extern void cgit_repo_config_cb(const char *name, const char *value); |
156 | extern void cgit_querystring_cb(const char *name, const char *value); | 174 | extern void cgit_querystring_cb(const char *name, const char *value); |
157 | 175 | ||
158 | extern int chk_zero(int result, char *msg); | 176 | extern int chk_zero(int result, char *msg); |
159 | extern int chk_positive(int result, char *msg); | 177 | extern int chk_positive(int result, char *msg); |
160 | extern int chk_non_negative(int result, char *msg); | 178 | extern int chk_non_negative(int result, char *msg); |
161 | 179 | ||
162 | extern int hextoint(char c); | 180 | extern int hextoint(char c); |
163 | extern char *trim_end(const char *str, char c); | 181 | extern char *trim_end(const char *str, char c); |
164 | 182 | ||
183 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | ||
184 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | ||
185 | int flags, void *cb_data); | ||
186 | |||
165 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 187 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
166 | 188 | ||
167 | extern int cgit_diff_files(const unsigned char *old_sha1, | 189 | extern int cgit_diff_files(const unsigned char *old_sha1, |
168 | const unsigned char *new_sha1, | 190 | const unsigned char *new_sha1, |
169 | linediff_fn fn); | 191 | linediff_fn fn); |
170 | 192 | ||
171 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 193 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
172 | const unsigned char *new_sha1, | 194 | const unsigned char *new_sha1, |
173 | filepair_fn fn, const char *prefix); | 195 | filepair_fn fn, const char *prefix); |
174 | 196 | ||
175 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 197 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
176 | 198 | ||
177 | extern char *fmt(const char *format,...); | 199 | extern char *fmt(const char *format,...); |
178 | 200 | ||
179 | extern void html(const char *txt); | 201 | extern void html(const char *txt); |
180 | extern void htmlf(const char *format,...); | 202 | extern void htmlf(const char *format,...); |
181 | extern void html_txt(char *txt); | 203 | extern void html_txt(char *txt); |
182 | extern void html_ntxt(int len, char *txt); | 204 | extern void html_ntxt(int len, char *txt); |
183 | extern void html_attr(char *txt); | 205 | extern void html_attr(char *txt); |
184 | extern void html_hidden(char *name, char *value); | 206 | extern void html_hidden(char *name, char *value); |
185 | extern void html_link_open(char *url, char *title, char *class); | 207 | extern void html_link_open(char *url, char *title, char *class); |
186 | extern void html_link_close(void); | 208 | extern void html_link_close(void); |
187 | extern void html_filemode(unsigned short mode); | 209 | extern void html_filemode(unsigned short mode); |
188 | extern int html_include(const char *filename); | 210 | extern int html_include(const char *filename); |
189 | 211 | ||
190 | extern int cgit_read_config(const char *filename, configfn fn); | 212 | extern int cgit_read_config(const char *filename, configfn fn); |
191 | extern int cgit_parse_query(char *txt, configfn fn); | 213 | extern int cgit_parse_query(char *txt, configfn fn); |
192 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 214 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
193 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 215 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
194 | extern void cgit_parse_url(const char *url); | 216 | extern void cgit_parse_url(const char *url); |
195 | 217 | ||
196 | extern char *cache_safe_filename(const char *unsafe); | 218 | extern char *cache_safe_filename(const char *unsafe); |
197 | extern int cache_lock(struct cacheitem *item); | 219 | extern int cache_lock(struct cacheitem *item); |
198 | extern int cache_unlock(struct cacheitem *item); | 220 | extern int cache_unlock(struct cacheitem *item); |
199 | extern int cache_cancel_lock(struct cacheitem *item); | 221 | extern int cache_cancel_lock(struct cacheitem *item); |
200 | extern int cache_exist(struct cacheitem *item); | 222 | extern int cache_exist(struct cacheitem *item); |
201 | extern int cache_expired(struct cacheitem *item); | 223 | extern int cache_expired(struct cacheitem *item); |
202 | 224 | ||
203 | extern char *cgit_repourl(const char *reponame); | 225 | extern char *cgit_repourl(const char *reponame); |
204 | extern char *cgit_fileurl(const char *reponame, const char *pagename, | 226 | extern char *cgit_fileurl(const char *reponame, const char *pagename, |
205 | const char *filename, const char *query); | 227 | const char *filename, const char *query); |
206 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 228 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
207 | const char *query); | 229 | const char *query); |
208 | 230 | ||
209 | extern const char *cgit_repobasename(const char *reponame); | 231 | extern const char *cgit_repobasename(const char *reponame); |
210 | 232 | ||
211 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, | 233 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
212 | char *rev, char *path); | 234 | char *rev, char *path); |
213 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 235 | extern void cgit_log_link(char *name, char *title, char *class, char *head, |
214 | char *rev, char *path, int ofs); | 236 | char *rev, char *path, int ofs); |
215 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 237 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
216 | char *rev); | 238 | char *rev); |
239 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, | ||
240 | char *rev, char *path); | ||
217 | extern void cgit_snapshot_link(char *name, char *title, char *class, | 241 | extern void cgit_snapshot_link(char *name, char *title, char *class, |
218 | char *head, char *rev, char *archivename); | 242 | char *head, char *rev, char *archivename); |
219 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 243 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
220 | char *new_rev, char *old_rev, char *path); | 244 | char *new_rev, char *old_rev, char *path); |
221 | 245 | ||
222 | extern void cgit_object_link(struct object *obj); | 246 | extern void cgit_object_link(struct object *obj); |
223 | 247 | ||
224 | extern void cgit_print_error(char *msg); | 248 | extern void cgit_print_error(char *msg); |
225 | extern void cgit_print_date(time_t secs, char *format); | 249 | extern void cgit_print_date(time_t secs, char *format); |
226 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); | 250 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); |
227 | extern void cgit_print_docstart(char *title, struct cacheitem *item); | 251 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
228 | extern void cgit_print_docend(); | 252 | extern void cgit_print_docend(); |
229 | extern void cgit_print_pageheader(char *title, int show_search); | 253 | extern void cgit_print_pageheader(char *title, int show_search); |
230 | extern void cgit_print_snapshot_start(const char *mimetype, | 254 | extern void cgit_print_snapshot_start(const char *mimetype, |
231 | const char *filename, | 255 | const char *filename, |
232 | struct cacheitem *item); | 256 | struct cacheitem *item); |
257 | extern void cgit_print_branches(int maxcount); | ||
258 | extern void cgit_print_tags(int maxcount); | ||
233 | 259 | ||
234 | extern void cgit_print_repolist(struct cacheitem *item); | 260 | extern void cgit_print_repolist(struct cacheitem *item); |
235 | extern void cgit_print_summary(); | 261 | extern void cgit_print_summary(); |
236 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); | 262 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager); |
237 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); | 263 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); |
238 | extern void cgit_print_tree(const char *rev, char *path); | 264 | extern void cgit_print_tree(const char *rev, char *path); |
239 | extern void cgit_print_commit(char *hex); | 265 | extern void cgit_print_commit(char *hex); |
266 | extern void cgit_print_refs(); | ||
240 | extern void cgit_print_tag(char *revname); | 267 | extern void cgit_print_tag(char *revname); |
241 | extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); | 268 | extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); |
242 | extern void cgit_print_snapshot(struct cacheitem *item, const char *head, | 269 | extern void cgit_print_snapshot(struct cacheitem *item, const char *head, |
243 | const char *hex, const char *prefix, | 270 | const char *hex, const char *prefix, |
244 | const char *filename, int snapshot); | 271 | const char *filename, int snapshot); |
245 | extern void cgit_print_snapshot_links(const char *repo, const char *head, | 272 | extern void cgit_print_snapshot_links(const char *repo, const char *head, |
246 | const char *hex, int snapshots); | 273 | const char *hex, int snapshots); |
247 | extern int cgit_parse_snapshots_mask(const char *str); | 274 | extern int cgit_parse_snapshots_mask(const char *str); |
248 | 275 | ||
249 | #endif /* CGIT_H */ | 276 | #endif /* CGIT_H */ |