author | Johan Herland <johan@herland.net> | 2010-06-10 18:15:27 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 11:00:07 (UTC) |
commit | 6180e6169d6e87a3bea7e4da835dca17f93e5cfd (patch) (unidiff) | |
tree | 7caa053b419c75081179cc4a6056ce6533d01d99 | |
parent | a2cbd3c30b64a26b52b2003ba6569f3c083f4092 (diff) | |
download | cgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.zip cgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.tar.gz cgit-6180e6169d6e87a3bea7e4da835dca17f93e5cfd.tar.bz2 |
Add URL parameter 'context' for changing the number of context lines in diffs
The new ctx.qry.context variable is picked up by cgit_print_diff(), and
passed via cgit_diff_files() to Git's diff machinery.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 3 | ||||
-rw-r--r-- | shared.c | 5 | ||||
-rw-r--r-- | ui-diff.c | 4 | ||||
-rw-r--r-- | ui-log.c | 2 | ||||
-rw-r--r-- | ui-patch.c | 2 |
6 files changed, 11 insertions, 7 deletions
@@ -189,128 +189,130 @@ void config_cb(const char *name, const char *value) | |||
189 | else if (!strcmp(name, "summary-tags")) | 189 | else if (!strcmp(name, "summary-tags")) |
190 | ctx.cfg.summary_tags = atoi(value); | 190 | ctx.cfg.summary_tags = atoi(value); |
191 | else if (!strcmp(name, "side-by-side-diffs")) | 191 | else if (!strcmp(name, "side-by-side-diffs")) |
192 | ctx.cfg.ssdiff = atoi(value); | 192 | ctx.cfg.ssdiff = atoi(value); |
193 | else if (!strcmp(name, "agefile")) | 193 | else if (!strcmp(name, "agefile")) |
194 | ctx.cfg.agefile = xstrdup(value); | 194 | ctx.cfg.agefile = xstrdup(value); |
195 | else if (!strcmp(name, "renamelimit")) | 195 | else if (!strcmp(name, "renamelimit")) |
196 | ctx.cfg.renamelimit = atoi(value); | 196 | ctx.cfg.renamelimit = atoi(value); |
197 | else if (!strcmp(name, "robots")) | 197 | else if (!strcmp(name, "robots")) |
198 | ctx.cfg.robots = xstrdup(value); | 198 | ctx.cfg.robots = xstrdup(value); |
199 | else if (!strcmp(name, "clone-prefix")) | 199 | else if (!strcmp(name, "clone-prefix")) |
200 | ctx.cfg.clone_prefix = xstrdup(value); | 200 | ctx.cfg.clone_prefix = xstrdup(value); |
201 | else if (!strcmp(name, "local-time")) | 201 | else if (!strcmp(name, "local-time")) |
202 | ctx.cfg.local_time = atoi(value); | 202 | ctx.cfg.local_time = atoi(value); |
203 | else if (!prefixcmp(name, "mimetype.")) | 203 | else if (!prefixcmp(name, "mimetype.")) |
204 | add_mimetype(name + 9, value); | 204 | add_mimetype(name + 9, value); |
205 | else if (!strcmp(name, "include")) | 205 | else if (!strcmp(name, "include")) |
206 | parse_configfile(value, config_cb); | 206 | parse_configfile(value, config_cb); |
207 | } | 207 | } |
208 | 208 | ||
209 | static void querystring_cb(const char *name, const char *value) | 209 | static void querystring_cb(const char *name, const char *value) |
210 | { | 210 | { |
211 | if (!value) | 211 | if (!value) |
212 | value = ""; | 212 | value = ""; |
213 | 213 | ||
214 | if (!strcmp(name,"r")) { | 214 | if (!strcmp(name,"r")) { |
215 | ctx.qry.repo = xstrdup(value); | 215 | ctx.qry.repo = xstrdup(value); |
216 | ctx.repo = cgit_get_repoinfo(value); | 216 | ctx.repo = cgit_get_repoinfo(value); |
217 | } else if (!strcmp(name, "p")) { | 217 | } else if (!strcmp(name, "p")) { |
218 | ctx.qry.page = xstrdup(value); | 218 | ctx.qry.page = xstrdup(value); |
219 | } else if (!strcmp(name, "url")) { | 219 | } else if (!strcmp(name, "url")) { |
220 | if (*value == '/') | 220 | if (*value == '/') |
221 | value++; | 221 | value++; |
222 | ctx.qry.url = xstrdup(value); | 222 | ctx.qry.url = xstrdup(value); |
223 | cgit_parse_url(value); | 223 | cgit_parse_url(value); |
224 | } else if (!strcmp(name, "qt")) { | 224 | } else if (!strcmp(name, "qt")) { |
225 | ctx.qry.grep = xstrdup(value); | 225 | ctx.qry.grep = xstrdup(value); |
226 | } else if (!strcmp(name, "q")) { | 226 | } else if (!strcmp(name, "q")) { |
227 | ctx.qry.search = xstrdup(value); | 227 | ctx.qry.search = xstrdup(value); |
228 | } else if (!strcmp(name, "h")) { | 228 | } else if (!strcmp(name, "h")) { |
229 | ctx.qry.head = xstrdup(value); | 229 | ctx.qry.head = xstrdup(value); |
230 | ctx.qry.has_symref = 1; | 230 | ctx.qry.has_symref = 1; |
231 | } else if (!strcmp(name, "id")) { | 231 | } else if (!strcmp(name, "id")) { |
232 | ctx.qry.sha1 = xstrdup(value); | 232 | ctx.qry.sha1 = xstrdup(value); |
233 | ctx.qry.has_sha1 = 1; | 233 | ctx.qry.has_sha1 = 1; |
234 | } else if (!strcmp(name, "id2")) { | 234 | } else if (!strcmp(name, "id2")) { |
235 | ctx.qry.sha2 = xstrdup(value); | 235 | ctx.qry.sha2 = xstrdup(value); |
236 | ctx.qry.has_sha1 = 1; | 236 | ctx.qry.has_sha1 = 1; |
237 | } else if (!strcmp(name, "ofs")) { | 237 | } else if (!strcmp(name, "ofs")) { |
238 | ctx.qry.ofs = atoi(value); | 238 | ctx.qry.ofs = atoi(value); |
239 | } else if (!strcmp(name, "path")) { | 239 | } else if (!strcmp(name, "path")) { |
240 | ctx.qry.path = trim_end(value, '/'); | 240 | ctx.qry.path = trim_end(value, '/'); |
241 | } else if (!strcmp(name, "name")) { | 241 | } else if (!strcmp(name, "name")) { |
242 | ctx.qry.name = xstrdup(value); | 242 | ctx.qry.name = xstrdup(value); |
243 | } else if (!strcmp(name, "mimetype")) { | 243 | } else if (!strcmp(name, "mimetype")) { |
244 | ctx.qry.mimetype = xstrdup(value); | 244 | ctx.qry.mimetype = xstrdup(value); |
245 | } else if (!strcmp(name, "s")){ | 245 | } else if (!strcmp(name, "s")){ |
246 | ctx.qry.sort = xstrdup(value); | 246 | ctx.qry.sort = xstrdup(value); |
247 | } else if (!strcmp(name, "showmsg")) { | 247 | } else if (!strcmp(name, "showmsg")) { |
248 | ctx.qry.showmsg = atoi(value); | 248 | ctx.qry.showmsg = atoi(value); |
249 | } else if (!strcmp(name, "period")) { | 249 | } else if (!strcmp(name, "period")) { |
250 | ctx.qry.period = xstrdup(value); | 250 | ctx.qry.period = xstrdup(value); |
251 | } else if (!strcmp(name, "ss")) { | 251 | } else if (!strcmp(name, "ss")) { |
252 | ctx.qry.ssdiff = atoi(value); | 252 | ctx.qry.ssdiff = atoi(value); |
253 | } else if (!strcmp(name, "context")) { | ||
254 | ctx.qry.context = atoi(value); | ||
253 | } | 255 | } |
254 | } | 256 | } |
255 | 257 | ||
256 | char *xstrdupn(const char *str) | 258 | char *xstrdupn(const char *str) |
257 | { | 259 | { |
258 | return (str ? xstrdup(str) : NULL); | 260 | return (str ? xstrdup(str) : NULL); |
259 | } | 261 | } |
260 | 262 | ||
261 | static void prepare_context(struct cgit_context *ctx) | 263 | static void prepare_context(struct cgit_context *ctx) |
262 | { | 264 | { |
263 | memset(ctx, 0, sizeof(*ctx)); | 265 | memset(ctx, 0, sizeof(*ctx)); |
264 | ctx->cfg.agefile = "info/web/last-modified"; | 266 | ctx->cfg.agefile = "info/web/last-modified"; |
265 | ctx->cfg.nocache = 0; | 267 | ctx->cfg.nocache = 0; |
266 | ctx->cfg.cache_size = 0; | 268 | ctx->cfg.cache_size = 0; |
267 | ctx->cfg.cache_dynamic_ttl = 5; | 269 | ctx->cfg.cache_dynamic_ttl = 5; |
268 | ctx->cfg.cache_max_create_time = 5; | 270 | ctx->cfg.cache_max_create_time = 5; |
269 | ctx->cfg.cache_repo_ttl = 5; | 271 | ctx->cfg.cache_repo_ttl = 5; |
270 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 272 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
271 | ctx->cfg.cache_root_ttl = 5; | 273 | ctx->cfg.cache_root_ttl = 5; |
272 | ctx->cfg.cache_scanrc_ttl = 15; | 274 | ctx->cfg.cache_scanrc_ttl = 15; |
273 | ctx->cfg.cache_static_ttl = -1; | 275 | ctx->cfg.cache_static_ttl = -1; |
274 | ctx->cfg.css = "/cgit.css"; | 276 | ctx->cfg.css = "/cgit.css"; |
275 | ctx->cfg.logo = "/cgit.png"; | 277 | ctx->cfg.logo = "/cgit.png"; |
276 | ctx->cfg.local_time = 0; | 278 | ctx->cfg.local_time = 0; |
277 | ctx->cfg.enable_tree_linenumbers = 1; | 279 | ctx->cfg.enable_tree_linenumbers = 1; |
278 | ctx->cfg.max_repo_count = 50; | 280 | ctx->cfg.max_repo_count = 50; |
279 | ctx->cfg.max_commit_count = 50; | 281 | ctx->cfg.max_commit_count = 50; |
280 | ctx->cfg.max_lock_attempts = 5; | 282 | ctx->cfg.max_lock_attempts = 5; |
281 | ctx->cfg.max_msg_len = 80; | 283 | ctx->cfg.max_msg_len = 80; |
282 | ctx->cfg.max_repodesc_len = 80; | 284 | ctx->cfg.max_repodesc_len = 80; |
283 | ctx->cfg.max_blob_size = 0; | 285 | ctx->cfg.max_blob_size = 0; |
284 | ctx->cfg.max_stats = 0; | 286 | ctx->cfg.max_stats = 0; |
285 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 287 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
286 | ctx->cfg.renamelimit = -1; | 288 | ctx->cfg.renamelimit = -1; |
287 | ctx->cfg.robots = "index, nofollow"; | 289 | ctx->cfg.robots = "index, nofollow"; |
288 | ctx->cfg.root_title = "Git repository browser"; | 290 | ctx->cfg.root_title = "Git repository browser"; |
289 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 291 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
290 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 292 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
291 | ctx->cfg.section = ""; | 293 | ctx->cfg.section = ""; |
292 | ctx->cfg.summary_branches = 10; | 294 | ctx->cfg.summary_branches = 10; |
293 | ctx->cfg.summary_log = 10; | 295 | ctx->cfg.summary_log = 10; |
294 | ctx->cfg.summary_tags = 10; | 296 | ctx->cfg.summary_tags = 10; |
295 | ctx->cfg.ssdiff = 0; | 297 | ctx->cfg.ssdiff = 0; |
296 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 298 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
297 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 299 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
298 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 300 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
299 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); | 301 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
300 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); | 302 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
301 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); | 303 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
302 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); | 304 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
303 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); | 305 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
304 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); | 306 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
305 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); | 307 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
306 | ctx->page.mimetype = "text/html"; | 308 | ctx->page.mimetype = "text/html"; |
307 | ctx->page.charset = PAGE_ENCODING; | 309 | ctx->page.charset = PAGE_ENCODING; |
308 | ctx->page.filename = NULL; | 310 | ctx->page.filename = NULL; |
309 | ctx->page.size = 0; | 311 | ctx->page.size = 0; |
310 | ctx->page.modified = time(NULL); | 312 | ctx->page.modified = time(NULL); |
311 | ctx->page.expires = ctx->page.modified; | 313 | ctx->page.expires = ctx->page.modified; |
312 | ctx->page.etag = NULL; | 314 | ctx->page.etag = NULL; |
313 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); | 315 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
314 | if (ctx->env.script_name) | 316 | if (ctx->env.script_name) |
315 | ctx->cfg.script_name = ctx->env.script_name; | 317 | ctx->cfg.script_name = ctx->env.script_name; |
316 | if (ctx->env.query_string) | 318 | if (ctx->env.query_string) |
@@ -84,128 +84,129 @@ typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, | |||
84 | const char *value); | 84 | const char *value); |
85 | 85 | ||
86 | struct cgit_repolist { | 86 | struct cgit_repolist { |
87 | int length; | 87 | int length; |
88 | int count; | 88 | int count; |
89 | struct cgit_repo *repos; | 89 | struct cgit_repo *repos; |
90 | }; | 90 | }; |
91 | 91 | ||
92 | struct commitinfo { | 92 | struct commitinfo { |
93 | struct commit *commit; | 93 | struct commit *commit; |
94 | char *author; | 94 | char *author; |
95 | char *author_email; | 95 | char *author_email; |
96 | unsigned long author_date; | 96 | unsigned long author_date; |
97 | char *committer; | 97 | char *committer; |
98 | char *committer_email; | 98 | char *committer_email; |
99 | unsigned long committer_date; | 99 | unsigned long committer_date; |
100 | char *subject; | 100 | char *subject; |
101 | char *msg; | 101 | char *msg; |
102 | char *msg_encoding; | 102 | char *msg_encoding; |
103 | }; | 103 | }; |
104 | 104 | ||
105 | struct taginfo { | 105 | struct taginfo { |
106 | char *tagger; | 106 | char *tagger; |
107 | char *tagger_email; | 107 | char *tagger_email; |
108 | unsigned long tagger_date; | 108 | unsigned long tagger_date; |
109 | char *msg; | 109 | char *msg; |
110 | }; | 110 | }; |
111 | 111 | ||
112 | struct refinfo { | 112 | struct refinfo { |
113 | const char *refname; | 113 | const char *refname; |
114 | struct object *object; | 114 | struct object *object; |
115 | union { | 115 | union { |
116 | struct taginfo *tag; | 116 | struct taginfo *tag; |
117 | struct commitinfo *commit; | 117 | struct commitinfo *commit; |
118 | }; | 118 | }; |
119 | }; | 119 | }; |
120 | 120 | ||
121 | struct reflist { | 121 | struct reflist { |
122 | struct refinfo **refs; | 122 | struct refinfo **refs; |
123 | int alloc; | 123 | int alloc; |
124 | int count; | 124 | int count; |
125 | }; | 125 | }; |
126 | 126 | ||
127 | struct cgit_query { | 127 | struct cgit_query { |
128 | int has_symref; | 128 | int has_symref; |
129 | int has_sha1; | 129 | int has_sha1; |
130 | char *raw; | 130 | char *raw; |
131 | char *repo; | 131 | char *repo; |
132 | char *page; | 132 | char *page; |
133 | char *search; | 133 | char *search; |
134 | char *grep; | 134 | char *grep; |
135 | char *head; | 135 | char *head; |
136 | char *sha1; | 136 | char *sha1; |
137 | char *sha2; | 137 | char *sha2; |
138 | char *path; | 138 | char *path; |
139 | char *name; | 139 | char *name; |
140 | char *mimetype; | 140 | char *mimetype; |
141 | char *url; | 141 | char *url; |
142 | char *period; | 142 | char *period; |
143 | int ofs; | 143 | int ofs; |
144 | int nohead; | 144 | int nohead; |
145 | char *sort; | 145 | char *sort; |
146 | int showmsg; | 146 | int showmsg; |
147 | int ssdiff; | 147 | int ssdiff; |
148 | int context; | ||
148 | char *vpath; | 149 | char *vpath; |
149 | }; | 150 | }; |
150 | 151 | ||
151 | struct cgit_config { | 152 | struct cgit_config { |
152 | char *agefile; | 153 | char *agefile; |
153 | char *cache_root; | 154 | char *cache_root; |
154 | char *clone_prefix; | 155 | char *clone_prefix; |
155 | char *css; | 156 | char *css; |
156 | char *favicon; | 157 | char *favicon; |
157 | char *footer; | 158 | char *footer; |
158 | char *head_include; | 159 | char *head_include; |
159 | char *header; | 160 | char *header; |
160 | char *index_header; | 161 | char *index_header; |
161 | char *index_info; | 162 | char *index_info; |
162 | char *logo; | 163 | char *logo; |
163 | char *logo_link; | 164 | char *logo_link; |
164 | char *module_link; | 165 | char *module_link; |
165 | char *robots; | 166 | char *robots; |
166 | char *root_title; | 167 | char *root_title; |
167 | char *root_desc; | 168 | char *root_desc; |
168 | char *root_readme; | 169 | char *root_readme; |
169 | char *script_name; | 170 | char *script_name; |
170 | char *section; | 171 | char *section; |
171 | char *virtual_root; | 172 | char *virtual_root; |
172 | int cache_size; | 173 | int cache_size; |
173 | int cache_dynamic_ttl; | 174 | int cache_dynamic_ttl; |
174 | int cache_max_create_time; | 175 | int cache_max_create_time; |
175 | int cache_repo_ttl; | 176 | int cache_repo_ttl; |
176 | int cache_root_ttl; | 177 | int cache_root_ttl; |
177 | int cache_scanrc_ttl; | 178 | int cache_scanrc_ttl; |
178 | int cache_static_ttl; | 179 | int cache_static_ttl; |
179 | int embedded; | 180 | int embedded; |
180 | int enable_filter_overrides; | 181 | int enable_filter_overrides; |
181 | int enable_index_links; | 182 | int enable_index_links; |
182 | int enable_log_filecount; | 183 | int enable_log_filecount; |
183 | int enable_log_linecount; | 184 | int enable_log_linecount; |
184 | int enable_remote_branches; | 185 | int enable_remote_branches; |
185 | int enable_tree_linenumbers; | 186 | int enable_tree_linenumbers; |
186 | int local_time; | 187 | int local_time; |
187 | int max_repo_count; | 188 | int max_repo_count; |
188 | int max_commit_count; | 189 | int max_commit_count; |
189 | int max_lock_attempts; | 190 | int max_lock_attempts; |
190 | int max_msg_len; | 191 | int max_msg_len; |
191 | int max_repodesc_len; | 192 | int max_repodesc_len; |
192 | int max_blob_size; | 193 | int max_blob_size; |
193 | int max_stats; | 194 | int max_stats; |
194 | int nocache; | 195 | int nocache; |
195 | int noplainemail; | 196 | int noplainemail; |
196 | int noheader; | 197 | int noheader; |
197 | int renamelimit; | 198 | int renamelimit; |
198 | int snapshots; | 199 | int snapshots; |
199 | int summary_branches; | 200 | int summary_branches; |
200 | int summary_log; | 201 | int summary_log; |
201 | int summary_tags; | 202 | int summary_tags; |
202 | int ssdiff; | 203 | int ssdiff; |
203 | struct string_list mimetypes; | 204 | struct string_list mimetypes; |
204 | struct cgit_filter *about_filter; | 205 | struct cgit_filter *about_filter; |
205 | struct cgit_filter *commit_filter; | 206 | struct cgit_filter *commit_filter; |
206 | struct cgit_filter *source_filter; | 207 | struct cgit_filter *source_filter; |
207 | }; | 208 | }; |
208 | 209 | ||
209 | struct cgit_page { | 210 | struct cgit_page { |
210 | time_t modified; | 211 | time_t modified; |
211 | time_t expires; | 212 | time_t expires; |
@@ -213,88 +214,88 @@ struct cgit_page { | |||
213 | char *mimetype; | 214 | char *mimetype; |
214 | char *charset; | 215 | char *charset; |
215 | char *filename; | 216 | char *filename; |
216 | char *etag; | 217 | char *etag; |
217 | char *title; | 218 | char *title; |
218 | int status; | 219 | int status; |
219 | char *statusmsg; | 220 | char *statusmsg; |
220 | }; | 221 | }; |
221 | 222 | ||
222 | struct cgit_environment { | 223 | struct cgit_environment { |
223 | char *cgit_config; | 224 | char *cgit_config; |
224 | char *http_host; | 225 | char *http_host; |
225 | char *https; | 226 | char *https; |
226 | char *no_http; | 227 | char *no_http; |
227 | char *path_info; | 228 | char *path_info; |
228 | char *query_string; | 229 | char *query_string; |
229 | char *request_method; | 230 | char *request_method; |
230 | char *script_name; | 231 | char *script_name; |
231 | char *server_name; | 232 | char *server_name; |
232 | char *server_port; | 233 | char *server_port; |
233 | }; | 234 | }; |
234 | 235 | ||
235 | struct cgit_context { | 236 | struct cgit_context { |
236 | struct cgit_environment env; | 237 | struct cgit_environment env; |
237 | struct cgit_query qry; | 238 | struct cgit_query qry; |
238 | struct cgit_config cfg; | 239 | struct cgit_config cfg; |
239 | struct cgit_repo *repo; | 240 | struct cgit_repo *repo; |
240 | struct cgit_page page; | 241 | struct cgit_page page; |
241 | }; | 242 | }; |
242 | 243 | ||
243 | struct cgit_snapshot_format { | 244 | struct cgit_snapshot_format { |
244 | const char *suffix; | 245 | const char *suffix; |
245 | const char *mimetype; | 246 | const char *mimetype; |
246 | write_archive_fn_t write_func; | 247 | write_archive_fn_t write_func; |
247 | int bit; | 248 | int bit; |
248 | }; | 249 | }; |
249 | 250 | ||
250 | extern const char *cgit_version; | 251 | extern const char *cgit_version; |
251 | 252 | ||
252 | extern struct cgit_repolist cgit_repolist; | 253 | extern struct cgit_repolist cgit_repolist; |
253 | extern struct cgit_context ctx; | 254 | extern struct cgit_context ctx; |
254 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 255 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
255 | 256 | ||
256 | extern struct cgit_repo *cgit_add_repo(const char *url); | 257 | extern struct cgit_repo *cgit_add_repo(const char *url); |
257 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 258 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
258 | extern void cgit_repo_config_cb(const char *name, const char *value); | 259 | extern void cgit_repo_config_cb(const char *name, const char *value); |
259 | 260 | ||
260 | extern int chk_zero(int result, char *msg); | 261 | extern int chk_zero(int result, char *msg); |
261 | extern int chk_positive(int result, char *msg); | 262 | extern int chk_positive(int result, char *msg); |
262 | extern int chk_non_negative(int result, char *msg); | 263 | extern int chk_non_negative(int result, char *msg); |
263 | 264 | ||
264 | extern char *trim_end(const char *str, char c); | 265 | extern char *trim_end(const char *str, char c); |
265 | extern char *strlpart(char *txt, int maxlen); | 266 | extern char *strlpart(char *txt, int maxlen); |
266 | extern char *strrpart(char *txt, int maxlen); | 267 | extern char *strrpart(char *txt, int maxlen); |
267 | 268 | ||
268 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 269 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
269 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 270 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
270 | int flags, void *cb_data); | 271 | int flags, void *cb_data); |
271 | 272 | ||
272 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 273 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
273 | 274 | ||
274 | extern int cgit_diff_files(const unsigned char *old_sha1, | 275 | extern int cgit_diff_files(const unsigned char *old_sha1, |
275 | const unsigned char *new_sha1, | 276 | const unsigned char *new_sha1, |
276 | unsigned long *old_size, unsigned long *new_size, | 277 | unsigned long *old_size, unsigned long *new_size, |
277 | int *binary, linediff_fn fn); | 278 | int *binary, int context, linediff_fn fn); |
278 | 279 | ||
279 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 280 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
280 | const unsigned char *new_sha1, | 281 | const unsigned char *new_sha1, |
281 | filepair_fn fn, const char *prefix); | 282 | filepair_fn fn, const char *prefix); |
282 | 283 | ||
283 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 284 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
284 | 285 | ||
285 | extern char *fmt(const char *format,...); | 286 | extern char *fmt(const char *format,...); |
286 | 287 | ||
287 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 288 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
288 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 289 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
289 | extern void cgit_parse_url(const char *url); | 290 | extern void cgit_parse_url(const char *url); |
290 | 291 | ||
291 | extern const char *cgit_repobasename(const char *reponame); | 292 | extern const char *cgit_repobasename(const char *reponame); |
292 | 293 | ||
293 | extern int cgit_parse_snapshots_mask(const char *str); | 294 | extern int cgit_parse_snapshots_mask(const char *str); |
294 | 295 | ||
295 | extern int cgit_open_filter(struct cgit_filter *filter); | 296 | extern int cgit_open_filter(struct cgit_filter *filter); |
296 | extern int cgit_close_filter(struct cgit_filter *filter); | 297 | extern int cgit_close_filter(struct cgit_filter *filter); |
297 | 298 | ||
298 | extern int readfile(const char *path, char **buf, size_t *size); | 299 | extern int readfile(const char *path, char **buf, size_t *size); |
299 | 300 | ||
300 | #endif /* CGIT_H */ | 301 | #endif /* CGIT_H */ |
@@ -201,152 +201,153 @@ void cgit_diff_tree_cb(struct diff_queue_struct *q, | |||
201 | } | 201 | } |
202 | } | 202 | } |
203 | 203 | ||
204 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) | 204 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
205 | { | 205 | { |
206 | enum object_type type; | 206 | enum object_type type; |
207 | 207 | ||
208 | if (is_null_sha1(sha1)) { | 208 | if (is_null_sha1(sha1)) { |
209 | file->ptr = (char *)""; | 209 | file->ptr = (char *)""; |
210 | file->size = 0; | 210 | file->size = 0; |
211 | } else { | 211 | } else { |
212 | file->ptr = read_sha1_file(sha1, &type, | 212 | file->ptr = read_sha1_file(sha1, &type, |
213 | (unsigned long *)&file->size); | 213 | (unsigned long *)&file->size); |
214 | } | 214 | } |
215 | return 1; | 215 | return 1; |
216 | } | 216 | } |
217 | 217 | ||
218 | /* | 218 | /* |
219 | * Receive diff-buffers from xdiff and concatenate them as | 219 | * Receive diff-buffers from xdiff and concatenate them as |
220 | * needed across multiple callbacks. | 220 | * needed across multiple callbacks. |
221 | * | 221 | * |
222 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), | 222 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
223 | * ripped from git and modified to use globals instead of | 223 | * ripped from git and modified to use globals instead of |
224 | * a special callback-struct. | 224 | * a special callback-struct. |
225 | */ | 225 | */ |
226 | char *diffbuf = NULL; | 226 | char *diffbuf = NULL; |
227 | int buflen = 0; | 227 | int buflen = 0; |
228 | 228 | ||
229 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | 229 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
230 | { | 230 | { |
231 | int i; | 231 | int i; |
232 | 232 | ||
233 | for (i = 0; i < nbuf; i++) { | 233 | for (i = 0; i < nbuf; i++) { |
234 | if (mb[i].ptr[mb[i].size-1] != '\n') { | 234 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
235 | /* Incomplete line */ | 235 | /* Incomplete line */ |
236 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 236 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
237 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 237 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
238 | buflen += mb[i].size; | 238 | buflen += mb[i].size; |
239 | continue; | 239 | continue; |
240 | } | 240 | } |
241 | 241 | ||
242 | /* we have a complete line */ | 242 | /* we have a complete line */ |
243 | if (!diffbuf) { | 243 | if (!diffbuf) { |
244 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); | 244 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
245 | continue; | 245 | continue; |
246 | } | 246 | } |
247 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 247 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
248 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 248 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
249 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); | 249 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
250 | free(diffbuf); | 250 | free(diffbuf); |
251 | diffbuf = NULL; | 251 | diffbuf = NULL; |
252 | buflen = 0; | 252 | buflen = 0; |
253 | } | 253 | } |
254 | if (diffbuf) { | 254 | if (diffbuf) { |
255 | ((linediff_fn)priv)(diffbuf, buflen); | 255 | ((linediff_fn)priv)(diffbuf, buflen); |
256 | free(diffbuf); | 256 | free(diffbuf); |
257 | diffbuf = NULL; | 257 | diffbuf = NULL; |
258 | buflen = 0; | 258 | buflen = 0; |
259 | } | 259 | } |
260 | return 0; | 260 | return 0; |
261 | } | 261 | } |
262 | 262 | ||
263 | int cgit_diff_files(const unsigned char *old_sha1, | 263 | int cgit_diff_files(const unsigned char *old_sha1, |
264 | const unsigned char *new_sha1, unsigned long *old_size, | 264 | const unsigned char *new_sha1, unsigned long *old_size, |
265 | unsigned long *new_size, int *binary, linediff_fn fn) | 265 | unsigned long *new_size, int *binary, int context, |
266 | linediff_fn fn) | ||
266 | { | 267 | { |
267 | mmfile_t file1, file2; | 268 | mmfile_t file1, file2; |
268 | xpparam_t diff_params; | 269 | xpparam_t diff_params; |
269 | xdemitconf_t emit_params; | 270 | xdemitconf_t emit_params; |
270 | xdemitcb_t emit_cb; | 271 | xdemitcb_t emit_cb; |
271 | 272 | ||
272 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) | 273 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
273 | return 1; | 274 | return 1; |
274 | 275 | ||
275 | *old_size = file1.size; | 276 | *old_size = file1.size; |
276 | *new_size = file2.size; | 277 | *new_size = file2.size; |
277 | 278 | ||
278 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || | 279 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
279 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { | 280 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
280 | *binary = 1; | 281 | *binary = 1; |
281 | return 0; | 282 | return 0; |
282 | } | 283 | } |
283 | 284 | ||
284 | memset(&diff_params, 0, sizeof(diff_params)); | 285 | memset(&diff_params, 0, sizeof(diff_params)); |
285 | memset(&emit_params, 0, sizeof(emit_params)); | 286 | memset(&emit_params, 0, sizeof(emit_params)); |
286 | memset(&emit_cb, 0, sizeof(emit_cb)); | 287 | memset(&emit_cb, 0, sizeof(emit_cb)); |
287 | diff_params.flags = XDF_NEED_MINIMAL; | 288 | diff_params.flags = XDF_NEED_MINIMAL; |
288 | emit_params.ctxlen = 3; | 289 | emit_params.ctxlen = context > 0 ? context : 3; |
289 | emit_params.flags = XDL_EMIT_FUNCNAMES; | 290 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
290 | emit_cb.outf = filediff_cb; | 291 | emit_cb.outf = filediff_cb; |
291 | emit_cb.priv = fn; | 292 | emit_cb.priv = fn; |
292 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 293 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
293 | return 0; | 294 | return 0; |
294 | } | 295 | } |
295 | 296 | ||
296 | void cgit_diff_tree(const unsigned char *old_sha1, | 297 | void cgit_diff_tree(const unsigned char *old_sha1, |
297 | const unsigned char *new_sha1, | 298 | const unsigned char *new_sha1, |
298 | filepair_fn fn, const char *prefix) | 299 | filepair_fn fn, const char *prefix) |
299 | { | 300 | { |
300 | struct diff_options opt; | 301 | struct diff_options opt; |
301 | int ret; | 302 | int ret; |
302 | int prefixlen; | 303 | int prefixlen; |
303 | 304 | ||
304 | diff_setup(&opt); | 305 | diff_setup(&opt); |
305 | opt.output_format = DIFF_FORMAT_CALLBACK; | 306 | opt.output_format = DIFF_FORMAT_CALLBACK; |
306 | opt.detect_rename = 1; | 307 | opt.detect_rename = 1; |
307 | opt.rename_limit = ctx.cfg.renamelimit; | 308 | opt.rename_limit = ctx.cfg.renamelimit; |
308 | DIFF_OPT_SET(&opt, RECURSIVE); | 309 | DIFF_OPT_SET(&opt, RECURSIVE); |
309 | opt.format_callback = cgit_diff_tree_cb; | 310 | opt.format_callback = cgit_diff_tree_cb; |
310 | opt.format_callback_data = fn; | 311 | opt.format_callback_data = fn; |
311 | if (prefix) { | 312 | if (prefix) { |
312 | opt.nr_paths = 1; | 313 | opt.nr_paths = 1; |
313 | opt.paths = &prefix; | 314 | opt.paths = &prefix; |
314 | prefixlen = strlen(prefix); | 315 | prefixlen = strlen(prefix); |
315 | opt.pathlens = &prefixlen; | 316 | opt.pathlens = &prefixlen; |
316 | } | 317 | } |
317 | diff_setup_done(&opt); | 318 | diff_setup_done(&opt); |
318 | 319 | ||
319 | if (old_sha1 && !is_null_sha1(old_sha1)) | 320 | if (old_sha1 && !is_null_sha1(old_sha1)) |
320 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | 321 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
321 | else | 322 | else |
322 | ret = diff_root_tree_sha1(new_sha1, "", &opt); | 323 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
323 | diffcore_std(&opt); | 324 | diffcore_std(&opt); |
324 | diff_flush(&opt); | 325 | diff_flush(&opt); |
325 | } | 326 | } |
326 | 327 | ||
327 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) | 328 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
328 | { | 329 | { |
329 | unsigned char *old_sha1 = NULL; | 330 | unsigned char *old_sha1 = NULL; |
330 | 331 | ||
331 | if (commit->parents) | 332 | if (commit->parents) |
332 | old_sha1 = commit->parents->item->object.sha1; | 333 | old_sha1 = commit->parents->item->object.sha1; |
333 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); | 334 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
334 | } | 335 | } |
335 | 336 | ||
336 | int cgit_parse_snapshots_mask(const char *str) | 337 | int cgit_parse_snapshots_mask(const char *str) |
337 | { | 338 | { |
338 | const struct cgit_snapshot_format *f; | 339 | const struct cgit_snapshot_format *f; |
339 | static const char *delim = " \t,:/|;"; | 340 | static const char *delim = " \t,:/|;"; |
340 | int tl, sl, rv = 0; | 341 | int tl, sl, rv = 0; |
341 | 342 | ||
342 | /* favor legacy setting */ | 343 | /* favor legacy setting */ |
343 | if(atoi(str)) | 344 | if(atoi(str)) |
344 | return 1; | 345 | return 1; |
345 | for(;;) { | 346 | for(;;) { |
346 | str += strspn(str,delim); | 347 | str += strspn(str,delim); |
347 | tl = strcspn(str,delim); | 348 | tl = strcspn(str,delim); |
348 | if (!tl) | 349 | if (!tl) |
349 | break; | 350 | break; |
350 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 351 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
351 | sl = strlen(f->suffix); | 352 | sl = strlen(f->suffix); |
352 | if((tl == sl && !strncmp(f->suffix, str, tl)) || | 353 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
@@ -66,129 +66,129 @@ static void print_fileinfo(struct fileinfo *info) | |||
66 | break; | 66 | break; |
67 | default: | 67 | default: |
68 | die("bug: unhandled diff status %c", info->status); | 68 | die("bug: unhandled diff status %c", info->status); |
69 | } | 69 | } |
70 | 70 | ||
71 | html("<tr>"); | 71 | html("<tr>"); |
72 | htmlf("<td class='mode'>"); | 72 | htmlf("<td class='mode'>"); |
73 | if (is_null_sha1(info->new_sha1)) { | 73 | if (is_null_sha1(info->new_sha1)) { |
74 | cgit_print_filemode(info->old_mode); | 74 | cgit_print_filemode(info->old_mode); |
75 | } else { | 75 | } else { |
76 | cgit_print_filemode(info->new_mode); | 76 | cgit_print_filemode(info->new_mode); |
77 | } | 77 | } |
78 | 78 | ||
79 | if (info->old_mode != info->new_mode && | 79 | if (info->old_mode != info->new_mode && |
80 | !is_null_sha1(info->old_sha1) && | 80 | !is_null_sha1(info->old_sha1) && |
81 | !is_null_sha1(info->new_sha1)) { | 81 | !is_null_sha1(info->new_sha1)) { |
82 | html("<span class='modechange'>["); | 82 | html("<span class='modechange'>["); |
83 | cgit_print_filemode(info->old_mode); | 83 | cgit_print_filemode(info->old_mode); |
84 | html("]</span>"); | 84 | html("]</span>"); |
85 | } | 85 | } |
86 | htmlf("</td><td class='%s'>", class); | 86 | htmlf("</td><td class='%s'>", class); |
87 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, | 87 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
88 | ctx.qry.sha2, info->new_path, 0); | 88 | ctx.qry.sha2, info->new_path, 0); |
89 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) | 89 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) |
90 | htmlf(" (%s from %s)", | 90 | htmlf(" (%s from %s)", |
91 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", | 91 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", |
92 | info->old_path); | 92 | info->old_path); |
93 | html("</td><td class='right'>"); | 93 | html("</td><td class='right'>"); |
94 | if (info->binary) { | 94 | if (info->binary) { |
95 | htmlf("bin</td><td class='graph'>%d -> %d bytes", | 95 | htmlf("bin</td><td class='graph'>%d -> %d bytes", |
96 | info->old_size, info->new_size); | 96 | info->old_size, info->new_size); |
97 | return; | 97 | return; |
98 | } | 98 | } |
99 | htmlf("%d", info->added + info->removed); | 99 | htmlf("%d", info->added + info->removed); |
100 | html("</td><td class='graph'>"); | 100 | html("</td><td class='graph'>"); |
101 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); | 101 | htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); |
102 | htmlf("<td class='add' style='width: %.1f%%;'/>", | 102 | htmlf("<td class='add' style='width: %.1f%%;'/>", |
103 | info->added * 100.0 / max_changes); | 103 | info->added * 100.0 / max_changes); |
104 | htmlf("<td class='rem' style='width: %.1f%%;'/>", | 104 | htmlf("<td class='rem' style='width: %.1f%%;'/>", |
105 | info->removed * 100.0 / max_changes); | 105 | info->removed * 100.0 / max_changes); |
106 | htmlf("<td class='none' style='width: %.1f%%;'/>", | 106 | htmlf("<td class='none' style='width: %.1f%%;'/>", |
107 | (max_changes - info->removed - info->added) * 100.0 / max_changes); | 107 | (max_changes - info->removed - info->added) * 100.0 / max_changes); |
108 | html("</tr></table></td></tr>\n"); | 108 | html("</tr></table></td></tr>\n"); |
109 | } | 109 | } |
110 | 110 | ||
111 | static void count_diff_lines(char *line, int len) | 111 | static void count_diff_lines(char *line, int len) |
112 | { | 112 | { |
113 | if (line && (len > 0)) { | 113 | if (line && (len > 0)) { |
114 | if (line[0] == '+') | 114 | if (line[0] == '+') |
115 | lines_added++; | 115 | lines_added++; |
116 | else if (line[0] == '-') | 116 | else if (line[0] == '-') |
117 | lines_removed++; | 117 | lines_removed++; |
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
121 | static void inspect_filepair(struct diff_filepair *pair) | 121 | static void inspect_filepair(struct diff_filepair *pair) |
122 | { | 122 | { |
123 | int binary = 0; | 123 | int binary = 0; |
124 | unsigned long old_size = 0; | 124 | unsigned long old_size = 0; |
125 | unsigned long new_size = 0; | 125 | unsigned long new_size = 0; |
126 | files++; | 126 | files++; |
127 | lines_added = 0; | 127 | lines_added = 0; |
128 | lines_removed = 0; | 128 | lines_removed = 0; |
129 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, | 129 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, |
130 | &binary, count_diff_lines); | 130 | &binary, 0, count_diff_lines); |
131 | if (files >= slots) { | 131 | if (files >= slots) { |
132 | if (slots == 0) | 132 | if (slots == 0) |
133 | slots = 4; | 133 | slots = 4; |
134 | else | 134 | else |
135 | slots = slots * 2; | 135 | slots = slots * 2; |
136 | items = xrealloc(items, slots * sizeof(struct fileinfo)); | 136 | items = xrealloc(items, slots * sizeof(struct fileinfo)); |
137 | } | 137 | } |
138 | items[files-1].status = pair->status; | 138 | items[files-1].status = pair->status; |
139 | hashcpy(items[files-1].old_sha1, pair->one->sha1); | 139 | hashcpy(items[files-1].old_sha1, pair->one->sha1); |
140 | hashcpy(items[files-1].new_sha1, pair->two->sha1); | 140 | hashcpy(items[files-1].new_sha1, pair->two->sha1); |
141 | items[files-1].old_mode = pair->one->mode; | 141 | items[files-1].old_mode = pair->one->mode; |
142 | items[files-1].new_mode = pair->two->mode; | 142 | items[files-1].new_mode = pair->two->mode; |
143 | items[files-1].old_path = xstrdup(pair->one->path); | 143 | items[files-1].old_path = xstrdup(pair->one->path); |
144 | items[files-1].new_path = xstrdup(pair->two->path); | 144 | items[files-1].new_path = xstrdup(pair->two->path); |
145 | items[files-1].added = lines_added; | 145 | items[files-1].added = lines_added; |
146 | items[files-1].removed = lines_removed; | 146 | items[files-1].removed = lines_removed; |
147 | items[files-1].old_size = old_size; | 147 | items[files-1].old_size = old_size; |
148 | items[files-1].new_size = new_size; | 148 | items[files-1].new_size = new_size; |
149 | items[files-1].binary = binary; | 149 | items[files-1].binary = binary; |
150 | if (lines_added + lines_removed > max_changes) | 150 | if (lines_added + lines_removed > max_changes) |
151 | max_changes = lines_added + lines_removed; | 151 | max_changes = lines_added + lines_removed; |
152 | total_adds += lines_added; | 152 | total_adds += lines_added; |
153 | total_rems += lines_removed; | 153 | total_rems += lines_removed; |
154 | } | 154 | } |
155 | 155 | ||
156 | void cgit_print_diffstat(const unsigned char *old_sha1, | 156 | void cgit_print_diffstat(const unsigned char *old_sha1, |
157 | const unsigned char *new_sha1, const char *prefix) | 157 | const unsigned char *new_sha1, const char *prefix) |
158 | { | 158 | { |
159 | int i; | 159 | int i; |
160 | 160 | ||
161 | html("<div class='diffstat-header'>"); | 161 | html("<div class='diffstat-header'>"); |
162 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, | 162 | cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
163 | ctx.qry.sha2, NULL, 0); | 163 | ctx.qry.sha2, NULL, 0); |
164 | if (prefix) | 164 | if (prefix) |
165 | htmlf(" (limited to '%s')", prefix); | 165 | htmlf(" (limited to '%s')", prefix); |
166 | html("</div>"); | 166 | html("</div>"); |
167 | html("<table summary='diffstat' class='diffstat'>"); | 167 | html("<table summary='diffstat' class='diffstat'>"); |
168 | max_changes = 0; | 168 | max_changes = 0; |
169 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix); | 169 | cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix); |
170 | for(i = 0; i<files; i++) | 170 | for(i = 0; i<files; i++) |
171 | print_fileinfo(&items[i]); | 171 | print_fileinfo(&items[i]); |
172 | html("</table>"); | 172 | html("</table>"); |
173 | html("<div class='diffstat-summary'>"); | 173 | html("<div class='diffstat-summary'>"); |
174 | htmlf("%d files changed, %d insertions, %d deletions", | 174 | htmlf("%d files changed, %d insertions, %d deletions", |
175 | files, total_adds, total_rems); | 175 | files, total_adds, total_rems); |
176 | html("</div>"); | 176 | html("</div>"); |
177 | } | 177 | } |
178 | 178 | ||
179 | 179 | ||
180 | /* | 180 | /* |
181 | * print a single line returned from xdiff | 181 | * print a single line returned from xdiff |
182 | */ | 182 | */ |
183 | static void print_line(char *line, int len) | 183 | static void print_line(char *line, int len) |
184 | { | 184 | { |
185 | char *class = "ctx"; | 185 | char *class = "ctx"; |
186 | char c = line[len-1]; | 186 | char c = line[len-1]; |
187 | 187 | ||
188 | if (line[0] == '+') | 188 | if (line[0] == '+') |
189 | class = "add"; | 189 | class = "add"; |
190 | else if (line[0] == '-') | 190 | else if (line[0] == '-') |
191 | class = "del"; | 191 | class = "del"; |
192 | else if (line[0] == '@') | 192 | else if (line[0] == '@') |
193 | class = "hunk"; | 193 | class = "hunk"; |
194 | 194 | ||
@@ -227,129 +227,129 @@ static void header(unsigned char *sha1, char *path1, int mode1, | |||
227 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); | 227 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
228 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); | 228 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); |
229 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); | 229 | htmlf("<br/>index %s..%s", abbrev1, abbrev2); |
230 | free(abbrev1); | 230 | free(abbrev1); |
231 | free(abbrev2); | 231 | free(abbrev2); |
232 | if (mode1 != 0 && mode2 != 0) { | 232 | if (mode1 != 0 && mode2 != 0) { |
233 | htmlf(" %.6o", mode1); | 233 | htmlf(" %.6o", mode1); |
234 | if (mode2 != mode1) | 234 | if (mode2 != mode1) |
235 | htmlf("..%.6o", mode2); | 235 | htmlf("..%.6o", mode2); |
236 | } | 236 | } |
237 | html("<br/>--- a/"); | 237 | html("<br/>--- a/"); |
238 | if (mode1 != 0) | 238 | if (mode1 != 0) |
239 | cgit_tree_link(path1, NULL, NULL, ctx.qry.head, | 239 | cgit_tree_link(path1, NULL, NULL, ctx.qry.head, |
240 | sha1_to_hex(old_rev_sha1), path1); | 240 | sha1_to_hex(old_rev_sha1), path1); |
241 | else | 241 | else |
242 | html_txt(path1); | 242 | html_txt(path1); |
243 | html("<br/>+++ b/"); | 243 | html("<br/>+++ b/"); |
244 | if (mode2 != 0) | 244 | if (mode2 != 0) |
245 | cgit_tree_link(path2, NULL, NULL, ctx.qry.head, | 245 | cgit_tree_link(path2, NULL, NULL, ctx.qry.head, |
246 | sha1_to_hex(new_rev_sha1), path2); | 246 | sha1_to_hex(new_rev_sha1), path2); |
247 | else | 247 | else |
248 | html_txt(path2); | 248 | html_txt(path2); |
249 | } | 249 | } |
250 | html("</div>"); | 250 | html("</div>"); |
251 | } | 251 | } |
252 | 252 | ||
253 | static void print_ssdiff_link() | 253 | static void print_ssdiff_link() |
254 | { | 254 | { |
255 | if (!strcmp(ctx.qry.page, "diff")) { | 255 | if (!strcmp(ctx.qry.page, "diff")) { |
256 | if (use_ssdiff) | 256 | if (use_ssdiff) |
257 | cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, | 257 | cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head, |
258 | ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); | 258 | ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1); |
259 | else | 259 | else |
260 | cgit_diff_link("Side-by-side diff", NULL, NULL, | 260 | cgit_diff_link("Side-by-side diff", NULL, NULL, |
261 | ctx.qry.head, ctx.qry.sha1, | 261 | ctx.qry.head, ctx.qry.sha1, |
262 | ctx.qry.sha2, ctx.qry.path, 1); | 262 | ctx.qry.sha2, ctx.qry.path, 1); |
263 | } | 263 | } |
264 | } | 264 | } |
265 | 265 | ||
266 | static void filepair_cb(struct diff_filepair *pair) | 266 | static void filepair_cb(struct diff_filepair *pair) |
267 | { | 267 | { |
268 | unsigned long old_size = 0; | 268 | unsigned long old_size = 0; |
269 | unsigned long new_size = 0; | 269 | unsigned long new_size = 0; |
270 | int binary = 0; | 270 | int binary = 0; |
271 | linediff_fn print_line_fn = print_line; | 271 | linediff_fn print_line_fn = print_line; |
272 | 272 | ||
273 | if (use_ssdiff) { | 273 | if (use_ssdiff) { |
274 | cgit_ssdiff_header_begin(); | 274 | cgit_ssdiff_header_begin(); |
275 | print_line_fn = cgit_ssdiff_line_cb; | 275 | print_line_fn = cgit_ssdiff_line_cb; |
276 | } | 276 | } |
277 | header(pair->one->sha1, pair->one->path, pair->one->mode, | 277 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
278 | pair->two->sha1, pair->two->path, pair->two->mode); | 278 | pair->two->sha1, pair->two->path, pair->two->mode); |
279 | if (use_ssdiff) | 279 | if (use_ssdiff) |
280 | cgit_ssdiff_header_end(); | 280 | cgit_ssdiff_header_end(); |
281 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { | 281 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
282 | if (S_ISGITLINK(pair->one->mode)) | 282 | if (S_ISGITLINK(pair->one->mode)) |
283 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); | 283 | print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
284 | if (S_ISGITLINK(pair->two->mode)) | 284 | if (S_ISGITLINK(pair->two->mode)) |
285 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); | 285 | print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
286 | if (use_ssdiff) | 286 | if (use_ssdiff) |
287 | cgit_ssdiff_footer(); | 287 | cgit_ssdiff_footer(); |
288 | return; | 288 | return; |
289 | } | 289 | } |
290 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 290 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
291 | &new_size, &binary, print_line_fn)) | 291 | &new_size, &binary, ctx.qry.context, print_line_fn)) |
292 | cgit_print_error("Error running diff"); | 292 | cgit_print_error("Error running diff"); |
293 | if (binary) { | 293 | if (binary) { |
294 | if (use_ssdiff) | 294 | if (use_ssdiff) |
295 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); | 295 | html("<tr><td colspan='4'>Binary files differ</td></tr>"); |
296 | else | 296 | else |
297 | html("Binary files differ"); | 297 | html("Binary files differ"); |
298 | } | 298 | } |
299 | if (use_ssdiff) | 299 | if (use_ssdiff) |
300 | cgit_ssdiff_footer(); | 300 | cgit_ssdiff_footer(); |
301 | } | 301 | } |
302 | 302 | ||
303 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) | 303 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
304 | { | 304 | { |
305 | enum object_type type; | 305 | enum object_type type; |
306 | unsigned long size; | 306 | unsigned long size; |
307 | struct commit *commit, *commit2; | 307 | struct commit *commit, *commit2; |
308 | 308 | ||
309 | if (!new_rev) | 309 | if (!new_rev) |
310 | new_rev = ctx.qry.head; | 310 | new_rev = ctx.qry.head; |
311 | get_sha1(new_rev, new_rev_sha1); | 311 | get_sha1(new_rev, new_rev_sha1); |
312 | type = sha1_object_info(new_rev_sha1, &size); | 312 | type = sha1_object_info(new_rev_sha1, &size); |
313 | if (type == OBJ_BAD) { | 313 | if (type == OBJ_BAD) { |
314 | cgit_print_error(fmt("Bad object name: %s", new_rev)); | 314 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
315 | return; | 315 | return; |
316 | } | 316 | } |
317 | commit = lookup_commit_reference(new_rev_sha1); | 317 | commit = lookup_commit_reference(new_rev_sha1); |
318 | if (!commit || parse_commit(commit)) | 318 | if (!commit || parse_commit(commit)) |
319 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); | 319 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1))); |
320 | 320 | ||
321 | if (old_rev) | 321 | if (old_rev) |
322 | get_sha1(old_rev, old_rev_sha1); | 322 | get_sha1(old_rev, old_rev_sha1); |
323 | else if (commit->parents && commit->parents->item) | 323 | else if (commit->parents && commit->parents->item) |
324 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); | 324 | hashcpy(old_rev_sha1, commit->parents->item->object.sha1); |
325 | else | 325 | else |
326 | hashclr(old_rev_sha1); | 326 | hashclr(old_rev_sha1); |
327 | 327 | ||
328 | if (!is_null_sha1(old_rev_sha1)) { | 328 | if (!is_null_sha1(old_rev_sha1)) { |
329 | type = sha1_object_info(old_rev_sha1, &size); | 329 | type = sha1_object_info(old_rev_sha1, &size); |
330 | if (type == OBJ_BAD) { | 330 | if (type == OBJ_BAD) { |
331 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1))); | 331 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1))); |
332 | return; | 332 | return; |
333 | } | 333 | } |
334 | commit2 = lookup_commit_reference(old_rev_sha1); | 334 | commit2 = lookup_commit_reference(old_rev_sha1); |
335 | if (!commit2 || parse_commit(commit2)) | 335 | if (!commit2 || parse_commit(commit2)) |
336 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); | 336 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); |
337 | } | 337 | } |
338 | 338 | ||
339 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) | 339 | if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff)) |
340 | use_ssdiff = 1; | 340 | use_ssdiff = 1; |
341 | 341 | ||
342 | print_ssdiff_link(); | 342 | print_ssdiff_link(); |
343 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); | 343 | cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); |
344 | 344 | ||
345 | if (use_ssdiff) { | 345 | if (use_ssdiff) { |
346 | html("<table summary='ssdiff' class='ssdiff'>"); | 346 | html("<table summary='ssdiff' class='ssdiff'>"); |
347 | } else { | 347 | } else { |
348 | html("<table summary='diff' class='diff'>"); | 348 | html("<table summary='diff' class='diff'>"); |
349 | html("<tr><td>"); | 349 | html("<tr><td>"); |
350 | } | 350 | } |
351 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); | 351 | cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); |
352 | if (!use_ssdiff) | 352 | if (!use_ssdiff) |
353 | html("</td></tr>"); | 353 | html("</td></tr>"); |
354 | html("</table>"); | 354 | html("</table>"); |
355 | } | 355 | } |
@@ -1,100 +1,100 @@ | |||
1 | /* ui-log.c: functions for log output | 1 | /* ui-log.c: functions for log output |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | 12 | ||
13 | int files, add_lines, rem_lines; | 13 | int files, add_lines, rem_lines; |
14 | 14 | ||
15 | void count_lines(char *line, int size) | 15 | void count_lines(char *line, int size) |
16 | { | 16 | { |
17 | if (size <= 0) | 17 | if (size <= 0) |
18 | return; | 18 | return; |
19 | 19 | ||
20 | if (line[0] == '+') | 20 | if (line[0] == '+') |
21 | add_lines++; | 21 | add_lines++; |
22 | 22 | ||
23 | else if (line[0] == '-') | 23 | else if (line[0] == '-') |
24 | rem_lines++; | 24 | rem_lines++; |
25 | } | 25 | } |
26 | 26 | ||
27 | void inspect_files(struct diff_filepair *pair) | 27 | void inspect_files(struct diff_filepair *pair) |
28 | { | 28 | { |
29 | unsigned long old_size = 0; | 29 | unsigned long old_size = 0; |
30 | unsigned long new_size = 0; | 30 | unsigned long new_size = 0; |
31 | int binary = 0; | 31 | int binary = 0; |
32 | 32 | ||
33 | files++; | 33 | files++; |
34 | if (ctx.repo->enable_log_linecount) | 34 | if (ctx.repo->enable_log_linecount) |
35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
36 | &new_size, &binary, count_lines); | 36 | &new_size, &binary, 0, count_lines); |
37 | } | 37 | } |
38 | 38 | ||
39 | void show_commit_decorations(struct commit *commit) | 39 | void show_commit_decorations(struct commit *commit) |
40 | { | 40 | { |
41 | struct name_decoration *deco; | 41 | struct name_decoration *deco; |
42 | static char buf[1024]; | 42 | static char buf[1024]; |
43 | 43 | ||
44 | buf[sizeof(buf) - 1] = 0; | 44 | buf[sizeof(buf) - 1] = 0; |
45 | deco = lookup_decoration(&name_decoration, &commit->object); | 45 | deco = lookup_decoration(&name_decoration, &commit->object); |
46 | while (deco) { | 46 | while (deco) { |
47 | if (!prefixcmp(deco->name, "refs/heads/")) { | 47 | if (!prefixcmp(deco->name, "refs/heads/")) { |
48 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); | 48 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); |
49 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, | 49 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, |
50 | ctx.qry.vpath, 0, NULL, NULL, | 50 | ctx.qry.vpath, 0, NULL, NULL, |
51 | ctx.qry.showmsg); | 51 | ctx.qry.showmsg); |
52 | } | 52 | } |
53 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { | 53 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
54 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); | 54 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
55 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 55 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
56 | } | 56 | } |
57 | else if (!prefixcmp(deco->name, "refs/tags/")) { | 57 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
58 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); | 58 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
59 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 59 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
60 | } | 60 | } |
61 | else if (!prefixcmp(deco->name, "refs/remotes/")) { | 61 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
62 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); | 62 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
63 | cgit_log_link(buf, NULL, "remote-deco", NULL, | 63 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
64 | sha1_to_hex(commit->object.sha1), | 64 | sha1_to_hex(commit->object.sha1), |
65 | ctx.qry.vpath, 0, NULL, NULL, | 65 | ctx.qry.vpath, 0, NULL, NULL, |
66 | ctx.qry.showmsg); | 66 | ctx.qry.showmsg); |
67 | } | 67 | } |
68 | else { | 68 | else { |
69 | strncpy(buf, deco->name, sizeof(buf) - 1); | 69 | strncpy(buf, deco->name, sizeof(buf) - 1); |
70 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, | 70 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
71 | sha1_to_hex(commit->object.sha1), | 71 | sha1_to_hex(commit->object.sha1), |
72 | ctx.qry.vpath, 0); | 72 | ctx.qry.vpath, 0); |
73 | } | 73 | } |
74 | deco = deco->next; | 74 | deco = deco->next; |
75 | } | 75 | } |
76 | } | 76 | } |
77 | 77 | ||
78 | void print_commit(struct commit *commit) | 78 | void print_commit(struct commit *commit) |
79 | { | 79 | { |
80 | struct commitinfo *info; | 80 | struct commitinfo *info; |
81 | char *tmp; | 81 | char *tmp; |
82 | int cols = 2; | 82 | int cols = 2; |
83 | 83 | ||
84 | info = cgit_parse_commit(commit); | 84 | info = cgit_parse_commit(commit); |
85 | htmlf("<tr%s><td>", | 85 | htmlf("<tr%s><td>", |
86 | ctx.qry.showmsg ? " class='logheader'" : ""); | 86 | ctx.qry.showmsg ? " class='logheader'" : ""); |
87 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | 87 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
88 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); | 88 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
89 | html_link_open(tmp, NULL, NULL); | 89 | html_link_open(tmp, NULL, NULL); |
90 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 90 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
91 | html_link_close(); | 91 | html_link_close(); |
92 | htmlf("</td><td%s>", | 92 | htmlf("</td><td%s>", |
93 | ctx.qry.showmsg ? " class='logsubject'" : ""); | 93 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
94 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, | 94 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
95 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); | 95 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
96 | show_commit_decorations(commit); | 96 | show_commit_decorations(commit); |
97 | html("</td><td>"); | 97 | html("</td><td>"); |
98 | html_txt(info->author); | 98 | html_txt(info->author); |
99 | if (ctx.repo->enable_log_filecount) { | 99 | if (ctx.repo->enable_log_filecount) { |
100 | files = 0; | 100 | files = 0; |
@@ -10,122 +10,122 @@ | |||
10 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | 12 | ||
13 | static void print_line(char *line, int len) | 13 | static void print_line(char *line, int len) |
14 | { | 14 | { |
15 | char c = line[len-1]; | 15 | char c = line[len-1]; |
16 | 16 | ||
17 | line[len-1] = '\0'; | 17 | line[len-1] = '\0'; |
18 | htmlf("%s\n", line); | 18 | htmlf("%s\n", line); |
19 | line[len-1] = c; | 19 | line[len-1] = c; |
20 | } | 20 | } |
21 | 21 | ||
22 | static void header(unsigned char *sha1, char *path1, int mode1, | 22 | static void header(unsigned char *sha1, char *path1, int mode1, |
23 | unsigned char *sha2, char *path2, int mode2) | 23 | unsigned char *sha2, char *path2, int mode2) |
24 | { | 24 | { |
25 | char *abbrev1, *abbrev2; | 25 | char *abbrev1, *abbrev2; |
26 | int subproject; | 26 | int subproject; |
27 | 27 | ||
28 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); | 28 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
29 | htmlf("diff --git a/%s b/%s\n", path1, path2); | 29 | htmlf("diff --git a/%s b/%s\n", path1, path2); |
30 | 30 | ||
31 | if (is_null_sha1(sha1)) | 31 | if (is_null_sha1(sha1)) |
32 | path1 = "dev/null"; | 32 | path1 = "dev/null"; |
33 | if (is_null_sha1(sha2)) | 33 | if (is_null_sha1(sha2)) |
34 | path2 = "dev/null"; | 34 | path2 = "dev/null"; |
35 | 35 | ||
36 | if (mode1 == 0) | 36 | if (mode1 == 0) |
37 | htmlf("new file mode %.6o\n", mode2); | 37 | htmlf("new file mode %.6o\n", mode2); |
38 | 38 | ||
39 | if (mode2 == 0) | 39 | if (mode2 == 0) |
40 | htmlf("deleted file mode %.6o\n", mode1); | 40 | htmlf("deleted file mode %.6o\n", mode1); |
41 | 41 | ||
42 | if (!subproject) { | 42 | if (!subproject) { |
43 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); | 43 | abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); |
44 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); | 44 | abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); |
45 | htmlf("index %s..%s", abbrev1, abbrev2); | 45 | htmlf("index %s..%s", abbrev1, abbrev2); |
46 | free(abbrev1); | 46 | free(abbrev1); |
47 | free(abbrev2); | 47 | free(abbrev2); |
48 | if (mode1 != 0 && mode2 != 0) { | 48 | if (mode1 != 0 && mode2 != 0) { |
49 | htmlf(" %.6o", mode1); | 49 | htmlf(" %.6o", mode1); |
50 | if (mode2 != mode1) | 50 | if (mode2 != mode1) |
51 | htmlf("..%.6o", mode2); | 51 | htmlf("..%.6o", mode2); |
52 | } | 52 | } |
53 | htmlf("\n--- a/%s\n", path1); | 53 | htmlf("\n--- a/%s\n", path1); |
54 | htmlf("+++ b/%s\n", path2); | 54 | htmlf("+++ b/%s\n", path2); |
55 | } | 55 | } |
56 | } | 56 | } |
57 | 57 | ||
58 | static void filepair_cb(struct diff_filepair *pair) | 58 | static void filepair_cb(struct diff_filepair *pair) |
59 | { | 59 | { |
60 | unsigned long old_size = 0; | 60 | unsigned long old_size = 0; |
61 | unsigned long new_size = 0; | 61 | unsigned long new_size = 0; |
62 | int binary = 0; | 62 | int binary = 0; |
63 | 63 | ||
64 | header(pair->one->sha1, pair->one->path, pair->one->mode, | 64 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
65 | pair->two->sha1, pair->two->path, pair->two->mode); | 65 | pair->two->sha1, pair->two->path, pair->two->mode); |
66 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { | 66 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
67 | if (S_ISGITLINK(pair->one->mode)) | 67 | if (S_ISGITLINK(pair->one->mode)) |
68 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); | 68 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
69 | if (S_ISGITLINK(pair->two->mode)) | 69 | if (S_ISGITLINK(pair->two->mode)) |
70 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); | 70 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
71 | return; | 71 | return; |
72 | } | 72 | } |
73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
74 | &new_size, &binary, print_line)) | 74 | &new_size, &binary, 0, print_line)) |
75 | html("Error running diff"); | 75 | html("Error running diff"); |
76 | if (binary) | 76 | if (binary) |
77 | html("Binary files differ\n"); | 77 | html("Binary files differ\n"); |
78 | } | 78 | } |
79 | 79 | ||
80 | void cgit_print_patch(char *hex, const char *prefix) | 80 | void cgit_print_patch(char *hex, const char *prefix) |
81 | { | 81 | { |
82 | struct commit *commit; | 82 | struct commit *commit; |
83 | struct commitinfo *info; | 83 | struct commitinfo *info; |
84 | unsigned char sha1[20], old_sha1[20]; | 84 | unsigned char sha1[20], old_sha1[20]; |
85 | char *patchname; | 85 | char *patchname; |
86 | 86 | ||
87 | if (!hex) | 87 | if (!hex) |
88 | hex = ctx.qry.head; | 88 | hex = ctx.qry.head; |
89 | 89 | ||
90 | if (get_sha1(hex, sha1)) { | 90 | if (get_sha1(hex, sha1)) { |
91 | cgit_print_error(fmt("Bad object id: %s", hex)); | 91 | cgit_print_error(fmt("Bad object id: %s", hex)); |
92 | return; | 92 | return; |
93 | } | 93 | } |
94 | commit = lookup_commit_reference(sha1); | 94 | commit = lookup_commit_reference(sha1); |
95 | if (!commit) { | 95 | if (!commit) { |
96 | cgit_print_error(fmt("Bad commit reference: %s", hex)); | 96 | cgit_print_error(fmt("Bad commit reference: %s", hex)); |
97 | return; | 97 | return; |
98 | } | 98 | } |
99 | info = cgit_parse_commit(commit); | 99 | info = cgit_parse_commit(commit); |
100 | 100 | ||
101 | if (commit->parents && commit->parents->item) | 101 | if (commit->parents && commit->parents->item) |
102 | hashcpy(old_sha1, commit->parents->item->object.sha1); | 102 | hashcpy(old_sha1, commit->parents->item->object.sha1); |
103 | else | 103 | else |
104 | hashclr(old_sha1); | 104 | hashclr(old_sha1); |
105 | 105 | ||
106 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); | 106 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); |
107 | ctx.page.mimetype = "text/plain"; | 107 | ctx.page.mimetype = "text/plain"; |
108 | ctx.page.filename = patchname; | 108 | ctx.page.filename = patchname; |
109 | cgit_print_http_headers(&ctx); | 109 | cgit_print_http_headers(&ctx); |
110 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); | 110 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); |
111 | htmlf("From: %s", info->author); | 111 | htmlf("From: %s", info->author); |
112 | if (!ctx.cfg.noplainemail) { | 112 | if (!ctx.cfg.noplainemail) { |
113 | htmlf(" %s", info->author_email); | 113 | htmlf(" %s", info->author_email); |
114 | } | 114 | } |
115 | html("\n"); | 115 | html("\n"); |
116 | html("Date: "); | 116 | html("Date: "); |
117 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); | 117 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); |
118 | htmlf("Subject: %s\n\n", info->subject); | 118 | htmlf("Subject: %s\n\n", info->subject); |
119 | if (info->msg && *info->msg) { | 119 | if (info->msg && *info->msg) { |
120 | htmlf("%s", info->msg); | 120 | htmlf("%s", info->msg); |
121 | if (info->msg[strlen(info->msg) - 1] != '\n') | 121 | if (info->msg[strlen(info->msg) - 1] != '\n') |
122 | html("\n"); | 122 | html("\n"); |
123 | } | 123 | } |
124 | html("---\n"); | 124 | html("---\n"); |
125 | if (prefix) | 125 | if (prefix) |
126 | htmlf("(limited to '%s')\n\n", prefix); | 126 | htmlf("(limited to '%s')\n\n", prefix); |
127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix); | 127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix); |
128 | html("--\n"); | 128 | html("--\n"); |
129 | htmlf("cgit %s\n", CGIT_VERSION); | 129 | htmlf("cgit %s\n", CGIT_VERSION); |
130 | cgit_free_commitinfo(info); | 130 | cgit_free_commitinfo(info); |
131 | } | 131 | } |