author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:15:48 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:15:48 (UTC) |
commit | 37a24e4e39737edaa5cdde501346a65eeb280e63 (patch) (unidiff) | |
tree | ff23eb0d57edf108edd1aa3e64a8d6cf70062954 /cgit.h | |
parent | 47187b33be1c3de43fbed6f350ab05bc978aacd0 (diff) | |
parent | a2cbd3c30b64a26b52b2003ba6569f3c083f4092 (diff) | |
download | cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.zip cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.gz cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.bz2 |
Merge branch 'jh/path-limit'
Conflicts:
cgit.h
ui-commit.c
-rw-r--r-- | cgit.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -86,128 +86,129 @@ typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, | |||
86 | 86 | ||
87 | struct cgit_repolist { | 87 | struct cgit_repolist { |
88 | int length; | 88 | int length; |
89 | int count; | 89 | int count; |
90 | struct cgit_repo *repos; | 90 | struct cgit_repo *repos; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | struct commitinfo { | 93 | struct commitinfo { |
94 | struct commit *commit; | 94 | struct commit *commit; |
95 | char *author; | 95 | char *author; |
96 | char *author_email; | 96 | char *author_email; |
97 | unsigned long author_date; | 97 | unsigned long author_date; |
98 | char *committer; | 98 | char *committer; |
99 | char *committer_email; | 99 | char *committer_email; |
100 | unsigned long committer_date; | 100 | unsigned long committer_date; |
101 | char *subject; | 101 | char *subject; |
102 | char *msg; | 102 | char *msg; |
103 | char *msg_encoding; | 103 | char *msg_encoding; |
104 | }; | 104 | }; |
105 | 105 | ||
106 | struct taginfo { | 106 | struct taginfo { |
107 | char *tagger; | 107 | char *tagger; |
108 | char *tagger_email; | 108 | char *tagger_email; |
109 | unsigned long tagger_date; | 109 | unsigned long tagger_date; |
110 | char *msg; | 110 | char *msg; |
111 | }; | 111 | }; |
112 | 112 | ||
113 | struct refinfo { | 113 | struct refinfo { |
114 | const char *refname; | 114 | const char *refname; |
115 | struct object *object; | 115 | struct object *object; |
116 | union { | 116 | union { |
117 | struct taginfo *tag; | 117 | struct taginfo *tag; |
118 | struct commitinfo *commit; | 118 | struct commitinfo *commit; |
119 | }; | 119 | }; |
120 | }; | 120 | }; |
121 | 121 | ||
122 | struct reflist { | 122 | struct reflist { |
123 | struct refinfo **refs; | 123 | struct refinfo **refs; |
124 | int alloc; | 124 | int alloc; |
125 | int count; | 125 | int count; |
126 | }; | 126 | }; |
127 | 127 | ||
128 | struct cgit_query { | 128 | struct cgit_query { |
129 | int has_symref; | 129 | int has_symref; |
130 | int has_sha1; | 130 | int has_sha1; |
131 | char *raw; | 131 | char *raw; |
132 | char *repo; | 132 | char *repo; |
133 | char *page; | 133 | char *page; |
134 | char *search; | 134 | char *search; |
135 | char *grep; | 135 | char *grep; |
136 | char *head; | 136 | char *head; |
137 | char *sha1; | 137 | char *sha1; |
138 | char *sha2; | 138 | char *sha2; |
139 | char *path; | 139 | char *path; |
140 | char *name; | 140 | char *name; |
141 | char *mimetype; | 141 | char *mimetype; |
142 | char *url; | 142 | char *url; |
143 | char *period; | 143 | char *period; |
144 | int ofs; | 144 | int ofs; |
145 | int nohead; | 145 | int nohead; |
146 | char *sort; | 146 | char *sort; |
147 | int showmsg; | 147 | int showmsg; |
148 | int ssdiff; | 148 | int ssdiff; |
149 | int show_all; | 149 | int show_all; |
150 | char *vpath; | ||
150 | }; | 151 | }; |
151 | 152 | ||
152 | struct cgit_config { | 153 | struct cgit_config { |
153 | char *agefile; | 154 | char *agefile; |
154 | char *cache_root; | 155 | char *cache_root; |
155 | char *clone_prefix; | 156 | char *clone_prefix; |
156 | char *css; | 157 | char *css; |
157 | char *favicon; | 158 | char *favicon; |
158 | char *footer; | 159 | char *footer; |
159 | char *head_include; | 160 | char *head_include; |
160 | char *header; | 161 | char *header; |
161 | char *index_header; | 162 | char *index_header; |
162 | char *index_info; | 163 | char *index_info; |
163 | char *logo; | 164 | char *logo; |
164 | char *logo_link; | 165 | char *logo_link; |
165 | char *module_link; | 166 | char *module_link; |
166 | char *robots; | 167 | char *robots; |
167 | char *root_title; | 168 | char *root_title; |
168 | char *root_desc; | 169 | char *root_desc; |
169 | char *root_readme; | 170 | char *root_readme; |
170 | char *script_name; | 171 | char *script_name; |
171 | char *section; | 172 | char *section; |
172 | char *virtual_root; | 173 | char *virtual_root; |
173 | int cache_size; | 174 | int cache_size; |
174 | int cache_dynamic_ttl; | 175 | int cache_dynamic_ttl; |
175 | int cache_max_create_time; | 176 | int cache_max_create_time; |
176 | int cache_repo_ttl; | 177 | int cache_repo_ttl; |
177 | int cache_root_ttl; | 178 | int cache_root_ttl; |
178 | int cache_scanrc_ttl; | 179 | int cache_scanrc_ttl; |
179 | int cache_static_ttl; | 180 | int cache_static_ttl; |
180 | int embedded; | 181 | int embedded; |
181 | int enable_filter_overrides; | 182 | int enable_filter_overrides; |
182 | int enable_index_links; | 183 | int enable_index_links; |
183 | int enable_log_filecount; | 184 | int enable_log_filecount; |
184 | int enable_log_linecount; | 185 | int enable_log_linecount; |
185 | int enable_remote_branches; | 186 | int enable_remote_branches; |
186 | int enable_subject_links; | 187 | int enable_subject_links; |
187 | int enable_tree_linenumbers; | 188 | int enable_tree_linenumbers; |
188 | int local_time; | 189 | int local_time; |
189 | int max_atom_items; | 190 | int max_atom_items; |
190 | int max_repo_count; | 191 | int max_repo_count; |
191 | int max_commit_count; | 192 | int max_commit_count; |
192 | int max_lock_attempts; | 193 | int max_lock_attempts; |
193 | int max_msg_len; | 194 | int max_msg_len; |
194 | int max_repodesc_len; | 195 | int max_repodesc_len; |
195 | int max_blob_size; | 196 | int max_blob_size; |
196 | int max_stats; | 197 | int max_stats; |
197 | int nocache; | 198 | int nocache; |
198 | int noplainemail; | 199 | int noplainemail; |
199 | int noheader; | 200 | int noheader; |
200 | int renamelimit; | 201 | int renamelimit; |
201 | int snapshots; | 202 | int snapshots; |
202 | int summary_branches; | 203 | int summary_branches; |
203 | int summary_log; | 204 | int summary_log; |
204 | int summary_tags; | 205 | int summary_tags; |
205 | int ssdiff; | 206 | int ssdiff; |
206 | struct string_list mimetypes; | 207 | struct string_list mimetypes; |
207 | struct cgit_filter *about_filter; | 208 | struct cgit_filter *about_filter; |
208 | struct cgit_filter *commit_filter; | 209 | struct cgit_filter *commit_filter; |
209 | struct cgit_filter *source_filter; | 210 | struct cgit_filter *source_filter; |
210 | }; | 211 | }; |
211 | 212 | ||
212 | struct cgit_page { | 213 | struct cgit_page { |
213 | time_t modified; | 214 | time_t modified; |