author | Lars Hjemli <hjemli@gmail.com> | 2009-08-23 20:58:39 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 08:22:58 (UTC) |
commit | e7af002d5c405c82652f739d08ced3908d1f57e7 (patch) (unidiff) | |
tree | 1e31e5dd8d33ca4a8392c4d6207b2ff6bf8a0d76 /cgit.h | |
parent | 50d5af3adcdd90424b70e9472af24356ed50aa9b (diff) | |
download | cgit-e7af002d5c405c82652f739d08ced3908d1f57e7.zip cgit-e7af002d5c405c82652f739d08ced3908d1f57e7.tar.gz cgit-e7af002d5c405c82652f739d08ced3908d1f57e7.tar.bz2 |
Introduce 'section' as canonical spelling for 'repo.group'
The 'repo.' prefix should be reserved for repo-specific options, but
the option 'repo.group' must still be honored to stay backwards
compatible.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -20,193 +20,193 @@ | |||
20 | #include <xdiff/xdiff.h> | 20 | #include <xdiff/xdiff.h> |
21 | #include <utf8.h> | 21 | #include <utf8.h> |
22 | 22 | ||
23 | 23 | ||
24 | /* | 24 | /* |
25 | * Dateformats used on misc. pages | 25 | * Dateformats used on misc. pages |
26 | */ | 26 | */ |
27 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" | 27 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
28 | #define FMT_SHORTDATE "%Y-%m-%d" | 28 | #define FMT_SHORTDATE "%Y-%m-%d" |
29 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" | 29 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" |
30 | 30 | ||
31 | 31 | ||
32 | /* | 32 | /* |
33 | * Limits used for relative dates | 33 | * Limits used for relative dates |
34 | */ | 34 | */ |
35 | #define TM_MIN 60 | 35 | #define TM_MIN 60 |
36 | #define TM_HOUR (TM_MIN * 60) | 36 | #define TM_HOUR (TM_MIN * 60) |
37 | #define TM_DAY (TM_HOUR * 24) | 37 | #define TM_DAY (TM_HOUR * 24) |
38 | #define TM_WEEK (TM_DAY * 7) | 38 | #define TM_WEEK (TM_DAY * 7) |
39 | #define TM_YEAR (TM_DAY * 365) | 39 | #define TM_YEAR (TM_DAY * 365) |
40 | #define TM_MONTH (TM_YEAR / 12.0) | 40 | #define TM_MONTH (TM_YEAR / 12.0) |
41 | 41 | ||
42 | 42 | ||
43 | /* | 43 | /* |
44 | * Default encoding | 44 | * Default encoding |
45 | */ | 45 | */ |
46 | #define PAGE_ENCODING "UTF-8" | 46 | #define PAGE_ENCODING "UTF-8" |
47 | 47 | ||
48 | typedef void (*configfn)(const char *name, const char *value); | 48 | typedef void (*configfn)(const char *name, const char *value); |
49 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 49 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
50 | typedef void (*linediff_fn)(char *line, int len); | 50 | typedef void (*linediff_fn)(char *line, int len); |
51 | 51 | ||
52 | struct cgit_filter { | 52 | struct cgit_filter { |
53 | char *cmd; | 53 | char *cmd; |
54 | char **argv; | 54 | char **argv; |
55 | int old_stdout; | 55 | int old_stdout; |
56 | int pipe_fh[2]; | 56 | int pipe_fh[2]; |
57 | int pid; | 57 | int pid; |
58 | int exitstatus; | 58 | int exitstatus; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | struct cgit_repo { | 61 | struct cgit_repo { |
62 | char *url; | 62 | char *url; |
63 | char *name; | 63 | char *name; |
64 | char *path; | 64 | char *path; |
65 | char *desc; | 65 | char *desc; |
66 | char *owner; | 66 | char *owner; |
67 | char *defbranch; | 67 | char *defbranch; |
68 | char *group; | ||
69 | char *module_link; | 68 | char *module_link; |
70 | char *readme; | 69 | char *readme; |
70 | char *section; | ||
71 | char *clone_url; | 71 | char *clone_url; |
72 | int snapshots; | 72 | int snapshots; |
73 | int enable_log_filecount; | 73 | int enable_log_filecount; |
74 | int enable_log_linecount; | 74 | int enable_log_linecount; |
75 | int max_stats; | 75 | int max_stats; |
76 | time_t mtime; | 76 | time_t mtime; |
77 | struct cgit_filter *about_filter; | 77 | struct cgit_filter *about_filter; |
78 | struct cgit_filter *commit_filter; | 78 | struct cgit_filter *commit_filter; |
79 | struct cgit_filter *source_filter; | 79 | struct cgit_filter *source_filter; |
80 | }; | 80 | }; |
81 | 81 | ||
82 | struct cgit_repolist { | 82 | struct cgit_repolist { |
83 | int length; | 83 | int length; |
84 | int count; | 84 | int count; |
85 | struct cgit_repo *repos; | 85 | struct cgit_repo *repos; |
86 | }; | 86 | }; |
87 | 87 | ||
88 | struct commitinfo { | 88 | struct commitinfo { |
89 | struct commit *commit; | 89 | struct commit *commit; |
90 | char *author; | 90 | char *author; |
91 | char *author_email; | 91 | char *author_email; |
92 | unsigned long author_date; | 92 | unsigned long author_date; |
93 | char *committer; | 93 | char *committer; |
94 | char *committer_email; | 94 | char *committer_email; |
95 | unsigned long committer_date; | 95 | unsigned long committer_date; |
96 | char *subject; | 96 | char *subject; |
97 | char *msg; | 97 | char *msg; |
98 | char *msg_encoding; | 98 | char *msg_encoding; |
99 | }; | 99 | }; |
100 | 100 | ||
101 | struct taginfo { | 101 | struct taginfo { |
102 | char *tagger; | 102 | char *tagger; |
103 | char *tagger_email; | 103 | char *tagger_email; |
104 | unsigned long tagger_date; | 104 | unsigned long tagger_date; |
105 | char *msg; | 105 | char *msg; |
106 | }; | 106 | }; |
107 | 107 | ||
108 | struct refinfo { | 108 | struct refinfo { |
109 | const char *refname; | 109 | const char *refname; |
110 | struct object *object; | 110 | struct object *object; |
111 | union { | 111 | union { |
112 | struct taginfo *tag; | 112 | struct taginfo *tag; |
113 | struct commitinfo *commit; | 113 | struct commitinfo *commit; |
114 | }; | 114 | }; |
115 | }; | 115 | }; |
116 | 116 | ||
117 | struct reflist { | 117 | struct reflist { |
118 | struct refinfo **refs; | 118 | struct refinfo **refs; |
119 | int alloc; | 119 | int alloc; |
120 | int count; | 120 | int count; |
121 | }; | 121 | }; |
122 | 122 | ||
123 | struct cgit_query { | 123 | struct cgit_query { |
124 | int has_symref; | 124 | int has_symref; |
125 | int has_sha1; | 125 | int has_sha1; |
126 | char *raw; | 126 | char *raw; |
127 | char *repo; | 127 | char *repo; |
128 | char *page; | 128 | char *page; |
129 | char *search; | 129 | char *search; |
130 | char *grep; | 130 | char *grep; |
131 | char *head; | 131 | char *head; |
132 | char *sha1; | 132 | char *sha1; |
133 | char *sha2; | 133 | char *sha2; |
134 | char *path; | 134 | char *path; |
135 | char *name; | 135 | char *name; |
136 | char *mimetype; | 136 | char *mimetype; |
137 | char *url; | 137 | char *url; |
138 | char *period; | 138 | char *period; |
139 | int ofs; | 139 | int ofs; |
140 | int nohead; | 140 | int nohead; |
141 | char *sort; | 141 | char *sort; |
142 | int showmsg; | 142 | int showmsg; |
143 | }; | 143 | }; |
144 | 144 | ||
145 | struct cgit_config { | 145 | struct cgit_config { |
146 | char *agefile; | 146 | char *agefile; |
147 | char *cache_root; | 147 | char *cache_root; |
148 | char *clone_prefix; | 148 | char *clone_prefix; |
149 | char *css; | 149 | char *css; |
150 | char *favicon; | 150 | char *favicon; |
151 | char *footer; | 151 | char *footer; |
152 | char *head_include; | 152 | char *head_include; |
153 | char *header; | 153 | char *header; |
154 | char *index_header; | 154 | char *index_header; |
155 | char *index_info; | 155 | char *index_info; |
156 | char *logo; | 156 | char *logo; |
157 | char *logo_link; | 157 | char *logo_link; |
158 | char *module_link; | 158 | char *module_link; |
159 | char *repo_group; | ||
160 | char *robots; | 159 | char *robots; |
161 | char *root_title; | 160 | char *root_title; |
162 | char *root_desc; | 161 | char *root_desc; |
163 | char *root_readme; | 162 | char *root_readme; |
164 | char *script_name; | 163 | char *script_name; |
164 | char *section; | ||
165 | char *virtual_root; | 165 | char *virtual_root; |
166 | int cache_size; | 166 | int cache_size; |
167 | int cache_dynamic_ttl; | 167 | int cache_dynamic_ttl; |
168 | int cache_max_create_time; | 168 | int cache_max_create_time; |
169 | int cache_repo_ttl; | 169 | int cache_repo_ttl; |
170 | int cache_root_ttl; | 170 | int cache_root_ttl; |
171 | int cache_scanrc_ttl; | 171 | int cache_scanrc_ttl; |
172 | int cache_static_ttl; | 172 | int cache_static_ttl; |
173 | int embedded; | 173 | int embedded; |
174 | int enable_index_links; | 174 | int enable_index_links; |
175 | int enable_log_filecount; | 175 | int enable_log_filecount; |
176 | int enable_log_linecount; | 176 | int enable_log_linecount; |
177 | int local_time; | 177 | int local_time; |
178 | int max_repo_count; | 178 | int max_repo_count; |
179 | int max_commit_count; | 179 | int max_commit_count; |
180 | int max_lock_attempts; | 180 | int max_lock_attempts; |
181 | int max_msg_len; | 181 | int max_msg_len; |
182 | int max_repodesc_len; | 182 | int max_repodesc_len; |
183 | int max_stats; | 183 | int max_stats; |
184 | int nocache; | 184 | int nocache; |
185 | int noplainemail; | 185 | int noplainemail; |
186 | int noheader; | 186 | int noheader; |
187 | int renamelimit; | 187 | int renamelimit; |
188 | int snapshots; | 188 | int snapshots; |
189 | int summary_branches; | 189 | int summary_branches; |
190 | int summary_log; | 190 | int summary_log; |
191 | int summary_tags; | 191 | int summary_tags; |
192 | struct string_list mimetypes; | 192 | struct string_list mimetypes; |
193 | struct cgit_filter *about_filter; | 193 | struct cgit_filter *about_filter; |
194 | struct cgit_filter *commit_filter; | 194 | struct cgit_filter *commit_filter; |
195 | struct cgit_filter *source_filter; | 195 | struct cgit_filter *source_filter; |
196 | }; | 196 | }; |
197 | 197 | ||
198 | struct cgit_page { | 198 | struct cgit_page { |
199 | time_t modified; | 199 | time_t modified; |
200 | time_t expires; | 200 | time_t expires; |
201 | size_t size; | 201 | size_t size; |
202 | char *mimetype; | 202 | char *mimetype; |
203 | char *charset; | 203 | char *charset; |
204 | char *filename; | 204 | char *filename; |
205 | char *etag; | 205 | char *etag; |
206 | char *title; | 206 | char *title; |
207 | int status; | 207 | int status; |
208 | char *statusmsg; | 208 | char *statusmsg; |
209 | }; | 209 | }; |
210 | 210 | ||
211 | struct cgit_environment { | 211 | struct cgit_environment { |
212 | char *cgit_config; | 212 | char *cgit_config; |