|
diff --git a/shared.c b/shared.c index 6e8f0ce..7cf1e59 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -233,88 +233,89 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
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); |
|