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.c | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -98,98 +98,98 @@ void config_cb(const char *name, const char *value) | |||
98 | ctx.cfg.cache_root_ttl = atoi(value); | 98 | ctx.cfg.cache_root_ttl = atoi(value); |
99 | else if (!strcmp(name, "cache-repo-ttl")) | 99 | else if (!strcmp(name, "cache-repo-ttl")) |
100 | ctx.cfg.cache_repo_ttl = atoi(value); | 100 | ctx.cfg.cache_repo_ttl = atoi(value); |
101 | else if (!strcmp(name, "cache-scanrc-ttl")) | 101 | else if (!strcmp(name, "cache-scanrc-ttl")) |
102 | ctx.cfg.cache_scanrc_ttl = atoi(value); | 102 | ctx.cfg.cache_scanrc_ttl = atoi(value); |
103 | else if (!strcmp(name, "cache-static-ttl")) | 103 | else if (!strcmp(name, "cache-static-ttl")) |
104 | ctx.cfg.cache_static_ttl = atoi(value); | 104 | ctx.cfg.cache_static_ttl = atoi(value); |
105 | else if (!strcmp(name, "cache-dynamic-ttl")) | 105 | else if (!strcmp(name, "cache-dynamic-ttl")) |
106 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 106 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
107 | else if (!strcmp(name, "about-filter")) | 107 | else if (!strcmp(name, "about-filter")) |
108 | ctx.cfg.about_filter = new_filter(value, 0); | 108 | ctx.cfg.about_filter = new_filter(value, 0); |
109 | else if (!strcmp(name, "commit-filter")) | 109 | else if (!strcmp(name, "commit-filter")) |
110 | ctx.cfg.commit_filter = new_filter(value, 0); | 110 | ctx.cfg.commit_filter = new_filter(value, 0); |
111 | else if (!strcmp(name, "embedded")) | 111 | else if (!strcmp(name, "embedded")) |
112 | ctx.cfg.embedded = atoi(value); | 112 | ctx.cfg.embedded = atoi(value); |
113 | else if (!strcmp(name, "max-message-length")) | 113 | else if (!strcmp(name, "max-message-length")) |
114 | ctx.cfg.max_msg_len = atoi(value); | 114 | ctx.cfg.max_msg_len = atoi(value); |
115 | else if (!strcmp(name, "max-repodesc-length")) | 115 | else if (!strcmp(name, "max-repodesc-length")) |
116 | ctx.cfg.max_repodesc_len = atoi(value); | 116 | ctx.cfg.max_repodesc_len = atoi(value); |
117 | else if (!strcmp(name, "max-repo-count")) | 117 | else if (!strcmp(name, "max-repo-count")) |
118 | ctx.cfg.max_repo_count = atoi(value); | 118 | ctx.cfg.max_repo_count = atoi(value); |
119 | else if (!strcmp(name, "max-commit-count")) | 119 | else if (!strcmp(name, "max-commit-count")) |
120 | ctx.cfg.max_commit_count = atoi(value); | 120 | ctx.cfg.max_commit_count = atoi(value); |
121 | else if (!strcmp(name, "scan-path")) | 121 | else if (!strcmp(name, "scan-path")) |
122 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) | 122 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
123 | process_cached_repolist(value); | 123 | process_cached_repolist(value); |
124 | else | 124 | else |
125 | scan_tree(value); | 125 | scan_tree(value); |
126 | else if (!strcmp(name, "source-filter")) | 126 | else if (!strcmp(name, "source-filter")) |
127 | ctx.cfg.source_filter = new_filter(value, 1); | 127 | ctx.cfg.source_filter = new_filter(value, 1); |
128 | else if (!strcmp(name, "summary-log")) | 128 | else if (!strcmp(name, "summary-log")) |
129 | ctx.cfg.summary_log = atoi(value); | 129 | ctx.cfg.summary_log = atoi(value); |
130 | else if (!strcmp(name, "summary-branches")) | 130 | else if (!strcmp(name, "summary-branches")) |
131 | ctx.cfg.summary_branches = atoi(value); | 131 | ctx.cfg.summary_branches = atoi(value); |
132 | else if (!strcmp(name, "summary-tags")) | 132 | else if (!strcmp(name, "summary-tags")) |
133 | ctx.cfg.summary_tags = atoi(value); | 133 | ctx.cfg.summary_tags = atoi(value); |
134 | else if (!strcmp(name, "agefile")) | 134 | else if (!strcmp(name, "agefile")) |
135 | ctx.cfg.agefile = xstrdup(value); | 135 | ctx.cfg.agefile = xstrdup(value); |
136 | else if (!strcmp(name, "renamelimit")) | 136 | else if (!strcmp(name, "renamelimit")) |
137 | ctx.cfg.renamelimit = atoi(value); | 137 | ctx.cfg.renamelimit = atoi(value); |
138 | else if (!strcmp(name, "robots")) | 138 | else if (!strcmp(name, "robots")) |
139 | ctx.cfg.robots = xstrdup(value); | 139 | ctx.cfg.robots = xstrdup(value); |
140 | else if (!strcmp(name, "clone-prefix")) | 140 | else if (!strcmp(name, "clone-prefix")) |
141 | ctx.cfg.clone_prefix = xstrdup(value); | 141 | ctx.cfg.clone_prefix = xstrdup(value); |
142 | else if (!strcmp(name, "local-time")) | 142 | else if (!strcmp(name, "local-time")) |
143 | ctx.cfg.local_time = atoi(value); | 143 | ctx.cfg.local_time = atoi(value); |
144 | else if (!prefixcmp(name, "mimetype.")) | 144 | else if (!prefixcmp(name, "mimetype.")) |
145 | add_mimetype(name + 9, value); | 145 | add_mimetype(name + 9, value); |
146 | else if (!strcmp(name, "repo.group")) | 146 | else if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
147 | ctx.cfg.repo_group = xstrdup(value); | 147 | ctx.cfg.section = xstrdup(value); |
148 | else if (!strcmp(name, "repo.url")) | 148 | else if (!strcmp(name, "repo.url")) |
149 | ctx.repo = cgit_add_repo(value); | 149 | ctx.repo = cgit_add_repo(value); |
150 | else if (!strcmp(name, "repo.name")) | 150 | else if (!strcmp(name, "repo.name")) |
151 | ctx.repo->name = xstrdup(value); | 151 | ctx.repo->name = xstrdup(value); |
152 | else if (ctx.repo && !strcmp(name, "repo.path")) | 152 | else if (ctx.repo && !strcmp(name, "repo.path")) |
153 | ctx.repo->path = trim_end(value, '/'); | 153 | ctx.repo->path = trim_end(value, '/'); |
154 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 154 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
155 | ctx.repo->clone_url = xstrdup(value); | 155 | ctx.repo->clone_url = xstrdup(value); |
156 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 156 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
157 | ctx.repo->desc = xstrdup(value); | 157 | ctx.repo->desc = xstrdup(value); |
158 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 158 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
159 | ctx.repo->owner = xstrdup(value); | 159 | ctx.repo->owner = xstrdup(value); |
160 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 160 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
161 | ctx.repo->defbranch = xstrdup(value); | 161 | ctx.repo->defbranch = xstrdup(value); |
162 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 162 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
163 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 163 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
164 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 164 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
165 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 165 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
166 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 166 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
167 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 167 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
168 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) | 168 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
169 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); | 169 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
170 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 170 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
171 | ctx.repo->module_link= xstrdup(value); | 171 | ctx.repo->module_link= xstrdup(value); |
172 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) | 172 | else if (ctx.repo && !strcmp(name, "repo.about-filter")) |
173 | ctx.repo->about_filter = new_filter(value, 0); | 173 | ctx.repo->about_filter = new_filter(value, 0); |
174 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) | 174 | else if (ctx.repo && !strcmp(name, "repo.commit-filter")) |
175 | ctx.repo->commit_filter = new_filter(value, 0); | 175 | ctx.repo->commit_filter = new_filter(value, 0); |
176 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) | 176 | else if (ctx.repo && !strcmp(name, "repo.source-filter")) |
177 | ctx.repo->source_filter = new_filter(value, 1); | 177 | ctx.repo->source_filter = new_filter(value, 1); |
178 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 178 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
179 | if (*value == '/') | 179 | if (*value == '/') |
180 | ctx.repo->readme = xstrdup(value); | 180 | ctx.repo->readme = xstrdup(value); |
181 | else | 181 | else |
182 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 182 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
183 | } else if (!strcmp(name, "include")) | 183 | } else if (!strcmp(name, "include")) |
184 | parse_configfile(value, config_cb); | 184 | parse_configfile(value, config_cb); |
185 | } | 185 | } |
186 | 186 | ||
187 | static void querystring_cb(const char *name, const char *value) | 187 | static void querystring_cb(const char *name, const char *value) |
188 | { | 188 | { |
189 | if (!value) | 189 | if (!value) |
190 | value = ""; | 190 | value = ""; |
191 | 191 | ||
192 | if (!strcmp(name,"r")) { | 192 | if (!strcmp(name,"r")) { |
193 | ctx.qry.repo = xstrdup(value); | 193 | ctx.qry.repo = xstrdup(value); |
194 | ctx.repo = cgit_get_repoinfo(value); | 194 | ctx.repo = cgit_get_repoinfo(value); |
195 | } else if (!strcmp(name, "p")) { | 195 | } else if (!strcmp(name, "p")) { |