author | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:32:48 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:32:48 (UTC) |
commit | f4f6210b4f9c214dc247567bbd06b1135c9ecd06 (patch) (unidiff) | |
tree | 432b3dc327e05220c6ac0aff9ca81cf38a47524c /cgit.h | |
parent | 57bb4fdb8419d7c250d4c6146910df3263943951 (diff) | |
parent | 735e15e38a484bf0daa98776fa7cde270a271cda (diff) | |
download | cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.zip cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.gz cgit-f4f6210b4f9c214dc247567bbd06b1135c9ecd06.tar.bz2 |
Merge branch 'ro/ssdiff'
-rw-r--r-- | cgit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -122,48 +122,49 @@ struct reflist { | |||
122 | int alloc; | 122 | int alloc; |
123 | int count; | 123 | int count; |
124 | }; | 124 | }; |
125 | 125 | ||
126 | struct cgit_query { | 126 | struct cgit_query { |
127 | int has_symref; | 127 | int has_symref; |
128 | int has_sha1; | 128 | int has_sha1; |
129 | char *raw; | 129 | char *raw; |
130 | char *repo; | 130 | char *repo; |
131 | char *page; | 131 | char *page; |
132 | char *search; | 132 | char *search; |
133 | char *grep; | 133 | char *grep; |
134 | char *head; | 134 | char *head; |
135 | char *sha1; | 135 | char *sha1; |
136 | char *sha2; | 136 | char *sha2; |
137 | char *path; | 137 | char *path; |
138 | char *name; | 138 | char *name; |
139 | char *mimetype; | 139 | char *mimetype; |
140 | char *url; | 140 | char *url; |
141 | char *period; | 141 | char *period; |
142 | int ofs; | 142 | int ofs; |
143 | int nohead; | 143 | int nohead; |
144 | char *sort; | 144 | char *sort; |
145 | int showmsg; | 145 | int showmsg; |
146 | int ssdiff; | ||
146 | }; | 147 | }; |
147 | 148 | ||
148 | struct cgit_config { | 149 | struct cgit_config { |
149 | char *agefile; | 150 | char *agefile; |
150 | char *cache_root; | 151 | char *cache_root; |
151 | char *clone_prefix; | 152 | char *clone_prefix; |
152 | char *css; | 153 | char *css; |
153 | char *favicon; | 154 | char *favicon; |
154 | char *footer; | 155 | char *footer; |
155 | char *head_include; | 156 | char *head_include; |
156 | char *header; | 157 | char *header; |
157 | char *index_header; | 158 | char *index_header; |
158 | char *index_info; | 159 | char *index_info; |
159 | char *logo; | 160 | char *logo; |
160 | char *logo_link; | 161 | char *logo_link; |
161 | char *module_link; | 162 | char *module_link; |
162 | char *robots; | 163 | char *robots; |
163 | char *root_title; | 164 | char *root_title; |
164 | char *root_desc; | 165 | char *root_desc; |
165 | char *root_readme; | 166 | char *root_readme; |
166 | char *script_name; | 167 | char *script_name; |
167 | char *section; | 168 | char *section; |
168 | char *virtual_root; | 169 | char *virtual_root; |
169 | int cache_size; | 170 | int cache_size; |
@@ -174,48 +175,49 @@ struct cgit_config { | |||
174 | int cache_scanrc_ttl; | 175 | int cache_scanrc_ttl; |
175 | int cache_static_ttl; | 176 | int cache_static_ttl; |
176 | int embedded; | 177 | int embedded; |
177 | int enable_filter_overrides; | 178 | int enable_filter_overrides; |
178 | int enable_index_links; | 179 | int enable_index_links; |
179 | int enable_log_filecount; | 180 | int enable_log_filecount; |
180 | int enable_log_linecount; | 181 | int enable_log_linecount; |
181 | int enable_tree_linenumbers; | 182 | int enable_tree_linenumbers; |
182 | int local_time; | 183 | int local_time; |
183 | int max_repo_count; | 184 | int max_repo_count; |
184 | int max_commit_count; | 185 | int max_commit_count; |
185 | int max_lock_attempts; | 186 | int max_lock_attempts; |
186 | int max_msg_len; | 187 | int max_msg_len; |
187 | int max_repodesc_len; | 188 | int max_repodesc_len; |
188 | int max_blob_size; | 189 | int max_blob_size; |
189 | int max_stats; | 190 | int max_stats; |
190 | int nocache; | 191 | int nocache; |
191 | int noplainemail; | 192 | int noplainemail; |
192 | int noheader; | 193 | int noheader; |
193 | int renamelimit; | 194 | int renamelimit; |
194 | int snapshots; | 195 | int snapshots; |
195 | int summary_branches; | 196 | int summary_branches; |
196 | int summary_log; | 197 | int summary_log; |
197 | int summary_tags; | 198 | int summary_tags; |
199 | int ssdiff; | ||
198 | struct string_list mimetypes; | 200 | struct string_list mimetypes; |
199 | struct cgit_filter *about_filter; | 201 | struct cgit_filter *about_filter; |
200 | struct cgit_filter *commit_filter; | 202 | struct cgit_filter *commit_filter; |
201 | struct cgit_filter *source_filter; | 203 | struct cgit_filter *source_filter; |
202 | }; | 204 | }; |
203 | 205 | ||
204 | struct cgit_page { | 206 | struct cgit_page { |
205 | time_t modified; | 207 | time_t modified; |
206 | time_t expires; | 208 | time_t expires; |
207 | size_t size; | 209 | size_t size; |
208 | char *mimetype; | 210 | char *mimetype; |
209 | char *charset; | 211 | char *charset; |
210 | char *filename; | 212 | char *filename; |
211 | char *etag; | 213 | char *etag; |
212 | char *title; | 214 | char *title; |
213 | int status; | 215 | int status; |
214 | char *statusmsg; | 216 | char *statusmsg; |
215 | }; | 217 | }; |
216 | 218 | ||
217 | struct cgit_environment { | 219 | struct cgit_environment { |
218 | char *cgit_config; | 220 | char *cgit_config; |
219 | char *http_host; | 221 | char *http_host; |
220 | char *https; | 222 | char *https; |
221 | char *no_http; | 223 | char *no_http; |