summaryrefslogtreecommitdiffabout
path: root/shared.c
Unidiff
Diffstat (limited to 'shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shared.c b/shared.c
index bf0581f..f063894 100644
--- a/shared.c
+++ b/shared.c
@@ -447,75 +447,75 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
447 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); 447 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size);
448 free(diffbuf); 448 free(diffbuf);
449 diffbuf = NULL; 449 diffbuf = NULL;
450 buflen = 0; 450 buflen = 0;
451 } 451 }
452 if (diffbuf) { 452 if (diffbuf) {
453 ((linediff_fn)priv)(diffbuf, buflen); 453 ((linediff_fn)priv)(diffbuf, buflen);
454 free(diffbuf); 454 free(diffbuf);
455 diffbuf = NULL; 455 diffbuf = NULL;
456 buflen = 0; 456 buflen = 0;
457 } 457 }
458 return 0; 458 return 0;
459} 459}
460 460
461int cgit_diff_files(const unsigned char *old_sha1, 461int cgit_diff_files(const unsigned char *old_sha1,
462 const unsigned char *new_sha1, 462 const unsigned char *new_sha1,
463 linediff_fn fn) 463 linediff_fn fn)
464{ 464{
465 mmfile_t file1, file2; 465 mmfile_t file1, file2;
466 xpparam_t diff_params; 466 xpparam_t diff_params;
467 xdemitconf_t emit_params; 467 xdemitconf_t emit_params;
468 xdemitcb_t emit_cb; 468 xdemitcb_t emit_cb;
469 469
470 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) 470 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
471 return 1; 471 return 1;
472 472
473 diff_params.flags = XDF_NEED_MINIMAL; 473 diff_params.flags = XDF_NEED_MINIMAL;
474 emit_params.ctxlen = 3; 474 emit_params.ctxlen = 3;
475 emit_params.flags = XDL_EMIT_FUNCNAMES; 475 emit_params.flags = XDL_EMIT_FUNCNAMES;
476 emit_params.find_func = NULL; 476 emit_params.find_func = NULL;
477 emit_cb.outf = filediff_cb; 477 emit_cb.outf = filediff_cb;
478 emit_cb.priv = fn; 478 emit_cb.priv = fn;
479 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); 479 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
480 return 0; 480 return 0;
481} 481}
482 482
483void cgit_diff_tree(const unsigned char *old_sha1, 483void cgit_diff_tree(const unsigned char *old_sha1,
484 const unsigned char *new_sha1, 484 const unsigned char *new_sha1,
485 filepair_fn fn, const char *prefix) 485 filepair_fn fn, const char *prefix)
486{ 486{
487 struct diff_options opt; 487 struct diff_options opt;
488 int ret; 488 int ret;
489 int prefixlen; 489 int prefixlen;
490 490
491 diff_setup(&opt); 491 diff_setup(&opt);
492 opt.output_format = DIFF_FORMAT_CALLBACK; 492 opt.output_format = DIFF_FORMAT_CALLBACK;
493 opt.detect_rename = 1; 493 opt.detect_rename = 1;
494 opt.rename_limit = cgit_renamelimit; 494 opt.rename_limit = cgit_renamelimit;
495 opt.recursive = 1; 495 DIFF_OPT_SET(&opt, RECURSIVE);
496 opt.format_callback = cgit_diff_tree_cb; 496 opt.format_callback = cgit_diff_tree_cb;
497 opt.format_callback_data = fn; 497 opt.format_callback_data = fn;
498 if (prefix) { 498 if (prefix) {
499 opt.nr_paths = 1; 499 opt.nr_paths = 1;
500 opt.paths = &prefix; 500 opt.paths = &prefix;
501 prefixlen = strlen(prefix); 501 prefixlen = strlen(prefix);
502 opt.pathlens = &prefixlen; 502 opt.pathlens = &prefixlen;
503 } 503 }
504 diff_setup_done(&opt); 504 diff_setup_done(&opt);
505 505
506 if (old_sha1 && !is_null_sha1(old_sha1)) 506 if (old_sha1 && !is_null_sha1(old_sha1))
507 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 507 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
508 else 508 else
509 ret = diff_root_tree_sha1(new_sha1, "", &opt); 509 ret = diff_root_tree_sha1(new_sha1, "", &opt);
510 diffcore_std(&opt); 510 diffcore_std(&opt);
511 diff_flush(&opt); 511 diff_flush(&opt);
512} 512}
513 513
514void cgit_diff_commit(struct commit *commit, filepair_fn fn) 514void cgit_diff_commit(struct commit *commit, filepair_fn fn)
515{ 515{
516 unsigned char *old_sha1 = NULL; 516 unsigned char *old_sha1 = NULL;
517 517
518 if (commit->parents) 518 if (commit->parents)
519 old_sha1 = commit->parents->item->object.sha1; 519 old_sha1 = commit->parents->item->object.sha1;
520 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); 520 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
521} 521}