author | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:34:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:34:30 (UTC) |
commit | 4e75d7c9b93010663963d362099777b77a67c446 (patch) (unidiff) | |
tree | b36c95b774e31bd4bb3bcde0123d6522719b7a5a /cgit.h | |
parent | f4f6210b4f9c214dc247567bbd06b1135c9ecd06 (diff) | |
parent | 41934a3222cd3e5a5f214e4275929519c70d311d (diff) | |
download | cgit-4e75d7c9b93010663963d362099777b77a67c446.zip cgit-4e75d7c9b93010663963d362099777b77a67c446.tar.gz cgit-4e75d7c9b93010663963d362099777b77a67c446.tar.bz2 |
Merge branch 'lh/remote-branches'
-rw-r--r-- | cgit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -59,32 +59,33 @@ struct cgit_filter { | |||
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 *module_link; | 68 | char *module_link; |
69 | char *readme; | 69 | char *readme; |
70 | char *section; | 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 enable_remote_branches; | ||
75 | int max_stats; | 76 | int max_stats; |
76 | time_t mtime; | 77 | time_t mtime; |
77 | struct cgit_filter *about_filter; | 78 | struct cgit_filter *about_filter; |
78 | struct cgit_filter *commit_filter; | 79 | struct cgit_filter *commit_filter; |
79 | struct cgit_filter *source_filter; | 80 | struct cgit_filter *source_filter; |
80 | }; | 81 | }; |
81 | 82 | ||
82 | typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, | 83 | typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, |
83 | const char *value); | 84 | const char *value); |
84 | 85 | ||
85 | struct cgit_repolist { | 86 | struct cgit_repolist { |
86 | int length; | 87 | int length; |
87 | int count; | 88 | int count; |
88 | struct cgit_repo *repos; | 89 | struct cgit_repo *repos; |
89 | }; | 90 | }; |
90 | 91 | ||
@@ -166,32 +167,33 @@ struct cgit_config { | |||
166 | char *root_readme; | 167 | char *root_readme; |
167 | char *script_name; | 168 | char *script_name; |
168 | char *section; | 169 | char *section; |
169 | char *virtual_root; | 170 | char *virtual_root; |
170 | int cache_size; | 171 | int cache_size; |
171 | int cache_dynamic_ttl; | 172 | int cache_dynamic_ttl; |
172 | int cache_max_create_time; | 173 | int cache_max_create_time; |
173 | int cache_repo_ttl; | 174 | int cache_repo_ttl; |
174 | int cache_root_ttl; | 175 | int cache_root_ttl; |
175 | int cache_scanrc_ttl; | 176 | int cache_scanrc_ttl; |
176 | int cache_static_ttl; | 177 | int cache_static_ttl; |
177 | int embedded; | 178 | int embedded; |
178 | int enable_filter_overrides; | 179 | int enable_filter_overrides; |
179 | int enable_index_links; | 180 | int enable_index_links; |
180 | int enable_log_filecount; | 181 | int enable_log_filecount; |
181 | int enable_log_linecount; | 182 | int enable_log_linecount; |
183 | int enable_remote_branches; | ||
182 | int enable_tree_linenumbers; | 184 | int enable_tree_linenumbers; |
183 | int local_time; | 185 | int local_time; |
184 | int max_repo_count; | 186 | int max_repo_count; |
185 | int max_commit_count; | 187 | int max_commit_count; |
186 | int max_lock_attempts; | 188 | int max_lock_attempts; |
187 | int max_msg_len; | 189 | int max_msg_len; |
188 | int max_repodesc_len; | 190 | int max_repodesc_len; |
189 | int max_blob_size; | 191 | int max_blob_size; |
190 | int max_stats; | 192 | int max_stats; |
191 | int nocache; | 193 | int nocache; |
192 | int noplainemail; | 194 | int noplainemail; |
193 | int noheader; | 195 | int noheader; |
194 | int renamelimit; | 196 | int renamelimit; |
195 | int snapshots; | 197 | int snapshots; |
196 | int summary_branches; | 198 | int summary_branches; |
197 | int summary_log; | 199 | int summary_log; |